optimize

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(Constants.Code_NetworkNormal);
+                    updateNetworkStateView(Constants.Code_internetAvailable);
                     break;
                 case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示（如果硬件没有开启，则直接初始化smile）
                     if (DeviceInitManager.getInstance().totalOpenHardwareNum == 0){//没有需要打开的硬件直接smile初始化
@@ -382,7 +382,7 @@ public class MainActivity extends BaseActivity {
         if (networkStatus) {
             appStatusTextView.setText("网络状态正常");
             appStatusTextView.setText("获取在线配置中……");
-            updateNetworkStateView(Constants.Code_NetworkNormal);
+            updateNetworkStateView(Constants.Code_internetAvailable);
             HttpRequest.getInstance().requestAuthentication();
         } else {
             if (ConfigManager.isForTheFirstTime()) {//首次打开
@@ -407,7 +407,7 @@ public class MainActivity extends BaseActivity {
      *
      */
     private void updateNetworkStateView(int InternetAvailableCode) {
-        if (InternetAvailableCode == Constants.Code_NetworkNormal){
+        if (InternetAvailableCode == Constants.Code_internetAvailable){
             iv_internetStatus.setImageResource(R.mipmap.network_available);
             if (NetWorkUtils.getNetworkType(MainActivity.this) != -1){
                 LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();

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_NetworkNormal = 0;//网络正常
-    public static final int Code_NetworkAbnomal = 1;//网络异常
+    public static final int Code_internetAvailable = 0;//internet正常
+    public static final int Code_internetUnAvailable = 1;//internet异常
 
     public static final int Code_DeviceInitCallback_HardwareIDCard = 1;//身份证
     public static final int Code_DeviceInitCallback_HardwareQRCode = 2;//二维码

app/src/main/java/com/hanghui/senic/receiver/NetBroadcastReceiver.java

@@ -21,14 +21,14 @@ public class NetBroadcastReceiver extends BroadcastReceiver {
         if (networkInfo != null) {
             AppLogUtils.e(false, "", "广播返回网址正常后销毁悬浮框 ");
             PopupWindowManager.getInstance().dismissNetWorkpopupWindow();
-            netNetworkCallback.updateView(Constants.Code_NetworkNormal, "网络恢复");
+            netNetworkCallback.updateView(Constants.Code_internetAvailable, "网络恢复");
             if (!ConfigManager.isConfigRequestSuccess) {
                 HttpRequest.getInstance().postRequestConfigRunnable(2 * 1000);
             }
         } else {
             AppLogUtils.e(false, "", "广播获取到网络异常 悬浮框展示");
             PopupWindowManager.showFloatIfNoNetwork();
-            netNetworkCallback.updateView(Constants.Code_NetworkAbnomal, "网络异常");
+            netNetworkCallback.updateView(Constants.Code_internetUnAvailable, "网络异常");
 
         }
 

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

@@ -27,9 +27,9 @@ public class InternetCheckService extends Service {
                     public void run() {
                         boolean isNetwork = NetWorkUtils.isNetwork();
                         if (isNetwork){
-                            internetCheckServiceCallback.updateView(Constants.Code_NetworkNormal,"网络正常");
+                            internetCheckServiceCallback.updateView(Constants.Code_internetAvailable,"网络正常");
                         }else {
-                            internetCheckServiceCallback.updateView(Constants.Code_NetworkAbnomal,"网络异常");
+                            internetCheckServiceCallback.updateView(Constants.Code_internetUnAvailable,"网络异常");
                         }
                     }
                 });