Shangyp vor 5 Monaten
Ursprung
Commit
3f5a67a420

+ 15 - 45
app/src/main/java/com/hanghui/senic/activity/MainActivity.java

@@ -109,17 +109,7 @@ public class MainActivity extends BaseActivity {
                     break;
                 case Constants.Code_HttpResponseCallback_NetworkNormalIcon://设置网络正常图标
                     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);
-                    }
+                    updateNetworkStateView();
                     break;
                 case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示(如果硬件没有开启,则直接初始化smile)
                     if (DeviceInitManager.getInstance().totalOpenHardwareNum == 0){//没有需要打开的硬件直接smile初始化
@@ -181,17 +171,7 @@ public class MainActivity extends BaseActivity {
         public void updateView(int code, String msg) {
             if(code == 0){
                 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);
-                }
+                updateNetworkStateView();
             } else {
                 iv_internetStatus.setImageResource(R.mipmap.no_network);
                 LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) iv_networkType.getLayoutParams();
@@ -217,17 +197,7 @@ public class MainActivity extends BaseActivity {
                     Glide.with(CommonUtil.getCurrentActivity())
                             .load(R.mipmap.network_available)
                             .into(iv_internetStatus);
-                    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);
-                    }
+
                     break;
                 case Constants.Code_NetNetworkCallback_NetworkAnomaly:
                     Glide.with(CommonUtil.getCurrentActivity())
@@ -442,17 +412,7 @@ public class MainActivity extends BaseActivity {
             Glide.with(this)
                     .load(R.mipmap.network_available)
                     .into(iv_internetStatus);
-            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);
-            }
+            updateNetworkStateView();
             HttpRequest.getInstance().requestAuthentication();
         } else {
             if (ConfigManager.isForTheFirstTime()) {//首次打开
@@ -474,7 +434,17 @@ public class MainActivity extends BaseActivity {
      * 更新网络类型和internet连接状态视图
      */
     private void updateNetworkStateView() {
-
+        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);
+        }
     }
 
     /**

+ 1 - 1
app/src/main/java/com/hanghui/senic/bean/IDCARD.java

@@ -13,7 +13,7 @@ public class IDCARD {
     private String photoBase64;
     //性别
     private String sex;
-    //
+    //
     private String nation;
     // 出生日期
     private String birthDate;