Merge remote-tracking branch 'origin/FaceScenic_V2' into FaceScenic_V2

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

@@ -50,7 +50,6 @@ import com.hanghui.senic.service.usbserialdemo.utile.PopupWindowManager;
 import com.hanghui.senic.service.usbserialdemo.utile.SharedPreferencesUtils;
 import com.hanghui.senic.service.usbserialdemo.utile.StringIsNull;
 import com.hanghui.senic.service.usbserialdemo.utile.StringUtils;
-import com.hanghui.senic.service.usbserialdemo.utile.X1.RelaysAndLedUtile;
 import com.hanghui.senic.service.usbserialdemo.utile.devicesUI.BaseDeviceUI;
 import com.hanghui.senic.service.usbserialdemo.utile.devicesUI.IDeviceUI;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
@@ -407,9 +406,9 @@ public class MainActivity extends BaseActivity {
      */
     private void updateNetworkInternetView(int InternetAvailableCode) {
         if (InternetAvailableCode == Constants.Code_internetAvailable){
-            iv_internetStatus.setImageResource(R.mipmap.network_available);
+            iv_internetStatus.setImageResource(R.mipmap.network_internet_available);
         } else if (InternetAvailableCode == Constants.Code_internetUnAvailable){
-            iv_internetStatus.setImageResource(R.mipmap.no_network);
+            iv_internetStatus.setImageResource(R.mipmap.network_internet_unavailable);
         }
     }
 

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

@@ -72,7 +72,7 @@ public class NetWorkUtils {
             } else if (networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET) {//有线网络
                 return R.mipmap.network_icon_wired;
             } else if (networkInfo.getType() == ConnectivityManager.TYPE_MOBILE) {//移动网络
-                return R.mipmap.network_icon_mobile_web;
+                return R.mipmap.network_icon_mobile;
             }
         }
         return -1;

app/src/main/res/layout/activity_main.xml

@@ -100,7 +100,7 @@
                 android:layout_height="@dimen/dp_32"
                 android:layout_marginRight="@dimen/dp_18"
                 android:layout_marginTop="@dimen/dp_5"
-                android:src="@mipmap/no_network" />
+                android:src="@mipmap/network_internet_unavailable" />
         </LinearLayout>
         <!--        <LinearLayout-->
         <!--            android:layout_width="match_parent"-->