release V44

1、适配A9 屏幕
2、恢复出厂设置优化

diff --git a/app/build.gradle b/app/build.gradle
index 11fdce8..e613210 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
         release {\r
             minifyEnabled false\r
             signingConfig signingConfigs.key\r
-//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'\r
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'\r
         }\r
         debug {\r
             signingConfig signingConfigs.key\r

diff --git a/app/release/FactoryMode_V44_202008212233_release.apk b/app/release/FactoryMode_V44_202008212233_release.apk
new file mode 100644 (file)
index 0000000..aef70ad
Binary files /dev/null and b/app/release/FactoryMode_V44_202008212233_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index f668de2..1627fb0 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":38,"versionName":"202008112317","enabled":true,"outputFile":"FactoryMode_V38_202008112317_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V38_202008112317_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":44,"versionName":"202008212233","enabled":true,"outputFile":"FactoryMode_V44_202008212233_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V44_202008212233_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 42c3937..cd9e5b5 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,9 +68,12 @@
     <application
         android:name=".MyApplication"
         android:icon="@drawable/ic_gravity"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
         android:label="@string/app_name">
         <activity android:name=".shutdown_activity"></activity>
-        <activity android:name=".GPSActivity">
+        <activity android:name=".FactoryReset_activity"></activity>
+        <activity android:name=".GPSActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize|locale|screenLayout|mcc|mnc|layoutDirection">
             <intent-filter>
                 <action android:name="com.ic.action.gps_test" />
                 <category android:name=" android.intent.category.DEFAULT" />

diff --git a/app/src/main/java/mobile/miki/BaseActivity.java b/app/src/main/java/mobile/miki/BaseActivity.java
index 7bf0502..45ff67b 100644 (file)
--- a/app/src/main/java/mobile/miki/BaseActivity.java
+++ b/app/src/main/java/mobile/miki/BaseActivity.java
@@ -17,6 +17,8 @@ import android.view.View;
 import android.view.ViewGroup;\r
 import android.view.Window;\r
 \r
+import mobile.miki.util.FTUtils;\r
+\r
 public class BaseActivity extends Activity {\r
     private static final String TAG = "BaseActivity";\r
     private WakeLock wakeLock = null;\r
@@ -40,8 +42,7 @@ public class BaseActivity extends Activity {
     }\r
 \r
     private void resizewindow(){\r
-        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("A9")\r
-                || SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("YQ")) {\r
+        if(FTUtils.isA9()) {\r
             Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高\r
             Window window = getWindow();\r
             ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r

diff --git a/app/src/main/java/mobile/miki/FactoryReset_activity.java b/app/src/main/java/mobile/miki/FactoryReset_activity.java
new file mode 100644 (file)
index 0000000..ba986bd
--- /dev/null
+++ b/app/src/main/java/mobile/miki/FactoryReset_activity.java
@@ -0,0 +1,65 @@
+package mobile.miki;\r
+\r
+import android.content.Context;\r
+import android.content.Intent;\r
+import android.os.Bundle;\r
+import android.os.Environment;\r
+import android.util.Log;\r
+import android.view.View;\r
+import android.widget.Button;\r
+import android.widget.TextView;\r
+\r
+import java.lang.reflect.Method;\r
+\r
+public class FactoryReset_activity extends BaseActivity {\r
+\r
+    String TAG="shutdown_activity";\r
+    Button btn_yes;\r
+    Button btn_no;\r
+    TextView tv;\r
+    @Override\r
+    protected void onCreate(Bundle savedInstanceState) {\r
+        super.onCreate(savedInstanceState);\r
+        setContentView(R.layout.activity_shutdown_activity);\r
+        tv=(TextView)findViewById(R.id.shutdownText);\r
+        btn_yes =(Button)findViewById(R.id.btn_yes);\r
+        btn_no =(Button)findViewById(R.id.btn_no);\r
+        btn_yes.setClickable(true);\r
+        btn_no.setClickable(true);\r
+        btn_no.setEnabled(true);\r
+        btn_yes.setEnabled(true);\r
+        tv.setText("恢复出厂设置");\r
+        btn_yes.setOnClickListener(new View.OnClickListener() {\r
+            @Override\r
+            public void onClick(View v) {\r
+                //log("shutdown");\r
+                finish();\r
+                doMasterClear(FactoryReset_activity.this);\r
+            }\r
+        });\r
+\r
+        btn_no.setOnClickListener(new View.OnClickListener() {\r
+            @Override\r
+            public void onClick(View v) {\r
+                finish();\r
+            }\r
+        });\r
+    }\r
+\r
+    public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR";\r
+    public static final String EXTRA_REASON = "android.intent.extra.REASON";\r
+    public static final String EXTRA_WIPE_EXTERNAL_STORAGE = "android.intent.extra.WIPE_EXTERNAL_STORAGE";\r
+    public static void doMasterClear(Context context) {\r
+        Intent intent = new Intent(ACTION_MASTER_CLEAR);\r
+        intent.setPackage("android");\r
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);\r
+        intent.putExtra(EXTRA_REASON, "MasterClearConfirm");\r
+        if (Environment.isExternalStorageRemovable()) {\r
+            intent.putExtra(EXTRA_WIPE_EXTERNAL_STORAGE, true);\r
+        }else\r
+        {\r
+            intent.putExtra(EXTRA_WIPE_EXTERNAL_STORAGE, false);\r
+        }\r
+        context.sendBroadcast(intent);\r
+    }\r
+}\r

diff --git a/app/src/main/java/mobile/miki/GPSActivity.java b/app/src/main/java/mobile/miki/GPSActivity.java
index 214d49f..d653a53 100644 (file)
--- a/app/src/main/java/mobile/miki/GPSActivity.java
+++ b/app/src/main/java/mobile/miki/GPSActivity.java
@@ -29,6 +29,7 @@ import java.util.Date;
 import java.util.List;\r
 import java.util.Timer;\r
 \r
+import mobile.miki.util.FTUtils;\r
 import mobile.miki.util.Logger;\r
 \r
 import static android.location.LocationManager.GPS_PROVIDER;\r
@@ -66,9 +67,16 @@ public class GPSActivity extends BaseActivity  {
         mHoop.setText("0.0米");\r
         mSearchCount.setText("0秒");\r
         locationManager = (LocationManager)this.getSystemService(Context.LOCATION_SERVICE);\r
+        if (FTUtils.isA9()){\r
+            mFix.setTextSize(15);\r
+            mStar.setTextSize(15);\r
+            mHoop.setTextSize(15);\r
+            mSearchCount.setTextSize(15);\r
+        }\r
         startListen();\r
     }\r
 \r
+\r
     public void on_locating_changed(GPS_locationStatus gps_status) {\r
 \r
         gps_status_show.numSatelliteList.clear();\r

diff --git a/app/src/main/java/mobile/miki/GpsTest.java b/app/src/main/java/mobile/miki/GpsTest.java
index 51c5ae2..0379ae6 100644 (file)
--- a/app/src/main/java/mobile/miki/GpsTest.java
+++ b/app/src/main/java/mobile/miki/GpsTest.java
@@ -28,6 +28,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 GpsTest extends BaseActivity implements\r
         android.view.View.OnClickListener {\r
@@ -99,6 +100,11 @@ public class GpsTest extends BaseActivity implements
         }\r
         getLocationInfo(); //设定GPS优先\r
 \r
+        if(FTUtils.isA9()){\r
+            tvGps.setTextSize(15);\r
+            tvResult.setTextSize(15);\r
+            tv_satellites.setTextSize(15);\r
+        }\r
     }\r
 \r
     public String getLocationInfo() {\r

diff --git a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
index cb1f75c..f36eb5b 100644 (file)
--- a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
+++ b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java
@@ -48,12 +48,12 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL
     long timestamp_start = 0;\r
     long adjust_start_seconds_left=300;\r
     long adjust_timeout_time=300;\r
+    private static boolean adjust_working=false;\r
     @Override\r
     protected void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
         setContentView(R.layout.temperature_adjust_layout);\r
         initView();\r
-\r
         if (ICJniUtils.isTemperatureDevAvailable()>0) {\r
             ICJniUtils.enableTemperature();\r
             timestamp_start = System.currentTimeMillis();\r
@@ -66,8 +66,10 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL
             };\r
             mTestTimer.schedule(HRTimerTask, 500, 1000L);\r
         }else{\r
-            Log.i("dxc","");\r
+            Log.i("dxc","no Temperature");\r
+            tv_mesg.setText("No Temperature Device!");\r
         }\r
+        adjust_working=true;\r
         //startSensor();\r
     }\r
 \r
@@ -142,11 +144,12 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL
             String tail = "秒。。。";\r
             long time_cost = (System.currentTimeMillis() - timestamp_start) / 1000;\r
             adjust_start_seconds_left = (adjust_timeout_time - time_cost);\r
-            if (adjust_start_seconds_left <= 0) {\r
+            if (adjust_start_seconds_left <= 0 && adjust_working==true) {\r
 \r
                 int ret= ICJniUtils.doTempCalibration(37.0f);\r
-                tv_mesg.setText("体温校准完毕，偏差数据"+String.format("%1$.2f",(avg_temp-37.0f))+"摄氏度！ret "+ret);\r
+                tv_mesg.setText("体温校准完毕，偏差数据"+String.format("%1$.2f",(temp-37.0f))+"摄氏度！ret "+ret);\r
 \r
+                adjust_working=false;//校准完毕\r
                 if(mTestTimer!=null) {\r
                     mTestTimer.cancel();\r
                     mTestTimer=null;\r
@@ -158,13 +161,14 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL
 \r
             }else{\r
 \r
-                if(adjust_start_seconds_left <=5 && adjust_start_seconds_left > 0) {\r
-                    if (avg_temp == 0.0f)\r
-                        avg_temp = temp;\r
-                    avg_temp = (avg_temp + temp) / 2;//对数据做一定的平均\r
-                }\r
+//                if(adjust_start_seconds_left <=5 && adjust_start_seconds_left > 0) {\r
+//                    if (avg_temp == 0.0f)\r
+//                        avg_temp = temp;\r
+//                    avg_temp = (avg_temp + temp) / 2;//对数据做一定的平均\r
+//                }\r
 \r
-                tv_mesg.setText(header + adjust_start_seconds_left + tail);\r
+                if(temp>0.0f)\r
+                  tv_mesg.setText(header + adjust_start_seconds_left + tail);\r
             }\r
             return false;\r
         }\r
@@ -178,6 +182,8 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL
             mTestTimer.cancel();\r
             mTestTimer=null;\r
         }\r
+\r
+        ICJniUtils.disableTemperature();\r
        // mSensorManager.unregisterListener(mSensorEventListener);\r
     }\r
 \r

diff --git a/app/src/main/java/mobile/miki/TouchTest.java b/app/src/main/java/mobile/miki/TouchTest.java
index b2f9964..2b507fa 100644 (file)
--- a/app/src/main/java/mobile/miki/TouchTest.java
+++ b/app/src/main/java/mobile/miki/TouchTest.java
@@ -24,6 +24,7 @@ import mobile.miki.lcd.LcdActivity;
 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
 //import sim.android.mtkcit.TestActivity;\r
 //import sim.android.mtkcit.cittools.CITTools;\r
@@ -34,8 +35,8 @@ public class TouchTest extends BaseActivity {
        private static final boolean mDebug = false;\r
        private TPTestView tpView;\r
        private ArrayList<Rect> rectList;\r
-       private static final int numX = 4;\r
-       private static final int numY = 7;\r
+       private static  int numX = 4;\r
+       private static  int numY = 7;\r
        private int mDisplayWidth = 320;\r
        private int mDisplayHeight = 320;\r
        private int absX;\r
@@ -71,12 +72,21 @@ public class TouchTest extends BaseActivity {
        private void initRec() {\r
 \r
                Display myDisplay = getWindowManager().getDefaultDisplay();\r
-               mDisplayHeight = myDisplay.getHeight();\r
+\r
+\r
+               if (FTUtils.isA9()){\r
+                       mDisplayHeight = 170;\r
+                       mDisplayWidth = 170;\r
+               }else{\r
+                       mDisplayHeight = myDisplay.getHeight();\r
+                       mDisplayWidth = myDisplay.getWidth();\r
+               }\r
+\r
                mDisplayHeight = mDisplayHeight;\r
                \r
 \r
                absY = mDisplayHeight / numY;\r
-                mDisplayWidth = myDisplay.getWidth();\r
+\r
                // mDisplayWidth = 859;\r
                \r
 //             if(myDisplay.getWidth()==730){\r

diff --git a/app/src/main/java/mobile/miki/ageingmode/AgeingBaseActivity.java b/app/src/main/java/mobile/miki/ageingmode/AgeingBaseActivity.java
index 8d3e95f..e07fb8f 100644 (file)
--- a/app/src/main/java/mobile/miki/ageingmode/AgeingBaseActivity.java
+++ b/app/src/main/java/mobile/miki/ageingmode/AgeingBaseActivity.java
@@ -10,7 +10,11 @@ import android.os.Bundle;
 import android.os.Handler;\r
 import android.os.PowerManager;\r
 import android.os.PowerManager.WakeLock;\r
+import android.os.SystemProperties;\r
 import android.util.Log;\r
+import android.view.Display;\r
+import android.view.ViewGroup;\r
+import android.view.Window;\r
 \r
 import mobile.miki.R;\r
 import mobile.miki.util.FTUtils;\r
@@ -38,8 +42,18 @@ public class AgeingBaseActivity extends Activity {
                }*/\r
         _getIntent();\r
         calcTime();\r
+        resizewindow();\r
     }\r
 \r
+    private void resizewindow(){\r
+        if(FTUtils.isA9()) {\r
+            Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高\r
+            Window window = getWindow();\r
+            ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
+            windowLayoutParams.width = 170;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
+            windowLayoutParams.height = 170;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\r
+        }\r
+    }\r
     private void _getIntent() {\r
         try {\r
             Intent intent = getIntent();\r

diff --git a/app/src/main/java/mobile/miki/ageingmode/AgeingModeActivity.java b/app/src/main/java/mobile/miki/ageingmode/AgeingModeActivity.java
index 4194f83..f24a073 100644 (file)
--- a/app/src/main/java/mobile/miki/ageingmode/AgeingModeActivity.java
+++ b/app/src/main/java/mobile/miki/ageingmode/AgeingModeActivity.java
@@ -2,7 +2,11 @@ package mobile.miki.ageingmode;
 \r
 import android.content.Intent;\r
 import android.os.Bundle;\r
+import android.os.SystemProperties;\r
+import android.view.Display;\r
 import android.view.View;\r
+import android.view.ViewGroup;\r
+import android.view.Window;\r
 import android.widget.AdapterView;\r
 import android.widget.GridView;\r
 import android.widget.RadioButton;\r
@@ -51,6 +55,7 @@ public class AgeingModeActivity extends BaseActivity implements OnCheckedChangeL
         adapter = new AgeingListAdapter(this, getArray(), stateArr);\r
         gridView.setAdapter(adapter);\r
         gridView.setOnItemClickListener(this);\r
+\r
     }\r
 \r
     @Override\r

diff --git a/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java b/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java
index 036b05e..dce9923 100644 (file)
--- a/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java
+++ b/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java
@@ -5,7 +5,10 @@ import android.content.Intent;
 import android.os.Build;\r
 import android.os.Bundle;\r
 import android.preference.PreferenceManager;\r
+import android.view.Display;\r
 import android.view.View;\r
+import android.view.ViewGroup;\r
+import android.view.Window;\r
 \r
 import mobile.miki.CameraPreview;\r
 import mobile.miki.MotorTestActivity;\r
@@ -16,6 +19,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 LcdJudgActivity extends Activity implements android.view.View.OnClickListener {\r
        private ButtonViewTwo buttonView;\r
@@ -36,8 +40,18 @@ public class LcdJudgActivity extends Activity implements android.view.View.OnCli
                buttonView.btn_left.setClickable(true);\r
                 getLcdIntent();\r
                Config.initConfig(this);\r
+               resizewindow();\r
        }\r
-       \r
+       private void resizewindow(){\r
+               if(FTUtils.isA9()) {\r
+                       Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高\r
+                       Window window = getWindow();\r
+                       ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
+                       windowLayoutParams.width = 170;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
+                       windowLayoutParams.height = 170;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\r
+               }\r
+       }\r
+\r
        private void getLcdIntent() {\r
                Intent intent = getIntent();\r
                running = false;\r

diff --git a/app/src/main/java/mobile/miki/mainui/TestMainList.java b/app/src/main/java/mobile/miki/mainui/TestMainList.java
index 020e8dc..df0ed4b 100644 (file)
--- a/app/src/main/java/mobile/miki/mainui/TestMainList.java
+++ b/app/src/main/java/mobile/miki/mainui/TestMainList.java
@@ -24,6 +24,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import mobile.miki.BaseActivity;
+import mobile.miki.FactoryReset_activity;
 import mobile.miki.GPSActivity;
 import mobile.miki.MyApplication;
 import mobile.miki.R;
@@ -163,12 +164,8 @@ public class TestMainList extends BaseActivity implements OnClickListener {
                        break;
                case R.id.map_copy_tools:
 
-                       Intent i = new Intent();
-                       i.setComponent(new ComponentName("com.android.settings", "com.android.settings.Settings$PrivacySettingsActivity"));
-                       if (FTUtils.isSugar()) {
-                               i.setComponent(new ComponentName("com.eqc.settings", "com.eqc.settings.ResetActivity"));
-                       }
-                       startActivity(i);
+                       intent = new Intent(TestMainList.this, FactoryReset_activity.class);
+                       startActivity(intent);
 
                        break;
 

diff --git a/app/src/main/java/mobile/miki/util/FTUtils.java b/app/src/main/java/mobile/miki/util/FTUtils.java
index b89afb2..d3d0538 100644 (file)
--- a/app/src/main/java/mobile/miki/util/FTUtils.java
+++ b/app/src/main/java/mobile/miki/util/FTUtils.java
@@ -197,6 +197,14 @@ public class FTUtils {
         return false;\r
     }\r
 \r
+    public static boolean isA9(){\r
+        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("A9")\r
+                || SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("YQ")) {\r
+\r
+            return true;\r
+        }\r
+        return false;\r
+    }\r
 \r
     public static  boolean isQ3F(){\r
 \r

diff --git a/app/src/main/res/layout/ageing_mode_select.xml b/app/src/main/res/layout/ageing_mode_select.xml
index 56cc70f..a82443d 100644 (file)
--- a/app/src/main/res/layout/ageing_mode_select.xml
+++ b/app/src/main/res/layout/ageing_mode_select.xml
@@ -27,14 +27,14 @@
                 android:id="@+id/test_mode1"\r
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:textSize="24sp"\r
+\r
                 android:text="单项" />\r
 \r
             <RadioButton\r
                 android:id="@+id/test_mode2"\r
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
-                android:textSize="24sp"\r
+\r
                 android:text="循环" />\r
         </RadioGroup>\r
     </LinearLayout>\r
@@ -61,7 +61,7 @@
                 android:layout_width="match_parent"\r
                 android:layout_height="wrap_content"\r
                 android:layout_weight="1"\r
-                android:textSize="24sp"\r
+\r
                 android:text="2" />\r
 \r
             <RadioButton\r
@@ -69,7 +69,7 @@
                 android:layout_width="match_parent"\r
                 android:layout_height="wrap_content"\r
                 android:layout_weight="1"\r
-                android:textSize="24sp"\r
+\r
                 android:text="4" />\r
             \r
             <RadioButton\r
@@ -77,14 +77,14 @@
                 android:layout_width="match_parent"\r
                 android:layout_height="wrap_content"\r
                 android:layout_weight="1"\r
-                android:textSize="24sp"\r
+\r
                 android:text="8" />\r
             <RadioButton\r
                 android:id="@+id/test_time4"\r
                 android:layout_width="match_parent"\r
                 android:layout_height="wrap_content"\r
                 android:layout_weight="1"\r
-                android:textSize="24sp"\r
+\r
                 android:text="无限" />\r
         </RadioGroup>\r
     </LinearLayout>\r

diff --git a/app/src/main/res/layout/batterytest.xml b/app/src/main/res/layout/batterytest.xml
index a05223e..8547b8b 100644 (file)
--- a/app/src/main/res/layout/batterytest.xml
+++ b/app/src/main/res/layout/batterytest.xml
@@ -16,7 +16,7 @@
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
-            android:layout_marginTop="30dp"\r
+            android:layout_marginTop="24dp"\r
             android:background="@drawable/uncharging_bt"\r
             android:visibility="gone" />\r
 \r
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"\r
                 android:layout_gravity="center_horizontal"\r
                 android:text="@string/battery_status"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
 \r
             <TextView\r
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"\r
                 android:layout_gravity="center_horizontal"\r
                 android:text="@string/bt_empty"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
         </LinearLayout>\r
 \r
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/battery_v"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
 \r
             <TextView\r
@@ -63,7 +63,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/bt_empty"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
         </LinearLayout>\r
 \r
@@ -77,7 +77,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/battery_temp"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
 \r
             <TextView\r
@@ -85,7 +85,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/bt_empty"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
         </LinearLayout>\r
 \r
@@ -99,7 +99,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/battery_level"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
 \r
             <TextView\r
@@ -107,7 +107,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/bt_empty"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
         </LinearLayout>\r
 \r
@@ -121,7 +121,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/battery_health"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
 \r
             <TextView\r
@@ -129,7 +129,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/bt_empty"\r
-                android:textSize="25sp"\r
+                android:textSize="24dp"\r
                 android:textColor="@color/black" />\r
         </LinearLayout>\r
 \r

diff --git a/app/src/main/res/layout/gps_full_test_activity.xml b/app/src/main/res/layout/gps_full_test_activity.xml
index 18aed43..c8307e0 100644 (file)
--- a/app/src/main/res/layout/gps_full_test_activity.xml
+++ b/app/src/main/res/layout/gps_full_test_activity.xml
@@ -11,7 +11,7 @@
         android:id="@+id/ic_lc_fix_name"\r
         style="@style/IcTextStyle"\r
         android:text="GPS状态:"\r
-        android:textSize="20sp" />\r
+        android:textSize="15sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_fix_value"\r
@@ -25,7 +25,7 @@
         style="@style/IcTextStyle"\r
         android:layout_below="@id/ic_lc_fix_name"\r
         android:text="星数:"\r
-        android:textSize="20sp" />\r
+        android:textSize="15sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_star_value"\r
@@ -40,7 +40,7 @@
         style="@style/IcTextStyle"\r
         android:layout_below="@id/ic_lc_star_name"\r
         android:text="精度:"\r
-        android:textSize="20sp" />\r
+        android:textSize="15sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_hoop_value"\r
@@ -59,7 +59,7 @@
         android:layout_height="wrap_content"\r
         android:layout_below="@id/ic_lc_hoop_name"\r
         android:text="扫描时间:"\r
-        android:textSize="20sp" />\r
+        android:textSize="15sp" />\r
 \r
     <TextView\r
         android:id="@+id/ic_lc_searchCount_value"\r

diff --git a/app/src/main/res/layout/gps_test_new.xml b/app/src/main/res/layout/gps_test_new.xml
index 1f0a2d9..5d554b8 100644 (file)
--- a/app/src/main/res/layout/gps_test_new.xml
+++ b/app/src/main/res/layout/gps_test_new.xml
@@ -13,7 +13,7 @@
         android:textColor="@color/black"\r
         />\r
     <TextView \r
-        android:layout_below="@+id/tv_gps"\r
+        android:layout_below="@id/tv_gps"\r
         android:id="@+id/tv_satellites"\r
         android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r

diff --git a/app/src/main/res/layout/temperature_layout.xml b/app/src/main/res/layout/temperature_layout.xml
index 7cda26f..e10d908 100644 (file)
--- a/app/src/main/res/layout/temperature_layout.xml
+++ b/app/src/main/res/layout/temperature_layout.xml
@@ -18,7 +18,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:text="@string/temperature"\r
-                android:textSize="36sp" />\r
+                android:textSize="24sp" />\r
 \r
             <TextView\r
                 android:id="@+id/textView9"\r

diff --git a/app/version_code.properties b/app/version_code.properties
index bed6355..a1e2d23 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Aug 11 23:17:08 CST 2020\r
-VERSION_CODE=38\r
+#Fri Aug 21 22:33:06 CST 2020\r
+VERSION_CODE=44\r