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 (file)
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 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainList;\r
 import mobile.miki.util.Config;\r
+import mobile.miki.util.FTUtils;\r
 \r
 public class SimDetectActivity extends BaseActivity implements\r
                android.view.View.OnClickListener {\r
@@ -38,6 +39,10 @@ public class SimDetectActivity extends BaseActivity implements
        private static String aaa;\r
        private TextView signalstrenth;\r
        private TextView operator;\r
+       private TextView version;\r
+       private TextView imei;\r
+       private TextView iccid;\r
+\r
        private ButtonViewTwo buttonView;\r
        boolean running;\r
        boolean pcbatest;\r
@@ -55,6 +60,9 @@ public class SimDetectActivity extends BaseActivity implements
                setContentView(R.layout.sim_detect_layout);\r
                signalstrenth =(TextView)findViewById(R.id.signal_strenth);\r
                operator=(TextView)findViewById(R.id.opertator);\r
+               version=(TextView)findViewById(R.id.versionName);\r
+               imei=(TextView)findViewById(R.id.IMEI);\r
+               iccid =(TextView)findViewById(R.id.ICCID);\r
                imsiSim0 = getResources().getString(R.string.nothing);\r
                imsiSim1 = getResources().getString(R.string.nothing);\r
                aaa = getResources().getString(R.string.ok);\r
@@ -78,12 +86,26 @@ public class SimDetectActivity extends BaseActivity implements
 //             detectSim2(null);\r
                detectNetwork(null);\r
                //sim卡信号\r
-               myListener = new MyPhoneStateListener( this, operator,signalstrenth);\r
+               myListener = new MyPhoneStateListener( this, operator,signalstrenth,iccid);\r
                mTelephonyManager = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE);\r
                mTelephonyManager.listen(myListener, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);\r
 \r
+               version.setText(Build.DISPLAY);\r
+               imei.setText(getImei());\r
+\r
        }\r
+       private String  getImei() {\r
+               // imei\r
+               String imeiValue;\r
+               TelephonyManager telephonyManager = (TelephonyManager) this.getSystemService(Context.TELEPHONY_SERVICE);\r
+               if (Build.VERSION.SDK_INT < 26) {\r
+                       imeiValue = telephonyManager.getDeviceId();\r
+               } else {\r
+                       imeiValue = FTUtils.getImei(this);\r
+               }\r
+               return imeiValue;\r
 \r
+       }\r
        @Override\r
        protected void onResume() {\r
                buttonView.setSuccessColor();\r
@@ -321,6 +343,7 @@ public class SimDetectActivity extends BaseActivity implements
 \r
                TextView tvOperatorName;\r
                TextView tvSignal;\r
+               TextView iccid;\r
                Context context;\r
 \r
                int mSignalStrengthLevel = 0;\r
@@ -387,12 +410,12 @@ public class SimDetectActivity extends BaseActivity implements
 \r
                        return signal;\r
                }\r
