From ba82e9e4b47a1ab61e49a200b5886844fc23b7c3 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Fri, 12 May 2023 18:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0log,=E8=9E=8D=E5=90=88?= =?UTF-8?q?=E9=80=9A=E8=AE=AF=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=B8=8D=E5=8F=91=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chatmodule/sockets/WsManager.java | 20 +- .../mainmodule/base/MainTabActivity.java | 354 ++++++++---------- 2 files changed, 172 insertions(+), 202 deletions(-) diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java index 55292e7..b1f9c5f 100755 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java @@ -35,7 +35,7 @@ import okio.ByteString; public class WsManager implements IWsManager { private final static int RECONNECT_INTERVAL = 10 * 1000; //重连自增步长 private final static long RECONNECT_MAX_TIME = 120 * 1000; //最大重连间隔 - private final static int PING_TIME=50; + private final static int PING_TIME = 50; private Context mContext; private String wsUrl; private WebSocket mWebSocket; @@ -152,15 +152,11 @@ public class WsManager implements IWsManager { private void initWebSocket() { if (mOkHttpClient == null) { - mOkHttpClient = new OkHttpClient.Builder() - .pingInterval(PING_TIME, TimeUnit.SECONDS) - .retryOnConnectionFailure(true) - .build(); + mOkHttpClient = + new OkHttpClient.Builder().pingInterval(PING_TIME, TimeUnit.SECONDS).retryOnConnectionFailure(true).build(); } if (mRequest == null) { - mRequest = new Request.Builder() - .url(wsUrl) - .build(); + mRequest = new Request.Builder().url(wsUrl).build(); } mOkHttpClient.dispatcher().cancelAll(); try { @@ -238,7 +234,8 @@ public class WsManager implements IWsManager { mOkHttpClient.dispatcher().cancelAll(); } if (mWebSocket != null) { - boolean isClosed = mWebSocket.close(WsStatus.CODE.NORMAL_CLOSE, WsStatus.TIP.NORMAL_CLOSE); + boolean isClosed = mWebSocket.close(WsStatus.CODE.NORMAL_CLOSE, + WsStatus.TIP.NORMAL_CLOSE); //非正常关闭连接 if (!isClosed) { LogUtils.e("服务器连接失败"); @@ -303,8 +300,8 @@ public class WsManager implements IWsManager { //检查网络是否连接 private boolean isNetworkConnected(Context context) { if (context != null) { - ConnectivityManager mConnectivityManager = (ConnectivityManager) context - .getSystemService(Context.CONNECTIVITY_SERVICE); + ConnectivityManager mConnectivityManager = + (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo(); if (mNetworkInfo != null) { return mNetworkInfo.isAvailable(); @@ -315,6 +312,7 @@ public class WsManager implements IWsManager { private void sendNotify(String jsonStr) { if (!TextUtils.isEmpty(jsonStr)) { + LogUtils.e("收到消息:" + jsonStr); Intent broadCstIntent = new Intent(); if (PathConfig.IS_SECRET) { try { diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java index 5587a9f..8f26807 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -130,13 +130,12 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro private List mFragments; private UpcomingReceiver mReceiver; private long finishTime = 0; - private String[] mActions = new String[]{ - BroadcastConstant.ACTION_LOGIN_SUCCESS, - BroadcastConstant.ACTION_LOGIN_FAILED, - BroadcastConstant.ACTION_AUTH_FAILED, + private String[] mActions = new String[]{BroadcastConstant.ACTION_LOGIN_SUCCESS, + BroadcastConstant.ACTION_LOGIN_FAILED, BroadcastConstant.ACTION_AUTH_FAILED, BroadcastConstant.ACTION_FIRST_CHANGE_PWD}; private String mConfId; private ProgressDialog mDialog; + private boolean isCallIn; @Override protected int setLayoutId() { @@ -165,49 +164,45 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro * 获取融合通信配置信息 */ private void getAppConfig() { - RetrofitManager.getInstance() - .create(BaseApiService.class) - .getAppConfig(UserLgUtils.getToken()) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + RetrofitManager.getInstance().create(BaseApiService.class).getAppConfig(UserLgUtils.getToken()).compose(RxTransformer.getTransformer()).subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull JsonObject obj) { - try { - String rhUrl = obj.get("rhUrl").getAsString(); - String rhPort = obj.get("rhPort").getAsString(); - String rhHttpsPort = obj.get("rhHttpsPort").getAsString(); - if (!TextUtils.isEmpty(rhUrl) && !TextUtils.isEmpty(rhPort)) { - UserLgUtils.setRhPort(Integer.parseInt(rhPort)); - UserLgUtils.setRhUrl(rhUrl); - UserLgUtils.setHttpsPort(rhHttpsPort); - if (AppUtils.isSupportCall()) { - //判断是否可以视频通话 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - initHWClound();//初始化华为融合通信 - getUserExpandInfo(); - } - } + @Override + public void onNext(@NonNull JsonObject obj) { + try { + String rhUrl = obj.get("rhUrl").getAsString(); + String rhPort = obj.get("rhPort").getAsString(); + String rhHttpsPort = obj.get("rhHttpsPort").getAsString(); + if (!TextUtils.isEmpty(rhUrl) && !TextUtils.isEmpty(rhPort)) { + UserLgUtils.setRhPort(Integer.parseInt(rhPort)); + UserLgUtils.setRhUrl(rhUrl); + UserLgUtils.setHttpsPort(rhHttpsPort); + if (AppUtils.isSupportCall()) { + //判断是否可以视频通话 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + initHWClound();//初始化华为融合通信 + getUserExpandInfo(); } - } catch (Exception e) { - e.printStackTrace(); } } + } catch (Exception e) { + e.printStackTrace(); + } + } - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - } + @Override + public void onError(@NonNull Throwable e) { + e.printStackTrace(); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } @@ -215,7 +210,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro private void checkNavigation() { int navigationBarHeight = getNavigationBarHeight(this); if (navigationBarHeight > 0) { - FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mRlContent.getLayoutParams(); + FrameLayout.LayoutParams params = + (FrameLayout.LayoutParams) mRlContent.getLayoutParams(); params.bottomMargin = navigationBarHeight; mRlContent.setLayoutParams(params); } @@ -228,7 +224,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { String appPath = this.getApplicationInfo().dataDir + "/lib"; ServiceManger.getServiceMgr().startService(this, appPath, 0); - LoginMangerV2.getInstance().regLoginEventNotification(LoginReceiver.getInstance());//注册登录时的各种广播 + LoginMangerV2.getInstance().regLoginEventNotification(LoginReceiver.getInstance()); + //注册登录时的各种广播 CallMgrV2.getInstance().regCallServiceNotification(CallFunc.getInstance());// MeetingMgrV2.getInstance().regConfServiceNotification(ConfFunc.getInstance()); int port = UserLgUtils.getRhPort(); @@ -245,11 +242,13 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro chooseNotificationPage(getIntent()); } + private void doLoginHWClound() { mDialog = UIUtil.initDialog(mActivity, "融合通信登录中...."); mDialog.show(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - LoginMangerV2.getInstance().checkLogin(UserLgUtils.getHwAccount(), UserLgUtils.getHwPwd(), this); + LoginMangerV2.getInstance().checkLogin(UserLgUtils.getHwAccount(), + UserLgUtils.getHwPwd(), this); } else { mDialog.dismiss(); } @@ -262,9 +261,11 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro protected void showOpenPermissionDialog() { CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this); cloudLinkDialog.setStr_message(getResources().getString(R.string.cloudLink_meeting_getFloatPer), null); - cloudLinkDialog.setYes(getString(R.string.cloudLink_toopen), ContextCompat.getColorStateList(this, R.color.dialog_button_yes), () -> { + cloudLinkDialog.setYes(getString(R.string.cloudLink_toopen), + ContextCompat.getColorStateList(this, R.color.dialog_button_yes), () -> { cloudLinkDialog.dismiss(); - Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + getPackageName())); + Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse( + "package:" + getPackageName())); startActivity(intent); }); cloudLinkDialog.setNo(getString(R.string.cloudLink_cancel), null, cloudLinkDialog::dismiss); @@ -275,103 +276,98 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro * 获取用户拓展信息 */ private void getUserExpandInfo() { - RetrofitManager.getInstance() - .create(BaseApiService.class) - .getUserExpandInfo(UserLgUtils.getUserId(), UserLgUtils.getToken()) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + RetrofitManager.getInstance().create(BaseApiService.class).getUserExpandInfo(UserLgUtils.getUserId(), UserLgUtils.getToken()).compose(RxTransformer.getTransformer()).subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + } + + @Override + public void onNext(@NonNull UserExpandInfoBean userExpandInfoBean) { + UserLgUtils.setUserAreaCode(""); + UserLgUtils.setLocationAddress(""); + UserLgUtils.setUserAreaLevel(-1); + if (!TextUtils.isEmpty(userExpandInfoBean.getAreaCode())) { + String cityCode = userExpandInfoBean.getAreaCode().substring(0, 4); + String areaCode = userExpandInfoBean.getAreaCode().substring(0, 6); + String streetCode = userExpandInfoBean.getAreaCode().substring(0, 9); + String villageCode = userExpandInfoBean.getAreaCode(); + UserLgUtils.setUserAreaCode(userExpandInfoBean.getAreaCode()); + UserLgUtils.setLocationAddress(userExpandInfoBean.getAreaName()); + UserLgUtils.setUserAreaLevel(userExpandInfoBean.getUserLevel()); + GlobalProvider.save(mActivity, "cityCode", cityCode); + GlobalProvider.save(mActivity, "areaCode", areaCode); + GlobalProvider.save(mActivity, "streetCode", streetCode); + GlobalProvider.save(mActivity, "villageCode", villageCode); + GlobalProvider.save(mActivity, "fullAreaCode", + userExpandInfoBean.getAreaCode()); + + } + if (!TextUtils.isEmpty(userExpandInfoBean.getSmcNumber())) { + LogUtils.e(userExpandInfoBean); + UserLgUtils.setHwAccount(userExpandInfoBean.getSmcNumber()); + UserLgUtils.setHwPwd(userExpandInfoBean.getSmcPassword()); + int status = getIntent().getIntExtra("status", -1); + if (status == -1) { + doLoginHWClound(); } + } + String ids = ""; + List departments = + userExpandInfoBean.getDepartments(); + for (int i = 0; i < departments.size(); i++) { + ids += departments.get(i).getDepartmentId() + ","; + LogUtils.e(departments.get(i).getDepartmentName()); + } + if (ids.endsWith(",")) { + ids = ids.substring(0, ids.length() - 1); + } + LogUtils.e(ids); + UserLgUtils.setUserDeptId(ids); + } - @Override - public void onNext(@NonNull UserExpandInfoBean userExpandInfoBean) { - UserLgUtils.setUserAreaCode(""); - UserLgUtils.setLocationAddress(""); - UserLgUtils.setUserAreaLevel(-1); - if (!TextUtils.isEmpty(userExpandInfoBean.getAreaCode())) { - String cityCode = userExpandInfoBean.getAreaCode().substring(0, 4); - String areaCode = userExpandInfoBean.getAreaCode().substring(0, 6); - String streetCode = userExpandInfoBean.getAreaCode().substring(0, 9); - String villageCode = userExpandInfoBean.getAreaCode(); - UserLgUtils.setUserAreaCode(userExpandInfoBean.getAreaCode()); - UserLgUtils.setLocationAddress(userExpandInfoBean.getAreaName()); - UserLgUtils.setUserAreaLevel(userExpandInfoBean.getUserLevel()); - GlobalProvider.save(mActivity, "cityCode", cityCode); - GlobalProvider.save(mActivity, "areaCode", areaCode); - GlobalProvider.save(mActivity, "streetCode", streetCode); - GlobalProvider.save(mActivity, "villageCode", villageCode); - GlobalProvider.save(mActivity, "fullAreaCode", userExpandInfoBean.getAreaCode()); + @Override + public void onError(@NonNull Throwable e) { - } - if (!TextUtils.isEmpty(userExpandInfoBean.getSmcNumber())) { - LogUtils.e(userExpandInfoBean); - UserLgUtils.setHwAccount(userExpandInfoBean.getSmcNumber()); - UserLgUtils.setHwPwd(userExpandInfoBean.getSmcPassword()); - int status = getIntent().getIntExtra("status", -1); - if (status == -1) { - doLoginHWClound(); - } - } - String ids = ""; - List departments = userExpandInfoBean.getDepartments(); - for (int i = 0; i < departments.size(); i++) { - ids += departments.get(i).getDepartmentId() + ","; - LogUtils.e(departments.get(i).getDepartmentName()); - } - if (ids.endsWith(",")) { - ids = ids.substring(0, ids.length() - 1); - } - LogUtils.e(ids); - UserLgUtils.setUserDeptId(ids); - } + } - @Override - public void onError(@NonNull Throwable e) { + @Override + public void onComplete() { - } - - @Override - public void onComplete() { - - } - }); + } + }); } /** * App版本校验 */ private void checkAppVersion() { - RetrofitManager.getInstance() - .create(BaseApiService.class) - .doCheckAppVersion(BaseUrlApi.APP_VERSION_ID) - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(Disposable d) { + RetrofitManager.getInstance().create(BaseApiService.class).doCheckAppVersion(BaseUrlApi.APP_VERSION_ID).compose(RxTransformer.getTransformer()).subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + } + + @Override + public void onNext(VersionBean successBean) { + if (successBean != null && successBean.getData() > 0) { + if (CheckUpdateUtils.checkcode(MainTabActivity.this, successBean.getData() + + "")) { + startDownloadApk(); } + } + } - @Override - public void onNext(VersionBean successBean) { - if (successBean != null && successBean.getData() > 0) { - if (CheckUpdateUtils.checkcode(MainTabActivity.this, successBean.getData() + "")) { - startDownloadApk(); - } - } - } + @Override + public void onError(Throwable e) { - @Override - public void onError(Throwable e) { + } - } + @Override + public void onComplete() { - @Override - public void onComplete() { - - } - }); + } + }); } /** @@ -447,7 +443,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro private void showGPSOpen() { CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this); cloudLinkDialog.setStr_message(getResources().getString(R.string.city_location), null); - cloudLinkDialog.setYes(getString(R.string.cloudLink_toopen), ContextCompat.getColorStateList(this, R.color.dialog_button_yes), () -> { + cloudLinkDialog.setYes(getString(R.string.cloudLink_toopen), + ContextCompat.getColorStateList(this, R.color.dialog_button_yes), () -> { cloudLinkDialog.dismiss(); Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); startActivity(intent); @@ -462,7 +459,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro private void showNotifySettingPage() { CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this); cloudLinkDialog.setStr_message(getResources().getString(R.string.notify_per), null); - cloudLinkDialog.setYes(getString(R.string.cloudLink_toopen), ContextCompat.getColorStateList(this, R.color.dialog_button_yes), () -> { + cloudLinkDialog.setYes(getString(R.string.cloudLink_toopen), + ContextCompat.getColorStateList(this, R.color.dialog_button_yes), () -> { cloudLinkDialog.dismiss(); NotificationUtils.toSettingPage(getApplicationContext()); }); @@ -481,7 +479,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro KeyBoardListener.getInstance(this).init(); BaseFragment gridMainFragment = FragmentUtils.getGridMainFragment(); BaseFragment userCenterFragment = FragmentUtils.getUserCenterFragment(); - BaseFragment cusFragment = (BaseFragment) ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_FRAGMENT_SMART_CONSULT).navigation(); + BaseFragment cusFragment = + (BaseFragment) ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_FRAGMENT_SMART_CONSULT).navigation(); mFragments.add(gridMainFragment); mFragments.add(cusFragment); mFragments.add(userCenterFragment); @@ -504,11 +503,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro mVpContent.setCurrentItem(0, false); mRlTitleBar.setVisibility(View.VISIBLE); mTvBaseTitle.setText("乌兰察布市社会市域治理"); - ImmersionBar.with(this) - .statusBarColor(R.color.main_theme) - .statusBarDarkFont(true) - .titleBar(mRlTitleBar) - .init(); + ImmersionBar.with(this).statusBarColor(R.color.main_theme).statusBarDarkFont(true).titleBar(mRlTitleBar).init(); break; case 2://咨询 mIvHome.setBackgroundResource(R.drawable.ic_home_normal); @@ -517,10 +512,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro mTvMine.setTextColor(getResources().getColor(R.color.gray_text)); mVpContent.setCurrentItem(1, false); mTvBaseTitle.setText("智慧咨询"); - ImmersionBar.with(mActivity) - .statusBarColor(R.color.status_bar_blue) - .statusBarDarkFont(false) - .init(); + ImmersionBar.with(mActivity).statusBarColor(R.color.status_bar_blue).statusBarDarkFont(false).init(); break; case 3://我的 mIvHome.setBackgroundResource(R.drawable.ic_home_normal); @@ -530,11 +522,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro mVpContent.setCurrentItem(2, false); mRlTitleBar.setVisibility(View.VISIBLE); mTvBaseTitle.setText("乌兰察布市社会市域治理"); - ImmersionBar.with(this) - .statusBarColor(R.color.main_theme) - .titleBar(mRlTitleBar) - .statusBarDarkFont(true) - .init(); + ImmersionBar.with(this).statusBarColor(R.color.main_theme).titleBar(mRlTitleBar).statusBarDarkFont(true).init(); break; } } @@ -601,17 +589,19 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro } private void sendLoginSuccess() { - LogUtils.e("登录融合通信成功" + System.currentTimeMillis()); + LogUtils.e("登录融合通信成功" + System.currentTimeMillis() + "===" + BaseAppContext.getInstance().getOtherUserId()); //发送登录成功的广播 - Intent intent = new Intent(); - intent.setAction(PathConfig.ACTION_CALL_LOGIN_SUCCESS); - intent.putExtra("to", BaseAppContext.getInstance().getOtherUserId()); - intent.putExtra("from", UserLgUtils.getUserId()); - intent.putExtra("number", LoginMangerV2.getInstance().getTerminal()); - //登录人的融合通信的号码 - LogUtils.e(LoginMangerV2.getInstance().getTerminal()); - //发送登录失败的广播 - sendBroadcast(intent); + if (!TextUtils.isEmpty(BaseAppContext.getInstance().getOtherUserId())) { + Intent intent = new Intent(); + intent.setAction(PathConfig.ACTION_CALL_LOGIN_SUCCESS); + intent.putExtra("to", BaseAppContext.getInstance().getOtherUserId()); + intent.putExtra("from", UserLgUtils.getUserId()); + intent.putExtra("number", LoginMangerV2.getInstance().getTerminal()); + //登录人的融合通信的号码 + LogUtils.e(LoginMangerV2.getInstance().getTerminal()); + //发送登录失败的广播 + sendBroadcast(intent); + } } @Override @@ -728,8 +718,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro if (index.equals(ConstantsV2.LOGIN_STATUS_CODE_0)) { msgHint = getString(R.string.cloudLink_mine_loginFailZero); } else { - msgHint = getString(R.string.cloudLink_mine_loginFailIndex1) + - index + getString(R.string.cloudLink_mine_loginFailIndex2); + msgHint = + getString(R.string.cloudLink_mine_loginFailIndex1) + index + getString(R.string.cloudLink_mine_loginFailIndex2); } break; case TSDKErrorConstant.LOGIN_ERROR_CODE_33554482: @@ -841,7 +831,9 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro //定位到了 BDLocation bdLocation = intent.getParcelableExtra("data"); String address = intent.getStringExtra("address"); - Location84 location84 = PointUtils.bd09ToWgs84(new Location84(bdLocation.getLatitude(), bdLocation.getLongitude())); + Location84 location84 = + PointUtils.bd09ToWgs84(new Location84(bdLocation.getLatitude(), + bdLocation.getLongitude())); BaseAppContext.getInstance().setLat(location84.getLat()); BaseAppContext.getInstance().setLng(location84.getLng()); BaseAppContext.getInstance().setAddress(address); @@ -915,46 +907,25 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro String id = split[1]; switch (targetPage) { case "TASK_ACCEPT": //中心端受理任务), - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST) - .withString("id", id) - .navigation(); + ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST).withString("id", id).navigation(); break; case "TASK_ALLOCATE"://中心端分拨 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST) - .withString("id", id) - .navigation(); + ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST).withString("id", id).navigation(); break; case "TASK_ALLOCATE_SURE"://部门端分拨确认 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_LIST_ACTIVITY) - .withString("id", id) - .navigation(); + ARouter.getInstance().build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_LIST_ACTIVITY).withString("id", id).navigation(); break; case "TASK_DISPATCH"://部门端派遣 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY) - .withString("id", id) - .navigation(); + ARouter.getInstance().build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY).withString("id", id).navigation(); break; case "TASK_DISPATCH_HANDLING"://派遣处理任务 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_LIST) - .withString("id", id) - .navigation(); + ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_LIST).withString("id", id).navigation(); break; case "TASK_DISPATCH_HANDLING_EXAMINE"://派遣核查任务 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST) - .withString("id", id) - .navigation(); + ARouter.getInstance().build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST).withString("id", id).navigation(); break; case "TASK_EXAMINE"://上报人核查 - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST) - .withString("id", id) - .navigation(); + ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST).withString("id", id).navigation(); break; } } @@ -966,7 +937,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro int status = intent.getIntExtra("status", -1); int notifyId = intent.getIntExtra("notifyId", -1); if (notifyId != -1) { - NotificationManager am = (NotificationManager) mActivity.getSystemService(Context.NOTIFICATION_SERVICE); + NotificationManager am = + (NotificationManager) mActivity.getSystemService(Context.NOTIFICATION_SERVICE); am.cancel(notifyId); } LogUtils.e("通知栏点击===" + status); @@ -1041,7 +1013,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro confJoinParam.setAccessNumber(mConfId); confJoinParam.setConfPassword(""); String mTerminal = LoginMangerV2.getInstance().getTerminal(); - int result = MeetingMgrV2.getInstance().joinConf(confJoinParam, true, mTerminal); + int result = MeetingMgrV2.getInstance().joinConf(confJoinParam, true, + mTerminal); if (result == 0) { //入会成功 LogUtils.e("入会成功"); @@ -1054,7 +1027,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro sendLoginSuccess(); } } else { - LoginMangerV2.getInstance().checkLogin(UserLgUtils.getHwAccount(), UserLgUtils.getHwPwd(), this); + LoginMangerV2.getInstance().checkLogin(UserLgUtils.getHwAccount(), + UserLgUtils.getHwPwd(), this); } } else { if (mDialog != null && mDialog.isShowing()) { @@ -1090,14 +1064,12 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro try { JSONObject obj = new JSONObject(page); String userId = obj.getString("from"); - UserDatabaseBean userByUserId = AppDatabase.getInstance(mActivity).getUserDao().getUserByUserId(userId); + UserDatabaseBean userByUserId = + AppDatabase.getInstance(mActivity).getUserDao().getUserByUserId(userId); if (!TextUtils.isEmpty(userByUserId.getUserName())) { - ARouter.getInstance() - .build(PathConfig.PATH_MODULE_CHAT_CHAT) - .withString("to", userByUserId.getUserId()) - .withString("toName", userByUserId.getUserName()) - .withString("data", page) - .navigation(); + ARouter.getInstance().build(PathConfig.PATH_MODULE_CHAT_CHAT).withString("to", + userByUserId.getUserId()).withString("toName", + userByUserId.getUserName()).withString("data", page).navigation(); } else { ToastUtils.show("未找到联系人"); }