Skip to content

android / dayu

Go to a project
Commit 8752da76 by 罗翻
Options

android v1.9.4

parent dfe234d2
Inline Side-by-side
Showing with 79 additions and 58 deletions
app/src/main/java/com/dayu/bigfish/presenter/manager/ManagerPresenter.java
......@@ -10,11 +10,9 @@ import com.dayu.utils.UserManager;
*/
public class ManagerPresenter extends ManagerContract.Presenter {
private UserInfo mUser;
@Override
public void onAttached() {
mUser = UserManager.getInstance().getUser();
UserInfo mUser = UserManager.getInstance().getUser();
getHxNum(mUser.getHxAccount());
}
......
app/src/main/java/com/dayu/bigfish/utils/HxManager.java
......@@ -56,6 +56,7 @@ public class HxManager {
private Context mContext;
private LicenceDialog mDialog;
private int mCount = 0;
private long mpreTime=0;
private HxManager() {
}
......@@ -168,9 +169,10 @@ public class HxManager {
} else if (info.getCategory() == 1 && (info.getFunctionType() == 5)) {
res = R.raw.eu_order;
}
if (res != -1) {
if (System.currentTimeMillis() - mpreTime >= 3000 && res != -1) {
MediaPlayer player = MediaPlayer.create(mContext, res);
player.start();
mpreTime = System.currentTimeMillis();
}
mCount++;
BadgeNumberManager.from(mContext).setBadgeNumber(mCount);
......@@ -206,8 +208,8 @@ public class HxManager {
//注册环信消息监听
EMClient.getInstance().chatManager().addMessageListener(msgListener);
//注册一个监听连接状态的listener //TODO 打开单设备登录.
// EMClient.getInstance().addConnectionListener(new MyConnectionListener());
//注册一个监听连接状态的listener
EMClient.getInstance().addConnectionListener(new MyConnectionListener());
}
//实现ConnectionListener接口
......
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -12,16 +12,16 @@ public class Constants {
/**
* 测试环境配置.
*/
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String ENVIROMENT = "debug";
public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true;
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static final String ENVIROMENT = "debug";
// public static final String BASE_URL = "http://47.94.101.239:3112";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
// public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final boolean IS_DEBUG = true;
/**
* uat环境配置.
......@@ -40,16 +40,16 @@ public class Constants {
/**
* 正式环境.
*/
// public static final String ENVIROMENT = "release";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static final String BASE_URL = "https://mobile.kf.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final boolean IS_DEBUG = false;
public static final String ENVIROMENT = "release";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String BASE_URL = "https://mobile.kf.ai";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final boolean IS_DEBUG = false;
/**
* 演示环境
......@@ -176,7 +176,7 @@ public class Constants {
public static final String STATE = "state";
public static final String CETIFICATION_STATE = "cetificaiton_state";//1:接单跳转0：待预约，登录页,个人中心跳转
public static final String CETIFICATION_STATE = "cetificaiton_state";//1:接单跳转、待预约 0：登录页,个人中心跳转
/**
......
baseSDK/src/main/java/com/dayu/utils/UserManager.java
......@@ -77,9 +77,12 @@ public class UserManager {
}
public int getRole() {
return getRole(getUser());
}
public int getRole(UserInfo userInfo) {
boolean isEngineer = false;
boolean isManager = false;
UserInfo userInfo = getUser();
if (userInfo != null && userInfo.getRoles().contains(2)) {
isEngineer = true;
}
......@@ -100,24 +103,4 @@ public class UserManager {
return Constants.NOT_LOGIN;
}
}
public int getRole(UserInfo userInfo) {
boolean isEngineer = false;
boolean isManager = false;
if (userInfo != null && userInfo.getRoles().contains(2)) {
isEngineer = true;
}
if (userInfo != null && userInfo.getRoles().contains(3)) {
isManager = true;
}
if (isEngineer && isManager) {
return Constants.MANAGER_ENGINEER;
} else if (isEngineer) {
return Constants.ENGINEER;
} else if (isManager) {
return Constants.MANAGER;
} else {
return Constants.NOT_LOGIN;
}
}
}
baseSDK/src/main/res/values/strings.xml
......@@ -309,7 +309,7 @@
<string name="modify_part_info">修改信息</string>
<string name="customer_acceptance">客户验收</string>
<string name="scan_code_for_appointment">请扫描二维码关注大鱼服务公众号</string>
<string name="scan_code_for_appointment_two">点击-查询工单-进行绑定登录后，选择工单验收</string>
<string name="scan_code_for_appointment_two">点击-上门服务-预约记录-进行绑定登录后，选择工单验收</string>
<string name="order_record">工单记录</string>
<string name="order_num">工单编号</string>
<string name="order_state">工单状态</string>
......
orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java
......@@ -169,7 +169,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
MobclickAgent.onEvent(BaseApplication.getContext(), "check_order_detail");
}
public void checkCachedLicense(Order order) {
private void checkCachedLicense(Order order) {
String uuid = ConUtil.getUUIDString(BaseApplication.getContext());
new Thread(() -> {
Manager manager = new Manager(BaseApplication.getContext());
......
orderCenter/src/main/java/com/dayu/order/presenter/orderliveness/OrderLivenessContract.java
......@@ -22,5 +22,7 @@ public interface OrderLivenessContract {
public abstract void verifyIdentity(List<String> list);
public abstract void commitePhoto(ArrayList<File> list, String delta);
public abstract void getServerList(int id, int kaId);
}
}
orderCenter/src/main/java/com/dayu/order/presenter/orderliveness/OrderLivenessPresenter.java
......@@ -7,9 +7,12 @@ import com.dayu.common.Constants;
import com.dayu.order.R;
import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.Order;
import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.ui.activity.MultiProcessOrderActivity;
import com.dayu.order.ui.activity.ServerInfoActivity;
import com.dayu.order.ui.activity.ServerListActivity;
import com.dayu.order.ui.activity.SopWebViewActivity;
import com.dayu.utils.SPUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
......@@ -88,8 +91,13 @@ public class OrderLivenessPresenter extends OrderLivenessContract.Presenter {
bundle.putInt(Constants.ID, mOrder.getId());
mView.startActivity(ServerInfoActivity.class, bundle);
} else if (mOrder.getSpus().size() == 1) {
bundle.putInt(Constants.ID, mOrder.getSpus().get(0).getId());
mView.startActivity(ServerListActivity.class, bundle);
Spu spu = mOrder.getSpus().get(0);
if (spu.getGoodNum() == 1) {
getServerList(spu.getId(), mOrder.getKaCompanyId());
} else {
bundle.putInt(Constants.ID, mOrder.getSpus().get(0).getId());
mView.startActivity(ServerListActivity.class, bundle);
}
}
} else {
ToastUtils.showShortToast(R.string.certification_not_pass);
......@@ -128,4 +136,28 @@ public class OrderLivenessPresenter extends OrderLivenessContract.Presenter {
mView.dumpBack();
}));
}
@Override
public void getServerList(int id, int kaId) {
mView.showDialog();
OrderApiFactory.getServerList(id).subscribe(baseObserver(spus -> {
Spu spu = spus.get(0);
ArrayList<Spu> mUnFinishSpus = new ArrayList<>();
if (spu.getStatus() == 1) {
mUnFinishSpus.add(spu);
}
Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, spu.getId());
bundle.putInt(Constants.STATE, 0);
bundle.putSerializable(OrderConstant.SPU, spu);
bundle.putParcelableArrayList(OrderConstant.SPUS, mUnFinishSpus);
bundle.putInt(Constants.ORDER_POSTION, 0);
bundle.putInt(OrderConstant.KAADDRESSID, kaId);
if (spu.getSopStatus() == 1 && spu.getStatus() == 1) {
mView.startActivity(SopWebViewActivity.class, bundle);
} else {
mView.startActivity(MultiProcessOrderActivity.class, bundle);
}
}));
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/QrCodeActivity.java
......@@ -40,7 +40,7 @@ public class QrCodeActivity extends BaseActivity<QRCodePresenter, QrCodeLayoutBi
}
mBind.titleBack.setOnClickListener(v -> goBack());
SpannableString spannableString = new SpannableString(getString(R.string.scan_code_for_appointment_two));
spannableString.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.bg_button)), 3, 7, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spannableString.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.bg_button)), 3, 12, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mBind.notice.setText(spannableString);
}
......
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
......@@ -438,7 +438,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
CustomDialog customDialog = new CustomDialog(mContext, R.style.CustomDialog, UIUtils.getString(R.string.engineer_identity_not_audite)
, (dialog, confirm) -> {
if (confirm) {
ARouter.getInstance().build(RouterPath.PATH_CERTIFICAITON).navigation();
Bundle bundle = new Bundle();
bundle.putInt(Constants.CETIFICATION_STATE, 1);
ARouter.getInstance().build(RouterPath.PATH_CERTIFICAITON).withBundle(Constants.BUNDLE, bundle).navigation();
}
});
customDialog.setTitle(UIUtils.getString(R.string.certification))
......
orderCenter/src/main/res/layout/qr_code_layout.xml
......@@ -44,9 +44,11 @@
<TextView
android:id="@+id/notice"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginRight="10dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/scan_code_for_appointment_two"
android:textSize="15sp" />
......
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
......@@ -116,8 +116,8 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
@Override
public void dumpAndSave(UserInfo info) {
info.getRoles().clear();
info.getRoles().add(3);
// info.getRoles().clear();
// info.getRoles().add(3);
switch (UserManager.getInstance().getRole(info)) {
case Constants.MANAGER:
UserManager.getInstance().saveUser(info);
......
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