From: snickersun Date: Fri, 21 Aug 2020 14:35:32 +0000 (+0800) Subject: release V44 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=ee939727fc97d9e771a5c10dca3a1720ae8f7936;p=factoryMode.git release V44 1、适配A9 屏幕 2、恢复出厂设置优化 --- diff --git a/app/build.gradle b/app/build.gradle index 11fdce8..e613210 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ android { release { minifyEnabled false signingConfig signingConfigs.key -// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } debug { signingConfig signingConfigs.key diff --git a/app/release/FactoryMode_V44_202008212233_release.apk b/app/release/FactoryMode_V44_202008212233_release.apk new file mode 100644 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 --- 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 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -68,9 +68,12 @@ - + + diff --git a/app/src/main/java/mobile/miki/BaseActivity.java b/app/src/main/java/mobile/miki/BaseActivity.java index 7bf0502..45ff67b 100644 --- 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; import android.view.Window; +import mobile.miki.util.FTUtils; + public class BaseActivity extends Activity { private static final String TAG = "BaseActivity"; private WakeLock wakeLock = null; @@ -40,8 +42,7 @@ public class BaseActivity extends Activity { } private void resizewindow(){ - if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("A9") - || SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("YQ")) { + if(FTUtils.isA9()) { Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高 Window window = getWindow(); ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值 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 index 0000000..ba986bd --- /dev/null +++ b/app/src/main/java/mobile/miki/FactoryReset_activity.java @@ -0,0 +1,65 @@ +package mobile.miki; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.os.Environment; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; + +import java.lang.reflect.Method; + +public class FactoryReset_activity extends BaseActivity { + + String TAG="shutdown_activity"; + Button btn_yes; + Button btn_no; + TextView tv; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_shutdown_activity); + tv=(TextView)findViewById(R.id.shutdownText); + btn_yes =(Button)findViewById(R.id.btn_yes); + btn_no =(Button)findViewById(R.id.btn_no); + btn_yes.setClickable(true); + btn_no.setClickable(true); + btn_no.setEnabled(true); + btn_yes.setEnabled(true); + tv.setText("恢复出厂设置"); + btn_yes.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //log("shutdown"); + finish(); + doMasterClear(FactoryReset_activity.this); + } + }); + + btn_no.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + } + + public static final String ACTION_MASTER_CLEAR = "android.intent.action.MASTER_CLEAR"; + public static final String EXTRA_REASON = "android.intent.extra.REASON"; + public static final String EXTRA_WIPE_EXTERNAL_STORAGE = "android.intent.extra.WIPE_EXTERNAL_STORAGE"; + public static void doMasterClear(Context context) { + Intent intent = new Intent(ACTION_MASTER_CLEAR); + intent.setPackage("android"); + intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); + intent.putExtra(EXTRA_REASON, "MasterClearConfirm"); + if (Environment.isExternalStorageRemovable()) { + intent.putExtra(EXTRA_WIPE_EXTERNAL_STORAGE, true); + }else + { + intent.putExtra(EXTRA_WIPE_EXTERNAL_STORAGE, false); + } + context.sendBroadcast(intent); + } +} diff --git a/app/src/main/java/mobile/miki/GPSActivity.java b/app/src/main/java/mobile/miki/GPSActivity.java index 214d49f..d653a53 100644 --- 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; import java.util.Timer; +import mobile.miki.util.FTUtils; import mobile.miki.util.Logger; import static android.location.LocationManager.GPS_PROVIDER; @@ -66,9 +67,16 @@ public class GPSActivity extends BaseActivity { mHoop.setText("0.0ç±³"); mSearchCount.setText("0秒"); locationManager = (LocationManager)this.getSystemService(Context.LOCATION_SERVICE); + if (FTUtils.isA9()){ + mFix.setTextSize(15); + mStar.setTextSize(15); + mHoop.setTextSize(15); + mSearchCount.setTextSize(15); + } startListen(); } + public void on_locating_changed(GPS_locationStatus gps_status) { gps_status_show.numSatelliteList.clear(); diff --git a/app/src/main/java/mobile/miki/GpsTest.java b/app/src/main/java/mobile/miki/GpsTest.java index 51c5ae2..0379ae6 100644 --- 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; import mobile.miki.mainui.TestMainList; import mobile.miki.util.Config; +import mobile.miki.util.FTUtils; public class GpsTest extends BaseActivity implements android.view.View.OnClickListener { @@ -99,6 +100,11 @@ public class GpsTest extends BaseActivity implements } getLocationInfo(); //设定GPS优先 + if(FTUtils.isA9()){ + tvGps.setTextSize(15); + tvResult.setTextSize(15); + tv_satellites.setTextSize(15); + } } public String getLocationInfo() { diff --git a/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java b/app/src/main/java/mobile/miki/TemperatureAdjustActivity.java index cb1f75c..f36eb5b 100644 --- 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; long adjust_start_seconds_left=300; long adjust_timeout_time=300; + private static boolean adjust_working=false; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.temperature_adjust_layout); initView(); - if (ICJniUtils.isTemperatureDevAvailable()>0) { ICJniUtils.enableTemperature(); timestamp_start = System.currentTimeMillis(); @@ -66,8 +66,10 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL }; mTestTimer.schedule(HRTimerTask, 500, 1000L); }else{ - Log.i("dxc",""); + Log.i("dxc","no Temperature"); + tv_mesg.setText("No Temperature Device!"); } + adjust_working=true; //startSensor(); } @@ -142,11 +144,12 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL String tail = "秒。。。"; long time_cost = (System.currentTimeMillis() - timestamp_start) / 1000; adjust_start_seconds_left = (adjust_timeout_time - time_cost); - if (adjust_start_seconds_left <= 0) { + if (adjust_start_seconds_left <= 0 && adjust_working==true) { int ret= ICJniUtils.doTempCalibration(37.0f); - tv_mesg.setText("体温校准完毕，偏差数据"+String.format("%1$.2f",(avg_temp-37.0f))+"摄氏度！ret "+ret); + tv_mesg.setText("体温校准完毕，偏差数据"+String.format("%1$.2f",(temp-37.0f))+"摄氏度！ret "+ret); + adjust_working=false;//校准完毕 if(mTestTimer!=null) { mTestTimer.cancel(); mTestTimer=null; @@ -158,13 +161,14 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL }else{ - if(adjust_start_seconds_left <=5 && adjust_start_seconds_left > 0) { - if (avg_temp == 0.0f) - avg_temp = temp; - avg_temp = (avg_temp + temp) / 2;//对数据做一定的平均 - } +// if(adjust_start_seconds_left <=5 && adjust_start_seconds_left > 0) { +// if (avg_temp == 0.0f) +// avg_temp = temp; +// avg_temp = (avg_temp + temp) / 2;//对数据做一定的平均 +// } - tv_mesg.setText(header + adjust_start_seconds_left + tail); + if(temp>0.0f) + tv_mesg.setText(header + adjust_start_seconds_left + tail); } return false; } @@ -178,6 +182,8 @@ public class TemperatureAdjustActivity extends Activity implements View.OnClickL mTestTimer.cancel(); mTestTimer=null; } + + ICJniUtils.disableTemperature(); // mSensorManager.unregisterListener(mSensorEventListener); } diff --git a/app/src/main/java/mobile/miki/TouchTest.java b/app/src/main/java/mobile/miki/TouchTest.java index b2f9964..2b507fa 100644 --- 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; import mobile.miki.mainui.TestMainList; import mobile.miki.util.Config; +import mobile.miki.util.FTUtils; //import sim.android.mtkcit.TestActivity; //import sim.android.mtkcit.cittools.CITTools; @@ -34,8 +35,8 @@ public class TouchTest extends BaseActivity { private static final boolean mDebug = false; private TPTestView tpView; private ArrayList rectList; - private static final int numX = 4; - private static final int numY = 7; + private static int numX = 4; + private static int numY = 7; private int mDisplayWidth = 320; private int mDisplayHeight = 320; private int absX; @@ -71,12 +72,21 @@ public class TouchTest extends BaseActivity { private void initRec() { Display myDisplay = getWindowManager().getDefaultDisplay(); - mDisplayHeight = myDisplay.getHeight(); + + + if (FTUtils.isA9()){ + mDisplayHeight = 170; + mDisplayWidth = 170; + }else{ + mDisplayHeight = myDisplay.getHeight(); + mDisplayWidth = myDisplay.getWidth(); + } + mDisplayHeight = mDisplayHeight; absY = mDisplayHeight / numY; - mDisplayWidth = myDisplay.getWidth(); + // mDisplayWidth = 859; // if(myDisplay.getWidth()==730){ 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 --- 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; import android.os.PowerManager; import android.os.PowerManager.WakeLock; +import android.os.SystemProperties; import android.util.Log; +import android.view.Display; +import android.view.ViewGroup; +import android.view.Window; import mobile.miki.R; import mobile.miki.util.FTUtils; @@ -38,8 +42,18 @@ public class AgeingBaseActivity extends Activity { }*/ _getIntent(); calcTime(); + resizewindow(); } + private void resizewindow(){ + if(FTUtils.isA9()) { + Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高 + Window window = getWindow(); + ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值 + windowLayoutParams.width = 170;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95 + windowLayoutParams.height = 170;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6 + } + } private void _getIntent() { try { Intent intent = getIntent(); 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 --- 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; import android.content.Intent; import android.os.Bundle; +import android.os.SystemProperties; +import android.view.Display; import android.view.View; +import android.view.ViewGroup; +import android.view.Window; import android.widget.AdapterView; import android.widget.GridView; import android.widget.RadioButton; @@ -51,6 +55,7 @@ public class AgeingModeActivity extends BaseActivity implements OnCheckedChangeL adapter = new AgeingListAdapter(this, getArray(), stateArr); gridView.setAdapter(adapter); gridView.setOnItemClickListener(this); + } @Override 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 --- 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; import android.os.Bundle; import android.preference.PreferenceManager; +import android.view.Display; import android.view.View; +import android.view.ViewGroup; +import android.view.Window; import mobile.miki.CameraPreview; import mobile.miki.MotorTestActivity; @@ -16,6 +19,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 LcdJudgActivity extends Activity implements android.view.View.OnClickListener { private ButtonViewTwo buttonView; @@ -36,8 +40,18 @@ public class LcdJudgActivity extends Activity implements android.view.View.OnCli buttonView.btn_left.setClickable(true); getLcdIntent(); Config.initConfig(this); + resizewindow(); } - + private void resizewindow(){ + if(FTUtils.isA9()) { + Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高 + Window window = getWindow(); + ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值 + windowLayoutParams.width = 170;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95 + windowLayoutParams.height = 170;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6 + } + } + private void getLcdIntent() { Intent intent = getIntent(); running = false; 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 --- 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 --- 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; } + public static boolean isA9(){ + if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("A9") + || SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("YQ")) { + + return true; + } + return false; + } public static boolean isQ3F(){ 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 --- 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" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="24sp" + android:text="单项" /> @@ -61,7 +61,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:textSize="24sp" + android:text="2" /> diff --git a/app/src/main/res/layout/batterytest.xml b/app/src/main/res/layout/batterytest.xml index a05223e..8547b8b 100644 --- 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" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginTop="30dp" + android:layout_marginTop="24dp" android:background="@drawable/uncharging_bt" android:visibility="gone" /> @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/battery_status" - android:textSize="25sp" + android:textSize="24dp" android:textColor="@color/black" /> @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/battery_v" - android:textSize="25sp" + android:textSize="24dp" android:textColor="@color/black" /> @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/battery_temp" - android:textSize="25sp" + android:textSize="24dp" android:textColor="@color/black" /> @@ -99,7 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/battery_level" - android:textSize="25sp" + android:textSize="24dp" android:textColor="@color/black" /> @@ -121,7 +121,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/battery_health" - android:textSize="25sp" + android:textSize="24dp" android:textColor="@color/black" /> 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 --- 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" style="@style/IcTextStyle" android:text="GPS状态:" - android:textSize="20sp" /> + android:textSize="15sp" /> + android:textSize="15sp" /> + android:textSize="15sp" /> + android:textSize="15sp" /> + android:textSize="24sp" />