diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3378229..7c7f635 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index cf48a71..f7555d0 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,12 @@ > 2.忘记密码、绑定网格、专号专登、获取配置接口对接 #### 2022-3-25 -> 1.android 8.0 闪退 (因为强制竖屏) android系统Bug \ No newline at end of file +> 1.android 8.0 闪退 (因为强制竖屏) android系统Bug + +#### 2022-3-29 + +>1.去除一像素进程保活 (可能引起手机接听电话时弹出App) +> +### 2022-6-29 + +> 1.添加融合通信登录失败的原因弹窗 \ No newline at end of file diff --git a/app/release/grid-1.apk b/app/release/grid-1.0.6.apk similarity index 95% rename from app/release/grid-1.apk rename to app/release/grid-1.0.6.apk index 1b55255..24daa9a 100644 Binary files a/app/release/grid-1.apk and b/app/release/grid-1.0.6.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 1d40a79..be5c018 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 5, - "versionName": "1.0.4", + "versionCode": 7, + "versionName": "1.0.6", "outputFile": "app-release.apk" } ] diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index 4db2532..ae6febf 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -63,6 +63,7 @@ public class PathConfig { public static final String USER_TYPE_GRID = "90675eba-e63e-4819-b45d-2c99ab78a278";//网格员角色 public static final String USER_TYPE_CENTER = "bc405346-8714-4ded-89ac-9cc4d755f66a"; public static final String USER_TYPE_DEPT = "6ac90f36-caa0-4273-9489-4d0197124c33"; + public static final String USER_TYPE_DISPOSE = "d518db95-eaf4-4066-ba2b-775627f5685e"; public static final String DEFAULT_AREA_CODE = "0";//地区 public static final String PLACE_TYPE_ID = "df8b758c-f6d8-465a-9aa8-c451fde47076";//场馆类型字典 diff --git a/build.gradle b/build.gradle index d34ef27..9e9be06 100644 --- a/build.gradle +++ b/build.gradle @@ -55,8 +55,8 @@ ext { gCompileSdkVersion = 30 gMinSdkVersion = 21 gTargetSdkVersion = 30 - gVersionCode = 5 - gVersionName = '1.0.4' + gVersionCode = 8 + gVersionName = '1.0.7' gBuildToolsVersion = "29.0.2" // gVersionCode=26 // gVersionName='1.3.0' diff --git a/chatmodule/src/main/AndroidManifest.xml b/chatmodule/src/main/AndroidManifest.xml index 4b0c364..734083b 100644 --- a/chatmodule/src/main/AndroidManifest.xml +++ b/chatmodule/src/main/AndroidManifest.xml @@ -151,6 +151,7 @@ + diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/BusinessService.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/BusinessService.java index b788da2..d0f42dd 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/BusinessService.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/BusinessService.java @@ -117,7 +117,7 @@ public class BusinessService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { startPlayVoice(); - startOnePxReceiver(); +// startOnePxReceiver(); startForegroundNotify(); //绑定守护进程 try { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/SmartConsultFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/SmartConsultFragment.java index c56370c..701f1d0 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/SmartConsultFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/SmartConsultFragment.java @@ -13,11 +13,7 @@ import android.webkit.WebChromeClient; import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; -import android.widget.FrameLayout; -import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.tengshisoft.commonmodule.R; @@ -26,7 +22,6 @@ import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.widget.base.BaseFragment; -import com.tenlionsoft.baselib.core.widget.views.AfxTextView; import com.tenlionsoft.baselib.core.widget.views.NestedScrollWebView; import com.tenlionsoft.baselib.utils.LogUtils; @@ -39,7 +34,6 @@ import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; -import okhttp3.Cookie; /** * 作者: adam diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java index a6ecf8f..2c7f0d5 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java @@ -52,6 +52,7 @@ import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.utils.ConvertUtils; import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.LogUtils; import com.tenlionsoft.baselib.utils.TimeUtils; import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.baselib.utils.UserLgUtils; @@ -427,6 +428,7 @@ public class WorkLocusActivity extends BaseActivity { LatLng preLatlng = new LatLng(Double.parseDouble(preBean.getUserLat()), Double.parseDouble(preBean.getUserLng())); LatLng nextLatlng = new LatLng(Double.parseDouble(nextBean.getUserLat()), Double.parseDouble(nextBean.getUserLng())); double distance = PointUtils.getDistance(Double.parseDouble(preBean.getUserLat()), Double.parseDouble(preBean.getUserLng()), Double.parseDouble(nextBean.getUserLat()), Double.parseDouble(nextBean.getUserLng())); + LogUtils.e(timeSpan+"===="+distance); //TODO 1、距离 if (timeSpan < 600) { //在线 diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java index b57ab50..6a6ee13 100755 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/LoginActivity.java @@ -235,7 +235,8 @@ public class LoginActivity extends BaseActivity { ToastUtils.show("未配置账户角色,请联系管理员进行配置."); } else { for (int i = 0; i < appTokenUser.getRoles().size(); i++) { - if (PathConfig.USER_TYPE_GRID.equals(appTokenUser.getRoles().get(i).getRoleId())) { + String roleId = appTokenUser.getRoles().get(i).getRoleId(); + if (PathConfig.USER_TYPE_GRID.equals(roleId) || PathConfig.USER_TYPE_DISPOSE.equals(roleId)) { tag = true; break; } 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 96d6cc0..1501e1d 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -26,6 +26,7 @@ import com.huawei.ecterminalsdk.base.TsdkLocalAddress; import com.huawei.ecterminalsdk.models.TsdkManager; import com.huawei.ecterminalsdk.models.call.TsdkCall; import com.tengshisoft.chatmodule.beans.ServiceSettingBeanV2; +import com.tengshisoft.chatmodule.beans.TSDKErrorConstant; import com.tengshisoft.chatmodule.hwclud.api.LoginView; import com.tengshisoft.chatmodule.hwclud.controller.MeetingController; import com.tengshisoft.chatmodule.hwclud.manager.CallMgrV2; @@ -48,6 +49,7 @@ import com.tengshisoft.modulemap.common.Location84; import com.tengshisoft.modulemap.common.PointUtils; import com.tenlionsoft.baselib.app.BaseAppContext; import com.tenlionsoft.baselib.constant.BroadcastConstant; +import com.tenlionsoft.baselib.constant.ConstantsV2; import com.tenlionsoft.baselib.constant.GlobalProvider; import com.tenlionsoft.baselib.constant.LionActions; import com.tenlionsoft.baselib.constant.PathConfig; @@ -618,12 +620,109 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro case BroadcastConstant.ACTION_LOGIN_FAILED: case BroadcastConstant.ACTION_AUTH_FAILED: this.loginFail(); + //提示登录失败的原因 + handlerLoginFailed(obj); break; default: break; } } + + /** + * 处理登录失败 + * + * @param obj 状态值 + */ + private void handlerLoginFailed(Object obj) { + this.loginFail(); + String str = (String) obj; + LogUtils.e("融合通信登录失败\n" + str); + int code = Integer.parseInt(str.split("-")[0]); + String index = str.split("-")[1]; + String msgHint = ""; + switch (code) { + case TSDKErrorConstant.CALL_ERROR_CODE_50331749: + // 服务器返回禁止 +// if (LoginActivityV2.isFirstChangePwd) { +// msgHint = getString(R.string.cloudLink_login_changePwdSuccessToLogin); +// LoginActivityV2.isFirstChangePwd = false; +// } else { + msgHint = getString(R.string.cloudLink_login_loginPassError); +// } + break; + case TSDKErrorConstant.CALL_ERROR_CODE_50331659: + // 网络接入错误 + case TSDKErrorConstant.CALL_ERROR_CODE_50331754: + // 请求超时 + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554441: + // 超时 + msgHint = getString(R.string.cloudLink_login_loginTimeOut); + break; + case TSDKErrorConstant.CALL_ERROR_CODE_50331762: + // 临时失效 + msgHint = getString(R.string.cloudLink_login_loginRepeat); + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554448: + // 服务器异常 + msgHint = getString(R.string.cloudLink_login_serviceError); + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554449: + // 账号被锁定 + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554467: + // 用户已被锁定 + msgHint = getString(R.string.cloudLink_login_accountLocked); + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554457: + // 老密码错误 + if (index.equals(ConstantsV2.LOGIN_STATUS_CODE_0)) { + msgHint = getString(R.string.cloudLink_login_accountLocked); + } + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554454: + // 查询服务器地址失败 + msgHint = getString(R.string.cloudLink_login_searchServerFail); + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554466: + // 用户名或者密码错误 + 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); + } + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554482: + // 账号未激活 + msgHint = getString(R.string.cloudLink_login_err_32); + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554444: + // DNS解析异常 + msgHint = getString(R.string.cloudLink_dnsError); + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554487: + // 账号已过期 + msgHint = getString(R.string.cloudLink_login_error_2037); + break; + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554470: + // 网络异常 + case TSDKErrorConstant.CALL_ERROR_CODE_50331817: + // SIP TCP建立失败 + case TSDKErrorConstant.LOGIN_ERROR_CODE_33554446: + // 鉴权失败 + default: + msgHint = getString(R.string.cloudLink_login_loginFail); + break; + } + if (!TextUtils.isEmpty(msgHint)) { + CloudLinkDialog dialogHint = new CloudLinkDialog(mActivity); + dialogHint.setOnlyYes(true); + dialogHint.setYes(getString(R.string.cloudLink_sure), null, dialogHint::dismiss); + dialogHint.setStr_message(msgHint, null); + dialogHint.show(); + } + } + @Override protected void onResume() { super.onResume();