Browse Source

在线配置修复

Shangyp 4 months ago
parent
commit
bca31797a4

+ 1 - 1
app/build.gradle

@@ -15,7 +15,7 @@ android {
         minSdkVersion 22
         targetSdkVersion 22
         versionCode 120//115
-        versionName "1.1.9.241010" //1.1.5.241003
+        versionName "1.1.9.241023" //1.1.5.241003
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters "armeabi-v7a"   //armeabi-v7a 'arm64-v8a'

+ 1 - 0
app/src/main/java/com/hanghui/senic/activity/MainActivity.java

@@ -326,6 +326,7 @@ public class MainActivity extends BaseActivity {
     public void setOnCreate() {
         AppLogUtils.i(false, "", "MainActivity生命周期     setOnCreate(), MainActivity.this=" + MainActivity.this);
         ConfigManager.isConfigRequestSuccess = false;
+        ConfigManager.isUpdateConfig = false;
         iDeviceUI = BaseDeviceUI.getInstance().getDeviceUI();
         initViews();
         //修改顶部网络状态

+ 3 - 0
app/src/main/java/com/hanghui/senic/network/HttpRequest.java

@@ -177,6 +177,9 @@ public class HttpRequest {
         MyAppliction.getmDbDao().insertData("data", jsonData);
         //更新配置项
         ConfigManager.UpdateConfiguration(authenticationBean);
+        if (ConfigManager.isUpdateConfig){
+            return;
+        }
         //将设备是否首次打开状态修改
         SharedPreferencesUtils.setParam(MyAppliction.getContext(), "forTheFirstTime", false);
         //弹框提示设备到期时间

+ 1 - 0
app/src/main/java/com/hanghui/senic/receiver/NetBroadcastReceiver.java

@@ -28,6 +28,7 @@ public class NetBroadcastReceiver extends BroadcastReceiver {
         } else {
             AppLogUtils.e(false, "", "广播获取到网络异常 悬浮框展示");
             PopupWindowManager.showFloatIfNoNetwork();
+            ConfigManager.isUpdateConfig = true;
             netNetworkCallback.updateView(Constants.Code_internetUnAvailable, "网络异常");
 
         }

+ 1 - 0
app/src/main/java/com/hanghui/senic/service/usbserialdemo/utile/ConfigManager.java

@@ -73,6 +73,7 @@ public class ConfigManager {
     public static final String TAG = "ConfigManager";
     public static boolean isShortContact = false;//门磁信号是否短接
     public static boolean isConfigRequestSuccess = false;//配置是否请求成功
+    public static boolean isUpdateConfig = false;//是否更新配置项
     public static boolean isFileExists = false;//判断file是否存在
     public static boolean closePassport = false;//护照机是否关闭