From: snickersun Date: Mon, 27 Jul 2020 22:00:10 +0000 (+0800) Subject: release V33 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=1df80b7c2f63a8a3c1cbab40c17103ac6d8f9397;p=factoryMode.git release V33 为L004 设备修改SimDetectActivity，以便显示更多信息。 --- diff --git a/app/release/FactoryMode_V33_202007280558_release.apk b/app/release/FactoryMode_V33_202007280558_release.apk new file mode 100644 index 0000000..2201ab6 Binary files /dev/null and b/app/release/FactoryMode_V33_202007280558_release.apk differ diff --git a/app/src/main/java/mobile/miki/SimDetectActivity.java b/app/src/main/java/mobile/miki/SimDetectActivity.java index 7294f86..c69d4e7 100644 --- a/app/src/main/java/mobile/miki/SimDetectActivity.java +++ b/app/src/main/java/mobile/miki/SimDetectActivity.java @@ -30,6 +30,7 @@ import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; import mobile.miki.util.Config; +import mobile.miki.util.FTUtils; public class SimDetectActivity extends BaseActivity implements android.view.View.OnClickListener { @@ -38,6 +39,10 @@ public class SimDetectActivity extends BaseActivity implements private static String aaa; private TextView signalstrenth; private TextView operator; + private TextView version; + private TextView imei; + private TextView iccid; + private ButtonViewTwo buttonView; boolean running; boolean pcbatest; @@ -55,6 +60,9 @@ public class SimDetectActivity extends BaseActivity implements setContentView(R.layout.sim_detect_layout); signalstrenth =(TextView)findViewById(R.id.signal_strenth); operator=(TextView)findViewById(R.id.opertator); + version=(TextView)findViewById(R.id.versionName); + imei=(TextView)findViewById(R.id.IMEI); + iccid =(TextView)findViewById(R.id.ICCID); imsiSim0 = getResources().getString(R.string.nothing); imsiSim1 = getResources().getString(R.string.nothing); aaa = getResources().getString(R.string.ok); @@ -78,12 +86,26 @@ public class SimDetectActivity extends BaseActivity implements // detectSim2(null); detectNetwork(null); //sim卡信号 - myListener = new MyPhoneStateListener( this, operator,signalstrenth); + myListener = new MyPhoneStateListener( this, operator,signalstrenth,iccid); mTelephonyManager = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE); mTelephonyManager.listen(myListener, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS); + version.setText(Build.DISPLAY); + imei.setText(getImei()); + } + private String getImei() { + // imei + String imeiValue; + TelephonyManager telephonyManager = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE); + if (Build.VERSION.SDK_INT < 26) { + imeiValue = telephonyManager.getDeviceId(); + } else { + imeiValue = FTUtils.getImei(this); + } + return imeiValue; + } @Override protected void onResume() { buttonView.setSuccessColor(); @@ -321,6 +343,7 @@ public class SimDetectActivity extends BaseActivity implements TextView tvOperatorName; TextView tvSignal; + TextView iccid; Context context; int mSignalStrengthLevel = 0; @@ -387,12 +410,12 @@ public class SimDetectActivity extends BaseActivity implements return signal; } - MyPhoneStateListener(Context context, TextView tvOperatorName,TextView tvsignal) { + MyPhoneStateListener(Context context, TextView tvOperatorName,TextView tvsignal,TextView iccidname) { this.tvOperatorName = tvOperatorName; this.tvSignal = tvsignal; this.context = context; - + this.iccid=iccidname; } @Override @@ -418,7 +441,11 @@ public class SimDetectActivity extends BaseActivity implements stringBuffer.append(mTelephonyManager.getSimOperator()).append("\n"); Log.d(TAG,"网络运营商:" + stringBuffer.toString()); + String simSerialNumber = mTelephonyManager.getSimSerialNumber(); + + + iccid.setText(simSerialNumber); int mNetworkType = mTelephonyManager.getNetworkType(); // int mSimState = mTelephonyManager.getSimState(); @@ -430,6 +457,8 @@ public class SimDetectActivity extends BaseActivity implements tvOperatorName.setText(operatorName); tvSignal.setText(getNetworktypeName(mNetworkType)+" ("+mSignalStrengthDbm+" Dbm) "+mSignalStrengthLevel+" "); + + } void setSignalStrengthLevel(int level) { diff --git a/app/src/main/res/layout/sim_detect_layout.xml b/app/src/main/res/layout/sim_detect_layout.xml index 1211fff..f17e030 100644 --- a/app/src/main/res/layout/sim_detect_layout.xml +++ b/app/src/main/res/layout/sim_detect_layout.xml @@ -18,23 +18,153 @@ android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="0.5" - android:gravity="center" + android:gravity="left" android:orientation="vertical" > - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:gravity="left|top" + android:orientation="horizontal"> + + + + + + + + + + + + + android:gravity="center|top" >