Skip to content

android / dayu

Go to a project
Commit 73ac99df by luofan
Options

增加商家模块，认证资质修改

parent 21f73eb5
Inline Side-by-side
Showing with 62 additions and 66 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -45,20 +45,20 @@ public class Constants { ...@@ -45,20 +45,20 @@ public class Constants {
/** /**
* dev环境配置. * dev环境配置.
*/ */
public static String ENVIROMENT = "debug"; // public static String ENVIROMENT = "debug";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.94.101.239:3112"; // public static String BASE_URL = "http://47.94.101.239:3112";
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; // public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; // public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; // public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; // public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; // public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video"; // public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public static final boolean IS_DEBUG = true; // public static final boolean IS_DEBUG = true;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live) // public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 239; //小绿人商家id // public static int XLR_PID = 239; //小绿人商家id
public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/"; // public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
/** /**
...@@ -83,20 +83,20 @@ public class Constants { ...@@ -83,20 +83,20 @@ public class Constants {
/** /**
* 正式环境. * 正式环境.
*/ */
// public static String ENVIROMENT = "release"; public static String ENVIROMENT = "release";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF; public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.kf.ai"; public static String BASE_URL = "https://mobile.kf.ai";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop"; public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video"; public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static final boolean IS_DEBUG = false; public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live) public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id public static int XLR_PID = 1936; //小绿人商家id
// public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/"; public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
/** /**
......
baseSDK/src/main/java/com/dayu/utils/UserManager.java
...@@ -37,6 +37,10 @@ public class UserManager { ...@@ -37,6 +37,10 @@ public class UserManager {
SPUtils.put("USER_INFO", json); SPUtils.put("USER_INFO", json);
} }
public String getUserJson() {
return (String) SPUtils.get("USER_INFO", "");
}
public UserInfo getUser() { public UserInfo getUser() {
return new Gson().fromJson((String) SPUtils.get("big_fish", "USER_INFO", ""), UserInfo.class); return new Gson().fromJson((String) SPUtils.get("big_fish", "USER_INFO", ""), UserInfo.class);
} }
...@@ -108,7 +112,7 @@ public class UserManager { ...@@ -108,7 +112,7 @@ public class UserManager {
// } // }
} else if (isManager) { } else if (isManager) {
return Constants.MANAGER; return Constants.MANAGER;
} else if (userInfo.getRoles().size()>0){ } else if (userInfo.getRoles().size() > 0) {
return Constants.ENGINEER; return Constants.ENGINEER;
} else { } else {
return Constants.NOT_LOGIN; return Constants.NOT_LOGIN;
...@@ -116,8 +120,8 @@ public class UserManager { ...@@ -116,8 +120,8 @@ public class UserManager {
} }
public void initTestUserInfo() { public void initTestUserInfo() {
if (UserManager.getInstance().getUser() == null){ if (UserManager.getInstance().getUser() == null) {
String json ="{\n" + String json = "{\n" +
"\t\t\"accountId\": \"1441\",\n" + "\t\t\"accountId\": \"1441\",\n" +
"\t\t\"accountName\": \"test01\",\n" + "\t\t\"accountName\": \"test01\",\n" +
"\t\t\"detectStatus\": \"2\",\n" + "\t\t\"detectStatus\": \"2\",\n" +
......
orderCenter/src/main/java/com/dayu/order/presenter/homeorder/HomeOrderPresenter.java
...@@ -15,23 +15,18 @@ import com.umeng.analytics.MobclickAgent; ...@@ -15,23 +15,18 @@ import com.umeng.analytics.MobclickAgent;
public class HomeOrderPresenter extends HomeOrderContract.Presenter { public class HomeOrderPresenter extends HomeOrderContract.Presenter {
private int mUserId; private int mUserId;
private int mSiteId;
private int mIndex; private int mIndex;
private UserInfo userInfo;
@Override @Override
public void onAttached() { public void onAttached() {
// String json ="{\"accessToken\":\"40f0f4fd1d52472093055433a38d4a3f\",\"accountId\":\"692\",\"accountName\":\"罗凡\",\"headerImg\":\"http://dayuoss.oss-cn-beijing.aliyuncs.com/test/sp/mobile/android/business/checkApply/3b7165643f19bbf1c1f7ca2fa69f0d6b.png?x-oss-process\\u003dstyle/pic\",\"hxAccount\":\"0915e6394a254c51b6742e04a6c6ca3f\",\"hxPwd\":\"7583t45u\",\"siteId\":\"432\",\"status\":1,\"token\":\"8eff783de36e4d2a8b7bc66709edfc42\"}"; UserInfo userInfo = UserManager.getInstance().getUser();
// UserManager.getInstance().saveUserForJson(json);
userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId()); mUserId = Integer.parseInt(userInfo.getAccountId());
mSiteId = userInfo.getSiteId();
} }
public void getTabNum(int index) { public void getTabNum(int index) {
mView.showDialog(); mView.showDialog();
mIndex = index; mIndex = index;
getTabNum(mUserId, userInfo.getTeamId()); getTabNum(mUserId, UserManager.getInstance().getUser().getTeamId());
} }
@Override @Override
......
orderCenter/src/main/java/com/dayu/order/presenter/redeploy/RedeployPresenter.java
...@@ -30,25 +30,22 @@ public class RedeployPresenter extends RedeployContract.Presenter { ...@@ -30,25 +30,22 @@ public class RedeployPresenter extends RedeployContract.Presenter {
private ObservableField<Object> datas = new ObservableField<>(); private ObservableField<Object> datas = new ObservableField<>();
private int mUserId; private int mUserId;
private int mPage; private int mPage;
private String teamId;
@Override @Override
public void onAttached() { public void onAttached() {
UserInfo userInfo = UserManager.getInstance().getUser(); UserInfo userInfo = UserManager.getInstance().getUser();
mUserId = Integer.parseInt(userInfo.getAccountId()); mUserId = Integer.parseInt(userInfo.getAccountId());
teamId = userInfo.getTeamId();
refresh(); refresh();
} }
public void getRedeployData() { public void getRedeployData() {
String teamId = UserManager.getInstance().getUser().getTeamId();
Api.getService(OrderService.class).getRedeploy(teamId, mPage, Constants.PAGESIZE).compose(Api.applySchedulers()) Api.getService(OrderService.class).getRedeploy(teamId, mPage, Constants.PAGESIZE).compose(Api.applySchedulers())
.subscribe(baseObserver( orderBasePageBean -> { .subscribe(baseObserver(orderBasePageBean -> {
datas.set(orderBasePageBean); datas.set(orderBasePageBean);
mPage++; mPage++;
EventBus.getDefault().post(new RefreshTab(-1)); EventBus.getDefault().post(new RefreshTab(-1));
}, responeThrowable -> { }, responeThrowable -> datas.set(Constants.FAILED)));
datas.set(Constants.FAILED);
}));
} }
@Override @Override
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -69,7 +69,6 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -69,7 +69,6 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
private Order mItem; private Order mItem;
private FragmentOrderdoingItemBinding mBind; private FragmentOrderdoingItemBinding mBind;
private boolean isRedeploy;//是否转派单. private boolean isRedeploy;//是否转派单.
private boolean canRedeploy;//是否可转派单.
public OrderAdapter(boolean needFoot) { public OrderAdapter(boolean needFoot) {
super(needFoot); super(needFoot);
...@@ -90,12 +89,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -90,12 +89,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
this.isRedeploy = isRedeploy; this.isRedeploy = isRedeploy;
} }
public void setCanRedeploy(boolean canRedeploy) {
this.canRedeploy = canRedeploy;
}
private void initData(FragmentOrderdoingItemBinding holder, Order item, int position) throws Exception { private void initData(FragmentOrderdoingItemBinding holder, Order item, int position) throws Exception {
boolean haveCustomer = true; boolean haveCustomer = true;
String teamId = UserManager.getInstance().getUser().getTeamId();
String address = item.getProvinceName() + item.getCityName() + String address = item.getProvinceName() + item.getCityName() +
item.getDistrictName() + item.getAddress(); item.getDistrictName() + item.getAddress();
holder.itemTextWeixiuLeixing.setText(item.getCategoryName()); holder.itemTextWeixiuLeixing.setText(item.getCategoryName());
...@@ -154,7 +150,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -154,7 +150,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment)); holder.tvOrderTime.setText(mContext.getString(R.string.have_appointment));
time = item.getAppointmentTime(); time = item.getAppointmentTime();
setTimeStatus(holder, item, time); setTimeStatus(holder, item, time);
if (canRedeploy) { if (!TextUtils.isEmpty(teamId) && !isRedeploy) {
holder.redeploy.setVisibility(View.VISIBLE); holder.redeploy.setVisibility(View.VISIBLE);
holder.redeploy.setOnClickListener(v -> { holder.redeploy.setOnClickListener(v -> {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
...@@ -377,7 +373,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -377,7 +373,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} }
holder.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName()); holder.itemTextWeixiu.setText(item.getSpus().get(0).getProviderTypeName());
holder.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getCategoryThreeName()); holder.itemTextWeixiuLeixing.setText(item.getSpus().get(0).getCategoryThreeName());
if (isRedeploy) { if (!TextUtils.isEmpty(teamId) && isRedeploy) {
holder.tvTakeOrder.setVisibility(View.VISIBLE); holder.tvTakeOrder.setVisibility(View.VISIBLE);
holder.llOrderDoneBootom.setVisibility(View.GONE); holder.llOrderDoneBootom.setVisibility(View.GONE);
holder.llBottom.setVisibility(View.GONE); holder.llBottom.setVisibility(View.GONE);
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java
...@@ -55,9 +55,6 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra ...@@ -55,9 +55,6 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
mAdapter = new OrderAdapter(true); mAdapter = new OrderAdapter(true);
mAdapter.setViewType(R.layout.fragment_orderdoing_item); mAdapter.setViewType(R.layout.fragment_orderdoing_item);
mAdapter.setLoadMore(false); mAdapter.setLoadMore(false);
if (!TextUtils.isEmpty(mUserInfo.getTeamId())) {
mAdapter.setCanRedeploy(true);
}
mBind.recyclerView.setAdapter(mAdapter); mBind.recyclerView.setAdapter(mAdapter);
initListener(); initListener();
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() { mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() {
......
userCenter/src/main/java/com/dayu/usercenter/presenter/InviteTeamPresenter.java
...@@ -5,6 +5,7 @@ import android.databinding.ObservableField; ...@@ -5,6 +5,7 @@ import android.databinding.ObservableField;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.ui.presenter.BaseListPresenter; import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.usercenter.api.UserService2; import com.dayu.usercenter.api.UserService2;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
...@@ -31,6 +32,11 @@ public class InviteTeamPresenter extends InviteTeamContract.Presenter { ...@@ -31,6 +32,11 @@ public class InviteTeamPresenter extends InviteTeamContract.Presenter {
Api.getService(UserService2.class).teamList(userId, page, Constants.PAGESIZE).compose(Api.applySchedulers()) Api.getService(UserService2.class).teamList(userId, page, Constants.PAGESIZE).compose(Api.applySchedulers())
.subscribe(baseObserver(data -> { .subscribe(baseObserver(data -> {
datas.set(data); datas.set(data);
if (data.getData() != null) {
UserInfo info = UserManager.getInstance().getUser();
info.setTeamId(data.getData().get(0).getTeamId() + "");
UserManager.getInstance().saveUser(info);
}
page++; page++;
})); }));
} }
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/CommeWebViewActivity.java
...@@ -23,6 +23,8 @@ import com.dayu.provider.event.RefreshServe; ...@@ -23,6 +23,8 @@ import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.utils.ProgressUtil; import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler; import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView; import com.github.lzyzsd.jsbridge.BridgeWebView;
import com.github.lzyzsd.jsbridge.CallBackFunction; import com.github.lzyzsd.jsbridge.CallBackFunction;
...@@ -140,6 +142,11 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin ...@@ -140,6 +142,11 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin
} }
} }
}); });
mWebView.callHandler("dayuEngineerInfo", UserManager.getInstance().getUserJson(), data ->
ToastUtils.showShortToast("信息提交成功")
);
ProgressUtil.startLoad(mActivity); ProgressUtil.startLoad(mActivity);
mWebView.loadUrl(mUrl); mWebView.loadUrl(mUrl);
} }
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/RedeployActvity.java
...@@ -65,7 +65,7 @@ public class RedeployActvity extends BaseActivity<RedeployPresenter, ActivityRed ...@@ -65,7 +65,7 @@ public class RedeployActvity extends BaseActivity<RedeployPresenter, ActivityRed
params.put("dispatchEngnieerName", adapter.getSelectItem().getEngineerName()); params.put("dispatchEngnieerName", adapter.getSelectItem().getEngineerName());
params.put("orderId", orderId); params.put("orderId", orderId);
params.put("teamId", mUserInfo.getTeamId()); params.put("teamId", mUserInfo.getTeamId());
params.put("created", mUserInfo.getAccountId()); params.put("created", mUserInfo.getAccountName());
JSONObject jsonObject = new JSONObject(params); JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
Api.getService(UserService2.class).redeploy(body).compose(Api.applySchedulers()) Api.getService(UserService2.class).redeploy(body).compose(Api.applySchedulers())
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
...@@ -319,22 +319,16 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo ...@@ -319,22 +319,16 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
//发送个人名片 //发送个人名片
private void sendUserCard() { private void sendUserCard() {
initUser(); initUser();
int detectSatus = UserManager.getInstance().getUser().getDetectStatus(); // int detectSatus = UserManager.getInstance().getUser().getDetectStatus();
if (detectSatus == 2 || detectSatus == 3) { // if (detectSatus == 2 || detectSatus == 3) {
showCertificationDialog(); // showCertificationDialog();
return; // return;
} // }
if (TextUtils.isEmpty(mUserInfo.getHeaderImg()) || mUserInfo.getHeaderImg().equals(Constants.AvatarUrl)) { if (TextUtils.isEmpty(mUserInfo.getHeaderImg()) || mUserInfo.getHeaderImg().equals(Constants.AvatarUrl)) {
String str = "请先上传您的头像"; String str = "请先上传您的头像";
showBankAddrDialog(str, "去上传", PersonInfoActivity.class); showBankAddrDialog(str, "去上传", PersonInfoActivity.class);
return; return;
} }
if (!hasAddressInfo || !hasBankInfo) {
String str = "请先完善您的银行卡信息和快递信息";
showBankAddrDialog(str);
return;
}
WechatShareDialog.getInstance().showBottomDialog(mActivity, pos -> { WechatShareDialog.getInstance().showBottomDialog(mActivity, pos -> {
if (pos == 0) { if (pos == 0) {
String name = TextUtils.isEmpty(mUserInfo.getNickName()) ? mUserInfo.getAccountName() : mUserInfo.getNickName(); String name = TextUtils.isEmpty(mUserInfo.getNickName()) ? mUserInfo.getAccountName() : mUserInfo.getNickName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment