|
@@ -71,7 +71,7 @@ public class MainActivity extends BaseActivity {
|
|
|
private TextView bottomIsDebugShow;
|
|
|
private RelativeLayout mainActivity_bg;
|
|
|
private ImageView main_networkStatus;//internet的连接状态
|
|
|
- private ImageView network_icon_start;//网络类型
|
|
|
+ private ImageView iv_networkType;//网络类型
|
|
|
private static ImageView hardwareIcon_IDCard;//硬件连接状态-身份证阅读器
|
|
|
private static ImageView hardwareIcon_QRCode;//硬件连接状态-二维码读头
|
|
|
private static ImageView hardwareIcon_Passport;//硬件连接状态-护照机
|
|
@@ -114,11 +114,11 @@ public class MainActivity extends BaseActivity {
|
|
|
main_networkStatus.setImageResource(R.mipmap.network_available);
|
|
|
int networkType = NetWorkUtils.getNetworkType(MainActivity.this);
|
|
|
if (networkType != -1){
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
|
|
|
} else {//无网络
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(R.mipmap.network_icon_no);
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(R.mipmap.network_icon_no);
|
|
|
}
|
|
|
break;
|
|
|
case Constants.Code_HttpResponseCallback_BottomTextType://判断底部文字文字显示(如果硬件没有开启,则直接初始化smile)
|
|
@@ -183,16 +183,16 @@ public class MainActivity extends BaseActivity {
|
|
|
main_networkStatus.setImageResource(R.mipmap.network_available);
|
|
|
int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
|
|
|
if (networkState != -1){
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
|
|
|
} else {//无网络
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(R.mipmap.network_icon_no);
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(R.mipmap.network_icon_no);
|
|
|
}
|
|
|
} else {
|
|
|
main_networkStatus.setImageResource(R.mipmap.no_network);
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(R.mipmap.network_icon_no);
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(R.mipmap.network_icon_no);
|
|
|
}
|
|
|
}
|
|
|
};
|
|
@@ -214,19 +214,19 @@ public class MainActivity extends BaseActivity {
|
|
|
.into(main_networkStatus);
|
|
|
int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
|
|
|
if (networkState != -1){
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
|
|
|
} else {//无网络
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(R.mipmap.network_icon_no);
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(R.mipmap.network_icon_no);
|
|
|
}
|
|
|
break;
|
|
|
case Constants.Code_NetNetworkCallback_NetworkAnomaly:
|
|
|
Glide.with(CommonUtil.getCurrentActivity())
|
|
|
.load(R.mipmap.no_network)
|
|
|
.into(main_networkStatus);
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(R.mipmap.network_icon_no);
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(R.mipmap.network_icon_no);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -456,11 +456,11 @@ public class MainActivity extends BaseActivity {
|
|
|
.into(main_networkStatus);
|
|
|
int networkState = NetWorkUtils.getNetworkType(MainActivity.this);
|
|
|
if (networkState != -1){
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_32, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(NetWorkUtils.getNetworkType(MainActivity.this));
|
|
|
} else {//无网络
|
|
|
- network_icon_start.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
- network_icon_start.setImageResource(R.mipmap.network_icon_no);
|
|
|
+ iv_networkType.setLayoutParams(new LinearLayout.LayoutParams(R.dimen.dp_72, R.dimen.dp_32)); // 设置宽高为300px
|
|
|
+ iv_networkType.setImageResource(R.mipmap.network_icon_no);
|
|
|
}
|
|
|
HttpRequest.getInstance().requestAuthentication();
|
|
|
} else {
|
|
@@ -523,7 +523,7 @@ public class MainActivity extends BaseActivity {
|
|
|
mainActivity_bg = findViewById(R.id.mainActivityRelativeLayout);
|
|
|
topRightClickConfigTV = findViewById(R.id.main_Config);
|
|
|
bottomIsDebugShow = findViewById(R.id.bottomIsDebugShow);
|
|
|
- network_icon_start = findViewById(R.id.network_icon_start);
|
|
|
+ iv_networkType = findViewById(R.id.network_icon_start);
|
|
|
topRightClickConfigTV.setOnClickListener(mainConfigOnClickListener);
|
|
|
hardwareIcon_IDCard = findViewById(R.id.hardwareIcon_IDCard);
|
|
|
hardwareIcon_QRCode = findViewById(R.id.hardwareIcon_QRCode);
|