网络传参格式统一

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

@@ -107,7 +107,7 @@ public class MainActivity extends BaseActivity {
                     appStatusTextView.setText(msg);
                     break;
                 case Constants.Code_HttpResponseCallback_NetworkNormalIcon://设置网络正常图标
-                    updateNetworkStateView();
+                    updateNetworkStateView(Constants.Code_NetworkNormal);
                     break;
                 case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示（如果硬件没有开启，则直接初始化smile）
                     if (DeviceInitManager.getInstance().totalOpenHardwareNum == 0){//没有需要打开的硬件直接smile初始化
@@ -167,15 +167,7 @@ public class MainActivity extends BaseActivity {
     private final InternetCheckService.InternetCheckServiceCallback internetCheckServiceCallback = new InternetCheckService.InternetCheckServiceCallback() {
         @Override
         public void updateView(int code, String msg) {
-            if(code == 0){
-                updateNetworkStateView();
-            } else {
-                iv_internetStatus.setImageResource(R.mipmap.no_network);
-                LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
-                layoutParams.width = (int) getResources().getDimension(R.dimen.dp_72);
-                layoutParams.height =  (int) getResources().getDimension(R.dimen.dp_32);
-                iv_networkType.setImageResource(R.mipmap.network_icon_no);
-            }
+            updateNetworkStateView(code);
         }
     };
 
@@ -189,18 +181,7 @@ public class MainActivity extends BaseActivity {
     private final NetBroadcastReceiver.NetNetworkCallback netNetworkCallback = new NetBroadcastReceiver.NetNetworkCallback() {
         @Override
         public void updateView(int code, String msg) {
-            switch (code) {
-                case Constants.Code_NetNetworkCallback_NetworkNormal:
-                    updateNetworkStateView();
-                    break;
-                case Constants.Code_NetNetworkCallback_NetworkAbnomal:
-                    iv_internetStatus.setImageResource(R.mipmap.no_network);
-                    LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
-                    layoutParams.width = (int) getResources().getDimension(R.dimen.dp_72);
-                    layoutParams.height =  (int) getResources().getDimension(R.dimen.dp_32);
-                    iv_networkType.setImageResource(R.mipmap.network_icon_no);
-                    break;
-            }
+            updateNetworkStateView(code);
         }
     };
     private final USBroadcastReceiver.USBroadcastCallback usBroadcastCallback = new USBroadcastReceiver.USBroadcastCallback() {
@@ -401,7 +382,7 @@ public class MainActivity extends BaseActivity {
         if (networkStatus) {
             appStatusTextView.setText("网络状态正常");
             appStatusTextView.setText("获取在线配置中……");
-            updateNetworkStateView();
+            updateNetworkStateView(Constants.Code_NetworkNormal);
             HttpRequest.getInstance().requestAuthentication();
         } else {
             if (ConfigManager.isForTheFirstTime()) {//首次打开
@@ -422,17 +403,25 @@ public class MainActivity extends BaseActivity {
     /**
      * 更新网络类型和internet连接状态视图
      *
-     * @param isInternetAvailable internet是否可用
+     * @param InternetAvailableCode 判断网络是否正常
      *
      */
-    private void updateNetworkStateView(boolean isInternetAvailable) {
-        iv_internetStatus.setImageResource(R.mipmap.network_available);
-        if (NetWorkUtils.getNetworkType(MainActivity.this) != -1){
-            LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
-            layoutParams.width = (int) getResources().getDimension(R.dimen.dp_32);
-            layoutParams.height =  (int) getResources().getDimension(R.dimen.dp_32);
-            iv_networkType.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
-        } else {//无网络
+    private void updateNetworkStateView(int InternetAvailableCode) {
+        if (InternetAvailableCode == Constants.Code_NetworkNormal){
+            iv_internetStatus.setImageResource(R.mipmap.network_available);
+            if (NetWorkUtils.getNetworkType(MainActivity.this) != -1){
+                LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
+                layoutParams.width = (int) getResources().getDimension(R.dimen.dp_32);
+                layoutParams.height =  (int) getResources().getDimension(R.dimen.dp_32);
+                iv_networkType.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
+            } else {//无网络
+                LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
+                layoutParams.width = (int) getResources().getDimension(R.dimen.dp_72);
+                layoutParams.height =  (int) getResources().getDimension(R.dimen.dp_32);
+                iv_networkType.setImageResource(R.mipmap.network_icon_no);
+            }
+        }else {
+            iv_internetStatus.setImageResource(R.mipmap.no_network);
             LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
             layoutParams.width = (int) getResources().getDimension(R.dimen.dp_72);
             layoutParams.height =  (int) getResources().getDimension(R.dimen.dp_32);

app/src/main/java/com/hanghui/senic/common/Constants.java

@@ -55,8 +55,8 @@ public class Constants {
     public static final int Code_USBroadcastCallback_USBQRCodeFail = 3;//二维码USB连接断开
     public static final int Code_USBroadcastCallback_USBAllInOneIDCardSucceed = 4;//东信多合一USB连接成功
     public static final int Code_USBroadcastCallback_USBAllInOneIDCardFail = 5;//东信多合一USB连接断开
-    public static final int Code_NetNetworkCallback_NetworkNormal = 0;//网络正常
-    public static final int Code_NetNetworkCallback_NetworkAbnomal = 1;//网络异常
+    public static final int Code_NetworkNormal = 0;//网络正常
+    public static final int Code_NetworkAbnomal = 1;//网络异常
 
     public static final int Code_DeviceInitCallback_HardwareIDCard = 1;//身份证
     public static final int Code_DeviceInitCallback_HardwareQRCode = 2;//二维码

app/src/main/java/com/hanghui/senic/service/InternetCheckService.java

@@ -8,6 +8,7 @@ import android.os.IBinder;
 import androidx.annotation.Nullable;
 
 import com.hanghui.senic.common.AppHandler;
+import com.hanghui.senic.common.Constants;
 import com.hanghui.senic.common.ThreadPoolManager;
 import com.hanghui.senic.service.usbserialdemo.utile.NetWorkUtils;
 
@@ -26,9 +27,9 @@ public class InternetCheckService extends Service {
                     public void run() {
                         boolean isNetwork = NetWorkUtils.isNetwork();
                         if (isNetwork){
-                            internetCheckServiceCallback.updateView(0,"网络正常");
+                            internetCheckServiceCallback.updateView(Constants.Code_NetworkNormal,"网络正常");
                         }else {
-                            internetCheckServiceCallback.updateView(1,"网络异常");
+                            internetCheckServiceCallback.updateView(Constants.Code_NetworkAbnomal,"网络异常");
                         }
                     }
                 });