修改

app/src/main/java/com/hanghui/senic/activity/MainActivity.java

@@ -61,7 +61,7 @@ import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 import java.util.Date;
 
 
-public class MainActivity extends BaseActivity implements InternetCheckService.InternetCheckServiceCallback {
+public class MainActivity extends BaseActivity {
 
     private LinearLayout topRightClickConfigTV;//点击设置
     private TextView topLeftTimeTV;//时间
@@ -71,7 +71,6 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
     private TextView bottomIsDebugShow;
     private RelativeLayout mainActivity_bg;
     private ImageView main_networkStatus;//internet的连接状态
-    private ImageView network_icon_no;
     private ImageView network_icon_start;//网络类型
     private static ImageView hardwareIcon_IDCard;//硬件连接状态-身份证阅读器
     private static ImageView hardwareIcon_QRCode;//硬件连接状态-二维码读头
@@ -115,17 +114,16 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
                     main_networkStatus.setImageResource(R.mipmap.network_available);
                     int networkType = NetWorkUtils.getNetworkType(MainActivity.this);
                     if (networkType != -1){
-                        network_icon_no.setVisibility(View.GONE);
-                        network_icon_start.setVisibility(View.VISIBLE);
+                        network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
                         network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
                     } else {//无网络
-                        network_icon_no.setVisibility(View.VISIBLE);
-                        network_icon_start.setVisibility(View.GONE);
+                        network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
+                        network_icon_start.setImageResource(R.mipmap.network_icon_no);
                     }
                     break;
                 case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示（如果硬件没有开启，则直接初始化smile）
                     if (DeviceInitManager.getInstance().totalOpenHardwareNum == 0){//没有需要打开的硬件直接smile初始化
-                        HttpRequest.getInstance().setStartSmileService();
+                        SmileController.getInstance().init();
                     }else {
                         appStatusTextView.setText("硬件启动中");
                     }
@@ -178,6 +176,27 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
         }
     };
 
+    private final InternetCheckService.InternetCheckServiceCallback internetCheckServiceCallback = new InternetCheckService.InternetCheckServiceCallback() {
+        @Override
+        public void updateView(int code, String msg) {
+            if(code == 0){
+                main_networkStatus.setImageResource(R.mipmap.network_available);
+                int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
+                if (networkState != -1){
+                    network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
+                    network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
+                } else {//无网络
+                    network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
+                    network_icon_start.setImageResource(R.mipmap.network_icon_no);
+                }
+            } else {
+                main_networkStatus.setImageResource(R.mipmap.no_network);
+                network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
+                network_icon_start.setImageResource(R.mipmap.network_icon_no);
+            }
+        }
+    };
+
     private final PassportController.PassportCallback passportCallback = new PassportController.PassportCallback() {
         @Override
         public void updateView(int code, String msg) {
@@ -195,20 +214,19 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
                             .into(main_networkStatus);
                     int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
                     if (networkState != -1){
-                        network_icon_no.setVisibility(View.GONE);
-                        network_icon_start.setVisibility(View.VISIBLE);
+                        network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
                         network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
                     } else {//无网络
-                        network_icon_no.setVisibility(View.VISIBLE);
-                        network_icon_start.setVisibility(View.GONE);
+                        network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
+                        network_icon_start.setImageResource(R.mipmap.network_icon_no);
                     }
                     break;
                 case Constants.Code_NetNetworkCallback_NetworkAnomaly:
                     Glide.with(CommonUtil.getCurrentActivity())
                             .load(R.mipmap.no_network)
                             .into(main_networkStatus);
-                    network_icon_no.setVisibility(View.VISIBLE);
-                    network_icon_start.setVisibility(View.GONE);
+                    network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
+                    network_icon_start.setImageResource(R.mipmap.network_icon_no);
                     break;
             }
         }
@@ -274,7 +292,7 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
                 isStartSmile = false;
                 DeviceInitManager.getInstance().totalOpenHardwareNum = -1;
                 //smile服务
-                HttpRequest.getInstance().setStartSmileService();
+                SmileController.getInstance().init();
             }
             if (DeviceInitManager.getInstance().totalOpenHardwareNum == DeviceInitManager.getInstance().getAlreadyInitHardwareNum()){
                 isStartSmile = true;
@@ -363,7 +381,7 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
         RegularReportingService.start(this);
         //ping百度，判断网络连接是否正常
         InternetCheckService.start(this);
-        InternetCheckService.setInternetCheckServiceCallback(this);
+        InternetCheckService.setInternetCheckServiceCallback(internetCheckServiceCallback);
         //清除上一天数据
         ClearDataService.start(this);
         //首页时间
@@ -440,12 +458,11 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
                     .into(main_networkStatus);
             int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
             if (networkState != -1){
-                network_icon_no.setVisibility(View.GONE);
-                network_icon_start.setVisibility(View.VISIBLE);
+                network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
                 network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
             } else {//无网络
-                network_icon_no.setVisibility(View.VISIBLE);
-                network_icon_start.setVisibility(View.GONE);
+                network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
+                network_icon_start.setImageResource(R.mipmap.network_icon_no);
             }
             HttpRequest.getInstance().requestAuthentication();
         } else {
@@ -508,7 +525,6 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
         mainActivity_bg = findViewById(R.id.mainActivityRelativeLayout);
         topRightClickConfigTV = findViewById(R.id.main_Config);
         bottomIsDebugShow = findViewById(R.id.bottomIsDebugShow);
-        network_icon_no = findViewById(R.id.network_icon_no);
         network_icon_start = findViewById(R.id.network_icon_start);
         topRightClickConfigTV.setOnClickListener(mainConfigOnClickListener);
         hardwareIcon_IDCard = findViewById(R.id.hardwareIcon_IDCard);
@@ -622,30 +638,4 @@ public class MainActivity extends BaseActivity implements InternetCheckService.I
         QRCodeController.getInstance().requestUSBPermission();
         QRCodeController.getInstance().requestOverlayPersmission();
     }
-
-    @Override
-    public void updateView(int code, String msg) {
-        AppHandler.getHandler().post(new Runnable() {
-            @Override
-            public void run() {
-                if(code == 0){
-                    main_networkStatus.setImageResource(R.mipmap.network_available);
-                    int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
-                    if (networkState != -1){
-                        network_icon_no.setVisibility(View.GONE);
-                        network_icon_start.setVisibility(View.VISIBLE);
-                        network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
-                    } else {//无网络
-                        network_icon_no.setVisibility(View.VISIBLE);
-                        network_icon_start.setVisibility(View.GONE);
-                    }
-                } else {
-                    main_networkStatus.setImageResource(R.mipmap.no_network);
-                    network_icon_no.setVisibility(View.VISIBLE);
-                    network_icon_start.setVisibility(View.GONE);
-                }
-            }
-        });
-
-    }
 }