gaojian/gridclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

打印log,融合通讯第一次登录不发广播

Browse Source
This commit is contained in:
itgaojian 2023-05-12 18:04:43 +08:00
parent 90b8e20e82
commit ba82e9e4b4
2 changed files with 172 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chatmodule/src/main/java/com/tengshisoft/chatmodule/sockets/WsManager.java
View File

@ -35,7 +35,7 @@ import okio.ByteString;
public class WsManager implements IWsManager { public class WsManager implements IWsManager {
private final static int RECONNECT_INTERVAL = 10 * 1000; //重连自增步长 private final static int RECONNECT_INTERVAL = 10 * 1000; //重连自增步长
private final static long RECONNECT_MAX_TIME = 120 * 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 Context mContext;
private String wsUrl; private String wsUrl;
private WebSocket mWebSocket; private WebSocket mWebSocket;
@ -152,15 +152,11 @@ public class WsManager implements IWsManager {
private void initWebSocket() { private void initWebSocket() {
if (mOkHttpClient == null) { if (mOkHttpClient == null) {
mOkHttpClient = new OkHttpClient.Builder() mOkHttpClient =
.pingInterval(PING_TIME, TimeUnit.SECONDS) new OkHttpClient.Builder().pingInterval(PING_TIME, TimeUnit.SECONDS).retryOnConnectionFailure(true).build();
.retryOnConnectionFailure(true)
.build();
} }
if (mRequest == null) { if (mRequest == null) {
mRequest = new Request.Builder() mRequest = new Request.Builder().url(wsUrl).build();
.url(wsUrl)
.build();
} }
mOkHttpClient.dispatcher().cancelAll(); mOkHttpClient.dispatcher().cancelAll();
try { try {
@ -238,7 +234,8 @@ public class WsManager implements IWsManager {
mOkHttpClient.dispatcher().cancelAll(); mOkHttpClient.dispatcher().cancelAll();
} }
if (mWebSocket != null) { 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) { if (!isClosed) {
LogUtils.e("服务器连接失败"); LogUtils.e("服务器连接失败");
@ -303,8 +300,8 @@ public class WsManager implements IWsManager {
//检查网络是否连接 //检查网络是否连接
private boolean isNetworkConnected(Context context) { private boolean isNetworkConnected(Context context) {
if (context != null) { if (context != null) {
ConnectivityManager mConnectivityManager = (ConnectivityManager) context ConnectivityManager mConnectivityManager =
.getSystemService(Context.CONNECTIVITY_SERVICE); (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo(); NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo();
if (mNetworkInfo != null) { if (mNetworkInfo != null) {
return mNetworkInfo.isAvailable(); return mNetworkInfo.isAvailable();
@ -315,6 +312,7 @@ public class WsManager implements IWsManager {
private void sendNotify(String jsonStr) { private void sendNotify(String jsonStr) {
if (!TextUtils.isEmpty(jsonStr)) { if (!TextUtils.isEmpty(jsonStr)) {
LogUtils.e("收到消息:" + jsonStr);
Intent broadCstIntent = new Intent(); Intent broadCstIntent = new Intent();
if (PathConfig.IS_SECRET) { if (PathConfig.IS_SECRET) {
try { try {

144
mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java
View File

@ -130,13 +130,12 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
private List<BaseFragment> mFragments; private List<BaseFragment> mFragments;
private UpcomingReceiver mReceiver; private UpcomingReceiver mReceiver;
private long finishTime = 0; private long finishTime = 0;
private String[] mActions = new String[]{ private String[] mActions = new String[]{BroadcastConstant.ACTION_LOGIN_SUCCESS,
BroadcastConstant.ACTION_LOGIN_SUCCESS, BroadcastConstant.ACTION_LOGIN_FAILED, BroadcastConstant.ACTION_AUTH_FAILED,
BroadcastConstant.ACTION_LOGIN_FAILED,
BroadcastConstant.ACTION_AUTH_FAILED,
BroadcastConstant.ACTION_FIRST_CHANGE_PWD}; BroadcastConstant.ACTION_FIRST_CHANGE_PWD};
private String mConfId; private String mConfId;
private ProgressDialog mDialog; private ProgressDialog mDialog;
private boolean isCallIn;
@Override @Override
protected int setLayoutId() { protected int setLayoutId() {
@ -165,11 +164,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
* 获取融合通信配置信息 * 获取融合通信配置信息
*/ */
private void getAppConfig() { private void getAppConfig() {
RetrofitManager.getInstance() RetrofitManager.getInstance().create(BaseApiService.class).getAppConfig(UserLgUtils.getToken()).compose(RxTransformer.getTransformer()).subscribe(new Observer<JsonObject>() {
.create(BaseApiService.class)
.getAppConfig(UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<JsonObject>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
@ -215,7 +210,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
private void checkNavigation() { private void checkNavigation() {
int navigationBarHeight = getNavigationBarHeight(this); int navigationBarHeight = getNavigationBarHeight(this);
if (navigationBarHeight > 0) { if (navigationBarHeight > 0) {
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mRlContent.getLayoutParams(); FrameLayout.LayoutParams params =
(FrameLayout.LayoutParams) mRlContent.getLayoutParams();
params.bottomMargin = navigationBarHeight; params.bottomMargin = navigationBarHeight;
mRlContent.setLayoutParams(params); mRlContent.setLayoutParams(params);
} }
@ -228,7 +224,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
String appPath = this.getApplicationInfo().dataDir + "/lib"; String appPath = this.getApplicationInfo().dataDir + "/lib";
ServiceManger.getServiceMgr().startService(this, appPath, 0); ServiceManger.getServiceMgr().startService(this, appPath, 0);
LoginMangerV2.getInstance().regLoginEventNotification(LoginReceiver.getInstance());//注册登录时的各种广播 LoginMangerV2.getInstance().regLoginEventNotification(LoginReceiver.getInstance());
//注册登录时的各种广播
CallMgrV2.getInstance().regCallServiceNotification(CallFunc.getInstance());// CallMgrV2.getInstance().regCallServiceNotification(CallFunc.getInstance());//
MeetingMgrV2.getInstance().regConfServiceNotification(ConfFunc.getInstance()); MeetingMgrV2.getInstance().regConfServiceNotification(ConfFunc.getInstance());
int port = UserLgUtils.getRhPort(); int port = UserLgUtils.getRhPort();
@ -245,11 +242,13 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
chooseNotificationPage(getIntent()); chooseNotificationPage(getIntent());
} }
private void doLoginHWClound() { private void doLoginHWClound() {
mDialog = UIUtil.initDialog(mActivity, "融合通信登录中...."); mDialog = UIUtil.initDialog(mActivity, "融合通信登录中....");
mDialog.show(); mDialog.show();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { 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 { } else {
mDialog.dismiss(); mDialog.dismiss();
} }
@ -262,9 +261,11 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
protected void showOpenPermissionDialog() { protected void showOpenPermissionDialog() {
CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this); CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this);
cloudLinkDialog.setStr_message(getResources().getString(R.string.cloudLink_meeting_getFloatPer), null); 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(); 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); startActivity(intent);
}); });
cloudLinkDialog.setNo(getString(R.string.cloudLink_cancel), null, cloudLinkDialog::dismiss); cloudLinkDialog.setNo(getString(R.string.cloudLink_cancel), null, cloudLinkDialog::dismiss);
@ -275,11 +276,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
* 获取用户拓展信息 * 获取用户拓展信息
*/ */
private void getUserExpandInfo() { private void getUserExpandInfo() {
RetrofitManager.getInstance() RetrofitManager.getInstance().create(BaseApiService.class).getUserExpandInfo(UserLgUtils.getUserId(), UserLgUtils.getToken()).compose(RxTransformer.getTransformer()).subscribe(new Observer<UserExpandInfoBean>() {
.create(BaseApiService.class)
.getUserExpandInfo(UserLgUtils.getUserId(), UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<UserExpandInfoBean>() {
@Override @Override
public void onSubscribe(@NonNull Disposable d) { public void onSubscribe(@NonNull Disposable d) {
@ -302,7 +299,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
GlobalProvider.save(mActivity, "areaCode", areaCode); GlobalProvider.save(mActivity, "areaCode", areaCode);
GlobalProvider.save(mActivity, "streetCode", streetCode); GlobalProvider.save(mActivity, "streetCode", streetCode);
GlobalProvider.save(mActivity, "villageCode", villageCode); GlobalProvider.save(mActivity, "villageCode", villageCode);
GlobalProvider.save(mActivity, "fullAreaCode", userExpandInfoBean.getAreaCode()); GlobalProvider.save(mActivity, "fullAreaCode",
userExpandInfoBean.getAreaCode());
} }
if (!TextUtils.isEmpty(userExpandInfoBean.getSmcNumber())) { if (!TextUtils.isEmpty(userExpandInfoBean.getSmcNumber())) {
@ -315,7 +313,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
} }
} }
String ids = ""; String ids = "";
List<UserExpandInfoBean.DepartmentsBean> departments = userExpandInfoBean.getDepartments(); List<UserExpandInfoBean.DepartmentsBean> departments =
userExpandInfoBean.getDepartments();
for (int i = 0; i < departments.size(); i++) { for (int i = 0; i < departments.size(); i++) {
ids += departments.get(i).getDepartmentId() + ","; ids += departments.get(i).getDepartmentId() + ",";
LogUtils.e(departments.get(i).getDepartmentName()); LogUtils.e(departments.get(i).getDepartmentName());
@ -343,11 +342,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
* App版本校验 * App版本校验
*/ */
private void checkAppVersion() { private void checkAppVersion() {
RetrofitManager.getInstance() RetrofitManager.getInstance().create(BaseApiService.class).doCheckAppVersion(BaseUrlApi.APP_VERSION_ID).compose(RxTransformer.getTransformer()).subscribe(new Observer<VersionBean>() {
.create(BaseApiService.class)
.doCheckAppVersion(BaseUrlApi.APP_VERSION_ID)
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<VersionBean>() {
@Override @Override
public void onSubscribe(Disposable d) { public void onSubscribe(Disposable d) {
@ -356,7 +351,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
@Override @Override
public void onNext(VersionBean successBean) { public void onNext(VersionBean successBean) {
if (successBean != null && successBean.getData() > 0) { if (successBean != null && successBean.getData() > 0) {
if (CheckUpdateUtils.checkcode(MainTabActivity.this, successBean.getData() + "")) { if (CheckUpdateUtils.checkcode(MainTabActivity.this, successBean.getData() +
"")) {
startDownloadApk(); startDownloadApk();
} }
} }
@ -447,7 +443,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
private void showGPSOpen() { private void showGPSOpen() {
CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this); CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this);
cloudLinkDialog.setStr_message(getResources().getString(R.string.city_location), null); 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(); cloudLinkDialog.dismiss();
Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
startActivity(intent); startActivity(intent);
@ -462,7 +459,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
private void showNotifySettingPage() { private void showNotifySettingPage() {
CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this); CloudLinkDialog cloudLinkDialog = new CloudLinkDialog(this);
cloudLinkDialog.setStr_message(getResources().getString(R.string.notify_per), null); 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(); cloudLinkDialog.dismiss();
NotificationUtils.toSettingPage(getApplicationContext()); NotificationUtils.toSettingPage(getApplicationContext());
}); });
@ -481,7 +479,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
KeyBoardListener.getInstance(this).init(); KeyBoardListener.getInstance(this).init();
BaseFragment gridMainFragment = FragmentUtils.getGridMainFragment(); BaseFragment gridMainFragment = FragmentUtils.getGridMainFragment();
BaseFragment userCenterFragment = FragmentUtils.getUserCenterFragment(); 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(gridMainFragment);
mFragments.add(cusFragment); mFragments.add(cusFragment);
mFragments.add(userCenterFragment); mFragments.add(userCenterFragment);
@ -504,11 +503,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
mVpContent.setCurrentItem(0, false); mVpContent.setCurrentItem(0, false);
mRlTitleBar.setVisibility(View.VISIBLE); mRlTitleBar.setVisibility(View.VISIBLE);
mTvBaseTitle.setText("乌兰察布市社会市域治理"); mTvBaseTitle.setText("乌兰察布市社会市域治理");
ImmersionBar.with(this) ImmersionBar.with(this).statusBarColor(R.color.main_theme).statusBarDarkFont(true).titleBar(mRlTitleBar).init();
.statusBarColor(R.color.main_theme)
.statusBarDarkFont(true)
.titleBar(mRlTitleBar)
.init();
break; break;
case 2://咨询 case 2://咨询
mIvHome.setBackgroundResource(R.drawable.ic_home_normal); 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)); mTvMine.setTextColor(getResources().getColor(R.color.gray_text));
mVpContent.setCurrentItem(1, false); mVpContent.setCurrentItem(1, false);
mTvBaseTitle.setText("智慧咨询"); mTvBaseTitle.setText("智慧咨询");
ImmersionBar.with(mActivity) ImmersionBar.with(mActivity).statusBarColor(R.color.status_bar_blue).statusBarDarkFont(false).init();
.statusBarColor(R.color.status_bar_blue)
.statusBarDarkFont(false)
.init();
break; break;
case 3://我的 case 3://我的
mIvHome.setBackgroundResource(R.drawable.ic_home_normal); mIvHome.setBackgroundResource(R.drawable.ic_home_normal);
@ -530,11 +522,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
mVpContent.setCurrentItem(2, false); mVpContent.setCurrentItem(2, false);
mRlTitleBar.setVisibility(View.VISIBLE); mRlTitleBar.setVisibility(View.VISIBLE);
mTvBaseTitle.setText("乌兰察布市社会市域治理"); mTvBaseTitle.setText("乌兰察布市社会市域治理");
ImmersionBar.with(this) ImmersionBar.with(this).statusBarColor(R.color.main_theme).titleBar(mRlTitleBar).statusBarDarkFont(true).init();
.statusBarColor(R.color.main_theme)
.titleBar(mRlTitleBar)
.statusBarDarkFont(true)
.init();
break; break;
} }
} }
@ -601,8 +589,9 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
} }
private void sendLoginSuccess() { private void sendLoginSuccess() {
LogUtils.e("登录融合通信成功" + System.currentTimeMillis()); LogUtils.e("登录融合通信成功" + System.currentTimeMillis() + "===" + BaseAppContext.getInstance().getOtherUserId());
//发送登录成功的广播 //发送登录成功的广播
if (!TextUtils.isEmpty(BaseAppContext.getInstance().getOtherUserId())) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(PathConfig.ACTION_CALL_LOGIN_SUCCESS); intent.setAction(PathConfig.ACTION_CALL_LOGIN_SUCCESS);
intent.putExtra("to", BaseAppContext.getInstance().getOtherUserId()); intent.putExtra("to", BaseAppContext.getInstance().getOtherUserId());
@ -613,6 +602,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
//发送登录失败的广播 //发送登录失败的广播
sendBroadcast(intent); sendBroadcast(intent);
} }
}
@Override @Override
public void onEvtCallStartResult(TsdkCall call) { public void onEvtCallStartResult(TsdkCall call) {
@ -728,8 +718,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
if (index.equals(ConstantsV2.LOGIN_STATUS_CODE_0)) { if (index.equals(ConstantsV2.LOGIN_STATUS_CODE_0)) {
msgHint = getString(R.string.cloudLink_mine_loginFailZero); msgHint = getString(R.string.cloudLink_mine_loginFailZero);
} else { } else {
msgHint = getString(R.string.cloudLink_mine_loginFailIndex1) + msgHint =
index + getString(R.string.cloudLink_mine_loginFailIndex2); getString(R.string.cloudLink_mine_loginFailIndex1) + index + getString(R.string.cloudLink_mine_loginFailIndex2);
} }
break; break;
case TSDKErrorConstant.LOGIN_ERROR_CODE_33554482: case TSDKErrorConstant.LOGIN_ERROR_CODE_33554482:
@ -841,7 +831,9 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
//定位到了 //定位到了
BDLocation bdLocation = intent.getParcelableExtra("data"); BDLocation bdLocation = intent.getParcelableExtra("data");
String address = intent.getStringExtra("address"); 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().setLat(location84.getLat());
BaseAppContext.getInstance().setLng(location84.getLng()); BaseAppContext.getInstance().setLng(location84.getLng());
BaseAppContext.getInstance().setAddress(address); BaseAppContext.getInstance().setAddress(address);
@ -915,46 +907,25 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
String id = split[1]; String id = split[1];
switch (targetPage) { switch (targetPage) {
case "TASK_ACCEPT": //中心端受理任务), case "TASK_ACCEPT": //中心端受理任务),
ARouter.getInstance() ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST).withString("id", id).navigation();
.build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST)
.withString("id", id)
.navigation();
break; break;
case "TASK_ALLOCATE"://中心端分拨 case "TASK_ALLOCATE"://中心端分拨
ARouter.getInstance() ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST).withString("id", id).navigation();
.build(PathConfig.PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST)
.withString("id", id)
.navigation();
break; break;
case "TASK_ALLOCATE_SURE"://部门端分拨确认 case "TASK_ALLOCATE_SURE"://部门端分拨确认
ARouter.getInstance() ARouter.getInstance().build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_LIST_ACTIVITY).withString("id", id).navigation();
.build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_LIST_ACTIVITY)
.withString("id", id)
.navigation();
break; break;
case "TASK_DISPATCH"://部门端派遣 case "TASK_DISPATCH"://部门端派遣
ARouter.getInstance() ARouter.getInstance().build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY).withString("id", id).navigation();
.build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY)
.withString("id", id)
.navigation();
break; break;
case "TASK_DISPATCH_HANDLING"://派遣处理任务 case "TASK_DISPATCH_HANDLING"://派遣处理任务
ARouter.getInstance() ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_LIST).withString("id", id).navigation();
.build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_LIST)
.withString("id", id)
.navigation();
break; break;
case "TASK_DISPATCH_HANDLING_EXAMINE"://派遣核查任务 case "TASK_DISPATCH_HANDLING_EXAMINE"://派遣核查任务
ARouter.getInstance() ARouter.getInstance().build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST).withString("id", id).navigation();
.build(PathConfig.PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST)
.withString("id", id)
.navigation();
break; break;
case "TASK_EXAMINE"://上报人核查 case "TASK_EXAMINE"://上报人核查
ARouter.getInstance() ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST).withString("id", id).navigation();
.build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST)
.withString("id", id)
.navigation();
break; break;
} }
} }
@ -966,7 +937,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
int status = intent.getIntExtra("status", -1); int status = intent.getIntExtra("status", -1);
int notifyId = intent.getIntExtra("notifyId", -1); int notifyId = intent.getIntExtra("notifyId", -1);
if (notifyId != -1) { if (notifyId != -1) {
NotificationManager am = (NotificationManager) mActivity.getSystemService(Context.NOTIFICATION_SERVICE); NotificationManager am =
(NotificationManager) mActivity.getSystemService(Context.NOTIFICATION_SERVICE);
am.cancel(notifyId); am.cancel(notifyId);
} }
LogUtils.e("通知栏点击===" + status); LogUtils.e("通知栏点击===" + status);
@ -1041,7 +1013,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
confJoinParam.setAccessNumber(mConfId); confJoinParam.setAccessNumber(mConfId);
confJoinParam.setConfPassword(""); confJoinParam.setConfPassword("");
String mTerminal = LoginMangerV2.getInstance().getTerminal(); String mTerminal = LoginMangerV2.getInstance().getTerminal();
int result = MeetingMgrV2.getInstance().joinConf(confJoinParam, true, mTerminal); int result = MeetingMgrV2.getInstance().joinConf(confJoinParam, true,
mTerminal);
if (result == 0) { if (result == 0) {
//入会成功 //入会成功
LogUtils.e("入会成功"); LogUtils.e("入会成功");
@ -1054,7 +1027,8 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
sendLoginSuccess(); sendLoginSuccess();
} }
} else { } else {
LoginMangerV2.getInstance().checkLogin(UserLgUtils.getHwAccount(), UserLgUtils.getHwPwd(), this); LoginMangerV2.getInstance().checkLogin(UserLgUtils.getHwAccount(),
UserLgUtils.getHwPwd(), this);
} }
} else { } else {
if (mDialog != null && mDialog.isShowing()) { if (mDialog != null && mDialog.isShowing()) {
@ -1090,14 +1064,12 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
try { try {
JSONObject obj = new JSONObject(page); JSONObject obj = new JSONObject(page);
String userId = obj.getString("from"); 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())) { if (!TextUtils.isEmpty(userByUserId.getUserName())) {
ARouter.getInstance() ARouter.getInstance().build(PathConfig.PATH_MODULE_CHAT_CHAT).withString("to",
.build(PathConfig.PATH_MODULE_CHAT_CHAT) userByUserId.getUserId()).withString("toName",
.withString("to", userByUserId.getUserId()) userByUserId.getUserName()).withString("data", page).navigation();
.withString("toName", userByUserId.getUserName())
.withString("data", page)
.navigation();
} else { } else {
ToastUtils.show("未找到联系人"); ToastUtils.show("未找到联系人");
} }