|
@@ -20,8 +20,6 @@ import com.bumptech.glide.request.transition.Transition;
|
|
|
import com.hanghui.senic.MyAppliction;
|
|
|
import com.hanghui.senic.R;
|
|
|
import com.hanghui.senic.activity.view.ClickButtonFloatView;
|
|
|
-import com.hanghui.senic.bean.FederatedPlatformsRequestBean;
|
|
|
-import com.hanghui.senic.bean.IDCARD;
|
|
|
import com.hanghui.senic.common.AppHandler;
|
|
|
import com.hanghui.senic.common.BroadcastManager;
|
|
|
import com.hanghui.senic.common.CommonUtil;
|
|
@@ -30,7 +28,6 @@ import com.hanghui.senic.common.DevelopUtil;
|
|
|
import com.hanghui.senic.common.DeviceInitManager;
|
|
|
import com.hanghui.senic.common.MTTSManager;
|
|
|
import com.hanghui.senic.common.PosManager;
|
|
|
-import com.hanghui.senic.common.TaskStatus;
|
|
|
import com.hanghui.senic.common.UiAdaptionManager;
|
|
|
import com.hanghui.senic.controller.IDCardControllerManager;
|
|
|
import com.hanghui.senic.controller.LiJiangIDCardController;
|
|
@@ -70,7 +67,7 @@ public class MainActivity extends BaseActivity {
|
|
|
private static TextView appStatusTextView;
|
|
|
private TextView bottomIsDebugShow;
|
|
|
private RelativeLayout mainActivity_bg;
|
|
|
- private ImageView main_networkStatus;//internet的连接状态
|
|
|
+ private ImageView iv_internetStatus;//internet的连接状态
|
|
|
private ImageView iv_networkType;//网络类型
|
|
|
private static ImageView hardwareIcon_IDCard;//硬件连接状态-身份证阅读器
|
|
|
private static ImageView hardwareIcon_QRCode;//硬件连接状态-二维码读头
|
|
@@ -111,7 +108,7 @@ public class MainActivity extends BaseActivity {
|
|
|
appStatusTextView.setText(msg);
|
|
|
break;
|
|
|
case Constants.Code_HttpResponseCallback_NetworkNormalIcon://设置网络正常图标
|
|
|
- main_networkStatus.setImageResource(R.mipmap.network_available);
|
|
|
+ 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);
|
|
@@ -183,7 +180,7 @@ public class MainActivity extends BaseActivity {
|
|
|
@Override
|
|
|
public void updateView(int code, String msg) {
|
|
|
if(code == 0){
|
|
|
- main_networkStatus.setImageResource(R.mipmap.network_available);
|
|
|
+ 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);
|
|
@@ -196,7 +193,7 @@ public class MainActivity extends BaseActivity {
|
|
|
iv_networkType.setImageResource(R.mipmap.network_icon_no);
|
|
|
}
|
|
|
} else {
|
|
|
- main_networkStatus.setImageResource(R.mipmap.no_network);
|
|
|
+ iv_internetStatus.setImageResource(R.mipmap.no_network);
|
|
|
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);
|
|
@@ -219,7 +216,7 @@ public class MainActivity extends BaseActivity {
|
|
|
case Constants.Code_NetNetworkCallback_NetworkNormal:
|
|
|
Glide.with(CommonUtil.getCurrentActivity())
|
|
|
.load(R.mipmap.network_available)
|
|
|
- .into(main_networkStatus);
|
|
|
+ .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);
|
|
@@ -235,7 +232,7 @@ public class MainActivity extends BaseActivity {
|
|
|
case Constants.Code_NetNetworkCallback_NetworkAnomaly:
|
|
|
Glide.with(CommonUtil.getCurrentActivity())
|
|
|
.load(R.mipmap.no_network)
|
|
|
- .into(main_networkStatus);
|
|
|
+ .into(iv_internetStatus);
|
|
|
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);
|
|
@@ -433,7 +430,7 @@ public class MainActivity extends BaseActivity {
|
|
|
appStatusTextView.setText("获取在线配置中……");
|
|
|
Glide.with(this)
|
|
|
.load(R.mipmap.network_available)
|
|
|
- .into(main_networkStatus);
|
|
|
+ .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);
|
|
@@ -498,7 +495,7 @@ public class MainActivity extends BaseActivity {
|
|
|
|
|
|
//初始化页面
|
|
|
private void initViews() {
|
|
|
- main_networkStatus = findViewById(R.id.main_NetWorkStatus);
|
|
|
+ iv_internetStatus = findViewById(R.id.main_NetWorkStatus);
|
|
|
topLeftTimeTV = findViewById(R.id.main_Time);
|
|
|
appStatusTextView = findViewById(R.id.main_APPStuter);
|
|
|
topRightVersionTV = findViewById(R.id.main_Version);
|