updateNetworkInternetView

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_internetAvailable);
+                    updateNetworkTypeAndInternetView(Constants.Code_internetAvailable);
                     break;
                 case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示（如果硬件没有开启，则直接初始化smile）
                     if (DeviceInitManager.getInstance().totalOpenHardwareNum == 0){//没有需要打开的硬件直接smile初始化
@@ -167,7 +167,7 @@ public class MainActivity extends BaseActivity {
     private final InternetCheckService.InternetCheckServiceCallback internetCheckServiceCallback = new InternetCheckService.InternetCheckServiceCallback() {
         @Override
         public void updateView(int code, String msg) {
-            updateNetworkStateView(code);
+            updateNetworkTypeAndInternetView(code);
         }
     };
 
@@ -181,7 +181,7 @@ public class MainActivity extends BaseActivity {
     private final NetBroadcastReceiver.NetNetworkCallback netNetworkCallback = new NetBroadcastReceiver.NetNetworkCallback() {
         @Override
         public void updateView(int code, String msg) {
-            updateNetworkStateView(code);
+            updateNetworkTypeAndInternetView(code);
         }
     };
     private final USBroadcastReceiver.USBroadcastCallback usBroadcastCallback = new USBroadcastReceiver.USBroadcastCallback() {
@@ -382,7 +382,7 @@ public class MainActivity extends BaseActivity {
         if (networkStatus) { //有网络
             appStatusTextView.setText("网络状态正常");
             appStatusTextView.setText("获取在线配置中……");
-            updateNetworkStateView(Constants.Code_internetAvailable);
+            updateNetworkTypeAndInternetView(Constants.Code_internetAvailable);
             HttpRequest.getInstance().requestAuthentication();
         } else { //无网络
             if (ConfigManager.isForTheFirstTime()) {//首次打开
@@ -401,27 +401,36 @@ public class MainActivity extends BaseActivity {
     }
 
     /**
-     * 更新网络类型和internet连接状态视图
+     * 更新internet连接状态视图
      *
      * @param InternetAvailableCode 判断网络是否正常
      *
      */
-    private void updateNetworkStateView(int InternetAvailableCode) {
+    private void updateNetworkInternetView(int InternetAvailableCode) {
         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();
-                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 {
+
+
+        } else if (InternetAvailableCode == Constants.Code_internetUnAvailable){
             iv_internetStatus.setImageResource(R.mipmap.no_network);
+
+
+        } else if (InternetAvailableCode == Constants.Code_networkStateChange){
+
+
+        }
+    }
+
+    /**
+     * 更新网络类型 iv_networkType
+     */
+    private void updateNetworkTypeView() {
+        if (NetWorkUtils.getNetworkType() != -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);

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

@@ -57,6 +57,7 @@ public class Constants {
     public static final int Code_USBroadcastCallback_DXAllInOneIDCardFail = 5;//东信多合一USB连接断开
     public static final int Code_internetAvailable = 0;//internet正常
     public static final int Code_internetUnAvailable = 1;//internet异常
+    public static final int Code_networkStateChange = 2;//网络状态变化时NetBroadcastReceiver通知出来
 
     public static final int Code_DeviceInitCallback_HardwareIDCard = 1;//身份证
     public static final int Code_DeviceInitCallback_HardwareQRCode = 2;//二维码

app/src/main/java/com/hanghui/senic/service/usbserialdemo/utile/NetWorkUtils.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
+import com.hanghui.senic.MyAppliction;
 import com.hanghui.senic.R;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 
@@ -59,10 +60,10 @@ public class NetWorkUtils {
 
     /**
      * 判断当前网络类型
-     * @param context
      * @return
      */
-    public static int getNetworkType(Context context) {
+    public static int getNetworkType() {
+        Context context = MyAppliction.getContext();
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
         if (networkInfo != null && networkInfo.isConnected()) {