Shangyp 5 months ago
parent
commit
cc99694b91

+ 7 - 9
app/src/main/java/com/hanghui/senic/activity/MainActivity.java

@@ -284,19 +284,17 @@ public class MainActivity extends BaseActivity {
     /**
      * 硬件初始化结果展示在底部文字显示
      */
-    static boolean isStartSmile = false;
     public static Runnable startHardwareRunnable = new Runnable() {
         @Override
         public void run() {
-            if (isStartSmile){
-                isStartSmile = false;
-                DeviceInitManager.getInstance().totalOpenHardwareNum = -1;
-                //smile服务
-                SmileController.getInstance().init();
-            }
             if (DeviceInitManager.getInstance().totalOpenHardwareNum == DeviceInitManager.getInstance().getAlreadyInitHardwareNum()){
-                isStartSmile = true;
-                AppHandler.getHandler().postDelayed(this, DeviceInitManager.getInstance().getAlreadyInitHardwareNum() * 2000);
+                AppHandler.getHandler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        //smile服务
+                        SmileController.getInstance().init();
+                    }
+                }, DeviceInitManager.getInstance().getAlreadyInitHardwareNum() * 2000);
             }
             //顶部图标显示
             switch (DeviceInitManager.getInstance().getSelectHardwareToInt()){

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

@@ -174,7 +174,7 @@ public class HttpRequest {
         AppHandler.getHandler().postDelayed(new Runnable() {
             @Override
             public void run() {
-                httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_HideBottomText, "隐藏底部文字");
+                httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_HideBottomTextView, "隐藏底部文字");
                 doIfDeviceExpiration();
             }
         }, 2 * 1000);
@@ -187,7 +187,7 @@ public class HttpRequest {
         //当到期时间为空时,直接初始化
         if (StringIsNull.IsStringNull(ConfigManager.getAuthenticationBean().getData().get(0).getExpirationDate())) {
             initConfig();
-            httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_ShowBottomText, "显示底部文字");
+            httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_ShowBottomTextView, "显示底部文字");
             return;
         }
         String startTime = ConfigManager.getNetworkTime();//获取网络时间
@@ -204,14 +204,14 @@ public class HttpRequest {
         int timeRange = Integer.parseInt(timeRangeData);
         if (timeRange > 30) {//距离过期大于30天则不显示,直接进行初始化操作
             initConfig();
-            httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_ShowBottomText, "显示底部文字");
+            httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_ShowBottomTextView, "显示底部文字");
         } else {//距离过期小于等于30天,则显示到期时间提示框
             PopupWindowManager.getInstance().getExpirationTimeFloat(timeRange);
             PopupWindowManager.getInstance().setListener(new PopupWindowManager.OnClickListener() {
                 @Override
                 public void OnClickListener() {
                     initConfig();
-                    httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_ShowBottomText, "显示底部文字");
+                    httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_ShowBottomTextView, "显示底部文字");
                 }
             });