网络状态

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

@@ -107,7 +107,8 @@ public class MainActivity extends BaseActivity {
                     appStatusTextView.setText(msg);
                     break;
                 case Constants.Code_HttpResponseCallback_NetworkNormalIcon://设置网络正常图标
-                    updateNetworkTypeAndInternetView(Constants.Code_internetAvailable);
+                    updateNetworkInternetView(Constants.Code_internetAvailable);
+                    updateNetworkTypeView();
                     break;
                 case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示（如果硬件没有开启，则直接初始化smile）
                     if (DeviceInitManager.getInstance().totalOpenHardwareNum == 0){//没有需要打开的硬件直接smile初始化
@@ -167,21 +168,21 @@ public class MainActivity extends BaseActivity {
     private final InternetCheckService.InternetCheckServiceCallback internetCheckServiceCallback = new InternetCheckService.InternetCheckServiceCallback() {
         @Override
         public void updateView(int code, String msg) {
-            updateNetworkTypeAndInternetView(code);
+            updateNetworkInternetView(code);
         }
     };
 
     private final PassportController.PassportCallback passportCallback = new PassportController.PassportCallback() {
         @Override
         public void updateView(int code, String msg) {
-            appStatusTextView.setText(msg);
+            updateNetworkTypeView();
         }
     };
 
     private final NetBroadcastReceiver.NetNetworkCallback netNetworkCallback = new NetBroadcastReceiver.NetNetworkCallback() {
         @Override
         public void updateView(int code, String msg) {
-            updateNetworkTypeAndInternetView(code);
+            updateNetworkTypeView();
         }
     };
     private final USBroadcastReceiver.USBroadcastCallback usBroadcastCallback = new USBroadcastReceiver.USBroadcastCallback() {
@@ -382,7 +383,7 @@ public class MainActivity extends BaseActivity {
         if (networkStatus) { //有网络
             appStatusTextView.setText("网络状态正常");
             appStatusTextView.setText("获取在线配置中……");
-            updateNetworkTypeAndInternetView(Constants.Code_internetAvailable);
+            updateNetworkTypeView();
             HttpRequest.getInstance().requestAuthentication();
         } else { //无网络
             if (ConfigManager.isForTheFirstTime()) {//首次打开
@@ -409,15 +410,8 @@ public class MainActivity extends BaseActivity {
     private void updateNetworkInternetView(int InternetAvailableCode) {
         if (InternetAvailableCode == Constants.Code_internetAvailable){
             iv_internetStatus.setImageResource(R.mipmap.network_available);
-
-
         } else if (InternetAvailableCode == Constants.Code_internetUnAvailable){
             iv_internetStatus.setImageResource(R.mipmap.no_network);
-
-
-        } else if (InternetAvailableCode == Constants.Code_networkStateChange){
-
-
         }
     }
 
@@ -429,7 +423,7 @@ public class MainActivity extends BaseActivity {
             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));
+            iv_networkType.setImageResource(NetWorkUtils.getNetworkType());
         } else {//无网络
             LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
             layoutParams.width = (int) getResources().getDimension(R.dimen.dp_72);

app/src/main/java/com/hanghui/senic/network/HttpRequest.java

@@ -118,7 +118,6 @@ public class HttpRequest {
                 AppHandler.getHandler().removeCallbacks(requestConfigRunnable);
                 AppLogUtils.e(false, "", "在线配置返回后销毁网络异常的悬浮框");
                 PopupWindowManager.getInstance().dismissNetWorkpopupWindow();
-                httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_NetworkNormalIcon, "设置网络正常图标");
                 if (authenticationBean.getCode() != 200) {
                     DeviceInitManager.getInstance().setConfigRequestSuccess(false);
                     if (isAgainRequest) { //第二次请求还是失败时才显示"在线配置获取失败，启用上一次本地配置"的提示文字
@@ -141,6 +140,7 @@ public class HttpRequest {
                     postRequestConfigRunnable(3 * 1000);
                     return;
                 }
+                httpResponseCallback.updateView(Constants.Code_HttpResponseCallback_NetworkNormalIcon, "设置网络正常图标");
                 ConfigManager.isConfigRequestSuccess = true;
                 DeviceInitManager.getInstance().setConfigRequestSuccess(true);
                 try {