From: kfl_614 <kfl_614@163.com>
Date: Tue, 1 Dec 2020 07:00:42 +0000 (+0800)
Subject: release V54 refactor shutdown activity ui.
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=e89d7fb0b9fa75a7c7b7b1cd630ada18b5ff6cc6;p=factoryMode.git

release V54 refactor shutdown activity ui.
---

diff --git a/app/release/FactoryMode_V54_202012011354_release.apk b/app/release/FactoryMode_V54_202012011354_release.apk
new file mode 100644
index 0000000..294b73e
Binary files /dev/null and b/app/release/FactoryMode_V54_202012011354_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 507b0e6..222f8e1 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":53,"versionName":"202011202253","enabled":true,"outputFile":"FactoryMode_V53_202011202253_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V53_202011202253_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":54,"versionName":"202012011354","enabled":true,"outputFile":"FactoryMode_V54_202012011354_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V54_202012011354_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e9ba7f9..82fc087 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,8 @@
     <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <permission android:name="android.permission.SHUTDOWN" />
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.autofocus" />
 
@@ -68,16 +70,20 @@
     <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">
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+        <activity
+            android:name=".shutdown_activity"
+            android:exported="true"
+            android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="com.ic.action.SHUT_DOWN_PAGE" />
                 <category android:name=" android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".FactoryReset_activity"></activity>
-        <activity android:name=".GPSActivity"
+        <activity android:name=".FactoryReset_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" />
@@ -113,7 +119,7 @@
         </activity>
         <activity
             android:name=".TemperatureAdjustActivity"
-            android:label="@string/tempAdjust" >
+            android:label="@string/tempAdjust">
             <intent-filter>
                 <action android:name="com.eqc.STARTTempAdjust" />
             </intent-filter>
@@ -127,7 +133,7 @@
             android:label="@string/detectSim" />
         <activity
             android:name=".BlooToothActivity"
-            android:label="@string/bluetooth"></activity>
+            android:label="@string/bluetooth" />
         <activity
             android:name=".WifiTestActiviy"
             android:label="@string/wifitest" />
diff --git a/app/src/main/java/mobile/miki/TemperatureActivity.java b/app/src/main/java/mobile/miki/TemperatureActivity.java
index 6353a0a..1129025 100644
--- a/app/src/main/java/mobile/miki/TemperatureActivity.java
+++ b/app/src/main/java/mobile/miki/TemperatureActivity.java
@@ -1,9 +1,13 @@
 package mobile.miki;
 
+import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
 import android.os.Message;
+import android.os.UserHandle;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
@@ -11,6 +15,7 @@ import android.widget.TextView;
 
 import com.ic.jni.ICJniUtils;
 
+import java.lang.ref.WeakReference;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -24,73 +29,94 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
     private ButtonViewTwo buttonView;
     boolean running;
 
-    Timer mTimer=null;
+    Timer mTimer = null;
+
+    private TextView temperatureTv;
+    private TextView temperatureOutTv;
+    private TempHandler tempHandler;
 
-    private TextView tv_temperature;
-    private TextView tv_temperatureOut;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.temperature_layout);
+        //初始化控件
         initView();
+        //判断是否支持温度测试
         int temper = ICJniUtils.isTemperatureDevAvailable();
         Log.i("dxc", "Temperature available : " + temper);