-               MyPhoneStateListener(Context context, TextView tvOperatorName,TextView tvsignal) {\r
+               MyPhoneStateListener(Context context, TextView tvOperatorName,TextView tvsignal,TextView iccidname) {\r
 \r
                        this.tvOperatorName = tvOperatorName;\r
                        this.tvSignal = tvsignal;\r
                        this.context = context;\r
-\r
+                       this.iccid=iccidname;\r
                }\r
 \r
                @Override\r
@@ -418,7 +441,11 @@ public class SimDetectActivity extends BaseActivity implements
                        stringBuffer.append(mTelephonyManager.getSimOperator()).append("\n");\r
                        Log.d(TAG,"网络运营商:" + stringBuffer.toString());\r
 \r
+                       String simSerialNumber = mTelephonyManager.getSimSerialNumber();\r
+\r
+\r
 \r
+                       iccid.setText(simSerialNumber);\r
 \r
                        int mNetworkType = mTelephonyManager.getNetworkType();\r
                //      int mSimState = mTelephonyManager.getSimState();\r
@@ -430,6 +457,8 @@ public class SimDetectActivity extends BaseActivity implements
                        tvOperatorName.setText(operatorName);\r
                        tvSignal.setText(getNetworktypeName(mNetworkType)+"  ("+mSignalStrengthDbm+" Dbm) "+mSignalStrengthLevel+" ");\r
 \r
+\r
+\r
                }\r
 \r
                void setSignalStrengthLevel(int level) {\r

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 (file)
--- 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"\r
             android:layout_height="0.0dip"\r
             android:layout_weight="0.5"\r
-            android:gravity="center"\r
+            android:gravity="left"\r
             android:orientation="vertical" >\r
 \r
-            <ImageView\r
-                android:id="@+id/imageView1"\r
+\r
+            <LinearLayout\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:gravity="center|top"\r
+                android:orientation="horizontal">\r
+\r
+                <LinearLayout\r
+                    android:layout_width="fill_parent"\r
+                    android:layout_height="fill_parent"\r
+                    android:layout_weight="1.0"\r
+                    android:gravity="left|top"\r
+                    android:orientation="horizontal">\r
+\r
+                    <TextView\r
+                        android:id="@+id/textView113"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="Version"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+\r
+                    <TextView\r
+                        android:id="@+id/textViewVersionName"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="@string/colon"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+                </LinearLayout>\r
+\r
+                <LinearLayout\r
+                    android:layout_width="fill_parent"\r
+                    android:layout_height="fill_parent"\r
+                    android:layout_weight="1.0"\r
+                    android:gravity="left|top"\r
+                    android:orientation="horizontal">\r
+\r
+                    <TextView\r
+                        android:id="@+id/versionName"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="@string/empty"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+                </LinearLayout>\r
+            </LinearLayout>\r
+            <LinearLayout\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:gravity="left|top"\r
+                android:orientation="horizontal">\r
+\r
+                <LinearLayout\r
+                    android:layout_width="fill_parent"\r
+                    android:layout_height="fill_parent"\r
+                    android:layout_weight="1.0"\r
+                    android:gravity="left|top"\r
+                    android:orientation="horizontal">\r
+\r
+                    <TextView\r
+                        android:id="@+id/textView114"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="IMEI"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+\r
+                    <TextView\r
+                        android:id="@+id/textViewV133"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="@string/colon"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+                </LinearLayout>\r
+\r
+                <LinearLayout\r
+                    android:layout_width="fill_parent"\r
+                    android:layout_height="fill_parent"\r
+                    android:layout_weight="1.0"\r
+                    android:gravity="left|top"\r
+                    android:orientation="horizontal">\r
+\r
+                    <TextView\r
+                        android:id="@+id/IMEI"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="@string/empty"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+                </LinearLayout>\r
+            </LinearLayout>\r
+            <LinearLayout\r
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:contentDescription="@string/detectSim"\r
-                android:src="@drawable/ic_sim" \r
-                android:paddingBottom="20dp"\r
-                android:visibility="gone"/>\r
+                android:gravity="left|top"\r
+                android:orientation="horizontal">\r
+\r
+                <LinearLayout\r
+                    android:layout_width="fill_parent"\r
+                    android:layout_height="fill_parent"\r
+                    android:layout_weight="1.0"\r
+                    android:gravity="center|top"\r
+                    android:orientation="horizontal">\r
+\r
+                    <TextView\r
+                        android:id="@+id/textView115"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="ICCID"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+\r
+                    <TextView\r
+                        android:id="@+id/textViewf3"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="@string/colon"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+                </LinearLayout>\r
+\r
+                <LinearLayout\r
+                    android:layout_width="fill_parent"\r
+                    android:layout_height="fill_parent"\r
+                    android:layout_weight="1.0"\r
+                    android:gravity="center|top"\r
+                    android:orientation="horizontal">\r
 \r
+                    <TextView\r
+                        android:id="@+id/ICCID"\r
+                        android:layout_width="wrap_content"\r
+                        android:layout_height="wrap_content"\r
+                        android:text="@string/empty"\r
+                        android:textColor="@drawable/black"\r
+                        android:textSize="20dp" />\r
+                </LinearLayout>\r
+            </LinearLayout>\r
             <LinearLayout\r
                 android:id="@+id/linearLayout4"\r
-                android:layout_width="fill_parent"\r
+                android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:gravity="center"\r
+                android:gravity="center|top"\r
                 >\r
 \r
                 <LinearLayout\r
@@ -80,9 +210,9 @@
 \r
             <LinearLayout\r
                 android:id="@+id/linearLayout5"\r
-                android:layout_width="fill_parent"\r
+                android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:gravity="center" \r
+                android:gravity="center|top"\r
                 android:visibility="gone">\r
 \r
                 <LinearLayout\r
@@ -129,9 +259,9 @@
             \r
             <!-- dou -->\r
              <LinearLayout\r
-                android:layout_width="fill_parent"\r
+                android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:gravity="center" >\r
+                android:gravity="center|top" >\r
                 \r
                   <LinearLayout\r
                     android:layout_width="fill_parent"\r
@@ -182,9 +312,9 @@
                  />\r
 \r
             <LinearLayout\r
-                android:layout_width="fill_parent"\r
+                android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:gravity="center"\r
+                android:gravity="center|top"\r
                 android:orientation="horizontal">\r
 \r
                 <LinearLayout\r
@@ -229,9 +359,9 @@
             </LinearLayout>\r
 \r
             <LinearLayout\r
-                android:layout_width="fill_parent"\r
+                android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:gravity="center"\r
+                android:gravity="center|top"\r
                 android:orientation="horizontal">\r
 \r
                 <LinearLayout\r

diff --git a/app/version_code.properties b/app/version_code.properties
index c190948..efd5a44 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Jun 30 18:02:55 CST 2020\r
-VERSION_CODE=29\r
+#Tue Jul 28 05:58:09 CST 2020\r
+VERSION_CODE=33\r