-
-        if (temper>0){
+        if (temper > 0) {
+            tempHandler = new TempHandler(this);
+            //打开温度测试
             ICJniUtils.enableTemperature();
-            mTimer=new Timer();
-            TimerTask HRTimerTask=new TimerTask() {
+            mTimer = new Timer();
+            TimerTask HRTimerTask = new TimerTask() {
                 @Override
                 public void run() {
-                    mhandler.sendEmptyMessage(0);
+                    //获取温度内容
+                    getTemperatureInfo();
                 }
             };
-            mTimer.schedule(HRTimerTask,500,1000L);
-
-        }else{
-            this.tv_temperature.setText(this.getResources().getString(R.string.no_temperature));
-            Log.i("dxc","No temperature!");
+            mTimer.schedule(HRTimerTask, 500, 1000L);
+        } else {
+            this.temperatureTv.setText(this.getResources().getString(R.string.no_temperature));
+            Log.i("dxc", "No temperature!");
         }
     }
 
-    Handler mhandler=new Handler(new Handler.Callback() {
-        @Override
-        public boolean handleMessage(Message message) {
-
 
-            double temp=ICJniUtils.getTemperature();
-            double tempout=ICJniUtils.getTemperatureOrigin();
-            //double adjust=ICJniUtils.getTemperatureAdjustValue();
+    private void getTemperatureInfo() {
+        double temp = ICJniUtils.getTemperature();
+        double tempOut = ICJniUtils.getTemperatureOrigin();
+        Message message = tempHandler.obtainMessage();
+        Bundle bundle = new Bundle();
+        bundle.putDouble("temp", temp);
+        bundle.putDouble("tempOut", tempOut);
+        message.obj = bundle;
+        tempHandler.sendMessage(message);
+    }
 
-            String tempstr=String.format("%1$.2f",temp);
-            String tempstrOut=String.format("%1$.2f",tempout);
+    static class TempHandler extends Handler {
+        WeakReference<TemperatureActivity> activityWeakReference = null;
 
-            //  tempstr=tempstr+" ("+String.format("%1$.2f",adjust)+")";
+        TempHandler(TemperatureActivity temperatureActivity) {
+            activityWeakReference = new WeakReference<>(temperatureActivity);
+        }
 
-            tv_temperature.setText(tempstr);
-            tv_temperatureOut.setText(tempstrOut);
-            Logger.d("Temperature:"+tempstr+" TemperatureOut:"+tempstrOut);
-            return false;
+        @Override
+        public void handleMessage(Message msg) {
+            TemperatureActivity temperatureActivity = activityWeakReference.get();
+            if (temperatureActivity == null) {
+                return;
+            }
+            Bundle bundle = (Bundle) msg.obj;
+            String tempStr = String.format(temperatureActivity.getString(R.string.factory_temp_format_text),
+                    bundle.getDouble("temp"));
+            String tempStrOut = String.format(temperatureActivity.getString(R.string.factory_temp_format_text),
+                    bundle.getDouble("tempOut"));
+            temperatureActivity.temperatureTv.setText(tempStr);
+            temperatureActivity.temperatureOutTv.setText(tempStrOut);
+            Logger.d("Temperature:" + tempStr + " TemperatureOut:" + tempStrOut);
         }
-    });
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
-       // ICJniUtils.disablePPG();
+        // ICJniUtils.disablePPG();
 
         int temper = ICJniUtils.isTemperatureDevAvailable();
         Log.i("dxc", "Temperature available : " + temper);
 
-        if (temper>0) {
-            if(mTimer!=null) {
+        if (temper > 0) {
+            if (mTimer != null) {
 
                 mTimer.cancel();
-                mTimer=null;
+                mTimer = null;
             }
-            Log.i( "dxc","Temperature onPause");
+            Log.i("dxc", "Temperature onPause");
             ICJniUtils.disableTemperature();
-        }else{
-            Log.i("dxc","No temperature!");
+        } else {
+            Log.i("dxc", "No temperature!");
         }
 
     }
@@ -98,7 +124,7 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
     @Override
     protected void onPause() {
         super.onPause();
-        Log.i( "dxc","Temperature onPause");
+        Log.i("dxc", "Temperature onPause");
     }
 
     @Override
@@ -112,14 +138,14 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
         buttonView.btn_right.setOnClickListener(this);
         buttonView.setSuccessColor();
         buttonView.btn_left.setClickable(true);
-        tv_temperature=(TextView)findViewById(R.id.tv_temperature_value);
-        tv_temperatureOut=(TextView)findViewById(R.id.tv_temperature_value_out);
+        temperatureTv = (TextView) findViewById(R.id.tv_temperature_value);
+        temperatureOutTv = (TextView) findViewById(R.id.tv_temperature_value_out);
 
     }
 
     @Override
     public void onClick(View view) {
-        Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, SimDetectActivity.class);
+        Intent intent = Config.getNextTestIntent(this, this.getClass());//new Intent(this, SimDetectActivity.class);
         intent.putExtra("running", true);
         Intent intent1 = new Intent(this, TestMainActivity.class);
         // TestResult testResult = (TestResult) getApplicationContext();
diff --git a/app/src/main/java/mobile/miki/shutdown_activity.java b/app/src/main/java/mobile/miki/shutdown_activity.java
index 1835a4f..61e10ff 100644
--- a/app/src/main/java/mobile/miki/shutdown_activity.java
+++ b/app/src/main/java/mobile/miki/shutdown_activity.java
@@ -7,6 +7,7 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.Toast;
 
 import java.lang.reflect.Method;
@@ -16,8 +17,8 @@ import mobile.miki.util.FTUtils;
 public class shutdown_activity extends BaseActivity {
 
     String TAG = "shutdown_activity";
-    Button btn_yes;
-    Button btn_no;
+    ImageButton btn_yes;
+    ImageButton btn_no;
 
 
     @Override
@@ -32,8 +33,8 @@ public class shutdown_activity extends BaseActivity {
     }
 
     private void setclicklistener(boolean b) {
-        btn_yes = (Button) findViewById(R.id.btn_yes);
-        btn_no = (Button) findViewById(R.id.btn_no);
+        btn_yes = (ImageButton) findViewById(R.id.btn_yes);
+        btn_no = (ImageButton) findViewById(R.id.btn_no);
         if (b == true) {
             btn_yes.setClickable(true);
             btn_yes.setEnabled(true);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 23e50fc..dfab908 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -930,5 +930,6 @@
     <string name="gps_scan_time">Cost:</string>
     <string name="seconds">Seconds</string>
     <string name="meter">Meters</string>
+    <string name="factory_temp_format_text">%1$.2f</string>
 
 </resources>
diff --git a/app/version_code.properties b/app/version_code.properties
index 40d27ed..106a1b5 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Nov 20 22:53:22 CST 2020
-VERSION_CODE=53
+#Tue Dec 01 13:54:00 CST 2020
+VERSION_CODE=54