From: snicker Date: Tue, 17 Mar 2020 18:06:40 +0000 (+0800) Subject: 自动测试改为用Config.java进行配置。自动搜索下一个测试项进行测试。 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=fc2731cb75b07cbd5795a700328ffbf1ac9632ad;p=factoryMode.git 自动测试改为用Config.java进行配置。自动搜索下一个测试项进行测试。 方便增补新的测试项。 --- diff --git a/app/src/main/java/mobile/miki/BatteryTestActivity.java b/app/src/main/java/mobile/miki/BatteryTestActivity.java index d554bd2..8f53a19 100644 --- a/app/src/main/java/mobile/miki/BatteryTestActivity.java +++ b/app/src/main/java/mobile/miki/BatteryTestActivity.java @@ -19,6 +19,7 @@ import android.widget.TextView; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; +import mobile.miki.util.Config; public class BatteryTestActivity extends BaseActivity implements OnClickListener { @@ -179,7 +180,7 @@ public class BatteryTestActivity extends BaseActivity implements @Override public void onClick(View arg0) { - Intent intent = new Intent(this, SystemMemory.class); + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, SystemMemory.class); intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); Intent intent1 = new Intent(this, TestMainActivity.class); diff --git a/app/src/main/java/mobile/miki/BlooToothActivity.java b/app/src/main/java/mobile/miki/BlooToothActivity.java index 8d68a20..eb1c671 100644 --- a/app/src/main/java/mobile/miki/BlooToothActivity.java +++ b/app/src/main/java/mobile/miki/BlooToothActivity.java @@ -29,6 +29,7 @@ import mobile.miki.adapter.ListViewAdapter; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; import mobile.miki.util.StringUtil; public class BlooToothActivity extends BaseActivity implements OnClickListener { @@ -192,7 +193,7 @@ public class BlooToothActivity extends BaseActivity implements OnClickListener { switch (msg.what) { case 0: Intent intent; - intent = new Intent(BlooToothActivity.this, MotorTestActivity.class); + intent = Config.getNextTestIntent(BlooToothActivity.this,BlooToothActivity.this.getClass());//new Intent(BlooToothActivity.this, MotorTestActivity.class); intent.putExtra("running", true); startActivity(intent); BlooToothActivity.this.finish(); @@ -220,7 +221,7 @@ public class BlooToothActivity extends BaseActivity implements OnClickListener { public void onClick(View arg0) { Intent intent; - intent = new Intent(this, MotorTestActivity.class); + intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, MotorTestActivity.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/BrightnessTest.java b/app/src/main/java/mobile/miki/BrightnessTest.java index 8e4826b..5ce0906 100644 --- a/app/src/main/java/mobile/miki/BrightnessTest.java +++ b/app/src/main/java/mobile/miki/BrightnessTest.java @@ -22,6 +22,7 @@ import java.io.FileInputStream; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; //import sim.android.mtkcit.CITActivity; //import sim.android.mtkcit.R; @@ -305,7 +306,7 @@ public class BrightnessTest extends BaseActivity @Override public void onClick(View arg0) { - Intent intent = new Intent(this, GravitySensorActivity.class); + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, GravitySensorActivity.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/CameraPreview.java b/app/src/main/java/mobile/miki/CameraPreview.java index 0a245d7..c5fff3d 100644 --- a/app/src/main/java/mobile/miki/CameraPreview.java +++ b/app/src/main/java/mobile/miki/CameraPreview.java @@ -37,6 +37,7 @@ import java.util.List; import mobile.miki.ageingmode.AgeingModeActivity; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; +import mobile.miki.util.Config; import mobile.miki.util.FTUtils; public class CameraPreview extends BaseActivity implements SurfaceHolder.Callback, OnClickListener { @@ -414,7 +415,7 @@ public class CameraPreview extends BaseActivity implements SurfaceHolder.Callbac @Override public void onClick(View arg0) { - Intent intent = new Intent(this, WifiTestActiviy.class); + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, WifiTestActiviy.class); intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); Intent intent1 = new Intent(this, TestMainActivity.class); diff --git a/app/src/main/java/mobile/miki/DSPActivity.java b/app/src/main/java/mobile/miki/DSPActivity.java index 0a346f9..41d78d3 100644 --- a/app/src/main/java/mobile/miki/DSPActivity.java +++ b/app/src/main/java/mobile/miki/DSPActivity.java @@ -28,6 +28,7 @@ import java.io.OutputStream; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; +import mobile.miki.util.Config; public class DSPActivity extends BaseActivity implements View.OnClickListener { @@ -189,7 +190,7 @@ public class DSPActivity extends BaseActivity implements View.OnClickListener { @Override public void onClick(View view) { - Intent intent = new Intent(this, HeartRate.class); + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, HeartRate.class); intent.putExtra("running", true); Intent intent1 = new Intent(this, TestMainActivity.class); switch (view.getId()) { diff --git a/app/src/main/java/mobile/miki/DialerTestActivity.java b/app/src/main/java/mobile/miki/DialerTestActivity.java index c2ee799..69dd62e 100644 --- a/app/src/main/java/mobile/miki/DialerTestActivity.java +++ b/app/src/main/java/mobile/miki/DialerTestActivity.java @@ -18,6 +18,7 @@ import mobile.miki.ageingmode.AgeingModeActivity; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; public class DialerTestActivity extends BaseActivity implements android.view.View.OnClickListener{ private static final String TAG = "DialerTestActivity"; @@ -99,12 +100,12 @@ public class DialerTestActivity extends BaseActivity implements android.view.Vie public void onClick(View arg0) { Intent intent; - if (pcbatest){ - intent = new Intent(this, GravitySensorActivity.class); - - }else{ - intent = new Intent(this, BrightnessTest.class); - } +// if (pcbatest){ +// intent = new Intent(this, GravitySensorActivity.class); +// +// }else{ + intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, BrightnessTest.class); +// } intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); diff --git a/app/src/main/java/mobile/miki/GpsTest.java b/app/src/main/java/mobile/miki/GpsTest.java index 42c1010..6d54b33 100644 --- a/app/src/main/java/mobile/miki/GpsTest.java +++ b/app/src/main/java/mobile/miki/GpsTest.java @@ -27,6 +27,7 @@ import java.util.List; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; public class GpsTest extends BaseActivity implements android.view.View.OnClickListener { @@ -286,7 +287,7 @@ public class GpsTest extends BaseActivity implements public void onClick(View arg0) { Display myDisplay = getWindowManager().getDefaultDisplay(); Intent intent; - intent = new Intent(this, RingtoneActivity.class); + intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, RingtoneActivity.class); intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); @@ -336,8 +337,7 @@ public class GpsTest extends BaseActivity implements case 0: Intent intent; - intent = new Intent(GpsTest.this, - RingtoneActivity.class); + intent = Config.getNextTestIntent(GpsTest.this,GpsTest.this.getClass());//new Intent(GpsTest.this, RingtoneActivity.class); intent.putExtra("running", true); intent.putExtra("pcbatest", pcbatest); startActivity(intent); diff --git a/app/src/main/java/mobile/miki/GravitySensorActivity.java b/app/src/main/java/mobile/miki/GravitySensorActivity.java index 2a9e878..0ee06cc 100644 --- a/app/src/main/java/mobile/miki/GravitySensorActivity.java +++ b/app/src/main/java/mobile/miki/GravitySensorActivity.java @@ -24,6 +24,7 @@ import android.widget.Toast; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; public class GravitySensorActivity extends BaseActivity implements SensorEventListener, android.view.View.OnClickListener { @@ -113,7 +114,7 @@ public class GravitySensorActivity extends BaseActivity @Override public void onClick(View arg0) { - Intent intent = new Intent(this, BatteryTestActivity.class); + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, BatteryTestActivity.class); intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); Intent intent1 = new Intent(this, TestMainActivity.class); @@ -168,7 +169,7 @@ public class GravitySensorActivity extends BaseActivity buttonView.setSuccessColor(); if (running) { - Intent intent = new Intent(GravitySensorActivity.this, BatteryTestActivity.class); + Intent intent = Config.getNextTestIntent(GravitySensorActivity.this,GravitySensorActivity.this.getClass());//new Intent(GravitySensorActivity.this, BatteryTestActivity.class); intent.putExtra("running", true); intent.putExtra("pcbatest", pcbatest); startActivity(intent); diff --git a/app/src/main/java/mobile/miki/HeartRate.java b/app/src/main/java/mobile/miki/HeartRate.java index da231ec..92f2cfd 100644 --- a/app/src/main/java/mobile/miki/HeartRate.java +++ b/app/src/main/java/mobile/miki/HeartRate.java @@ -16,6 +16,7 @@ import java.util.TimerTask; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; +import mobile.miki.util.Config; import mobile.miki.util.Logger; public class HeartRate extends BaseActivity implements View.OnClickListener { @@ -92,7 +93,7 @@ public class HeartRate extends BaseActivity implements View.OnClickListener { @Override public void onClick(View view) { - Intent intent = 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/KeysTestActivity.java b/app/src/main/java/mobile/miki/KeysTestActivity.java index a221074..667f6ee 100644 --- a/app/src/main/java/mobile/miki/KeysTestActivity.java +++ b/app/src/main/java/mobile/miki/KeysTestActivity.java @@ -29,6 +29,7 @@ import cn.davidsu.library.LineWrapContainer; 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 KeysTestActivity extends BaseActivity implements @@ -273,10 +274,10 @@ public class KeysTestActivity extends BaseActivity implements @Override public void onClick(View arg0) { - Intent intent = new Intent(this, TestMainActivity.class); - if (FTUtils.isSugar()) { - intent = new Intent(this, BlooToothActivity.class); - } + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, TestMainActivity.class); +// if (FTUtils.isSugar()) { +// intent = new Intent(this, BlooToothActivity.class); +// } intent.putExtra("running", true); Intent intent1 = new Intent(this, TestMainActivity.class); // TestResult testResult = (TestResult) getApplicationContext(); @@ -310,10 +311,7 @@ public class KeysTestActivity extends BaseActivity implements private void pass() { buttonView.setSuccessColor(); if (running) { - Intent intent = new Intent(this, TestMainActivity.class); - if (FTUtils.isSugar() || FTUtils.isS06()) { - intent = new Intent(this, BlooToothActivity.class); - } + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, TestMainActivity.class); intent.putExtra("running", true); startActivity(intent); PreferenceManager diff --git a/app/src/main/java/mobile/miki/MikeTest.java b/app/src/main/java/mobile/miki/MikeTest.java index 553d117..a3455b0 100644 --- a/app/src/main/java/mobile/miki/MikeTest.java +++ b/app/src/main/java/mobile/miki/MikeTest.java @@ -31,6 +31,7 @@ import android.widget.TextView; 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; //import sim.android.mtkcit.CITActivity; @@ -324,7 +325,7 @@ public class MikeTest extends BaseActivity implements android.view.View.OnClick @Override public void onClick(View arg0) { - Intent intent = new Intent(this, SimDetectActivity.class); + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, SimDetectActivity.class); intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); Intent intent1 = new Intent(this, TestMainActivity.class); @@ -415,9 +416,9 @@ public class MikeTest extends BaseActivity implements android.view.View.OnClick try { if(SINGLEITEM_OR_CYCLE_MODE == 2) { Intent ageingIntent = new Intent(MikeTest.this,RingtoneActivity.class); - if (FTUtils.isSugar()) { - ageingIntent = new Intent(MikeTest.this,MotorTestActivity.class); - } +// if (FTUtils.isSugar()) { +// ageingIntent = new Intent(MikeTest.this,MotorTestActivity.class); +// } ageingIntent.putExtra("ageing_mode", true); ageingIntent.putExtra("singleitem_or_cycle_mode", SINGLEITEM_OR_CYCLE_MODE); ageingIntent.putExtra("work_time", WORK_TIME); diff --git a/app/src/main/java/mobile/miki/MotorTestActivity.java b/app/src/main/java/mobile/miki/MotorTestActivity.java index f79d586..5ce2588 100644 --- a/app/src/main/java/mobile/miki/MotorTestActivity.java +++ b/app/src/main/java/mobile/miki/MotorTestActivity.java @@ -17,6 +17,7 @@ import android.view.View; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; +import mobile.miki.util.Config; import mobile.miki.util.FTUtils; public class MotorTestActivity extends BaseActivity implements android.view.View.OnClickListener{ @@ -168,10 +169,10 @@ public class MotorTestActivity extends BaseActivity implements android.view.View @Override public void onClick(View arg0) { - Intent intent = new Intent(this, UltravioletMonitorActivity.class); - if (FTUtils.isS06()) { - intent = new Intent(this, DSPActivity.class); - } + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, UltravioletMonitorActivity.class); +// if (FTUtils.isS06()) { +// intent = new Intent(this, DSPActivity.class); +// } intent.putExtra("running", true); Intent intent1 = new Intent(this, TestMainActivity.class); switch (arg0.getId()) { diff --git a/app/src/main/java/mobile/miki/RingtoneActivity.java b/app/src/main/java/mobile/miki/RingtoneActivity.java index ec84d9c..d5303a9 100644 --- a/app/src/main/java/mobile/miki/RingtoneActivity.java +++ b/app/src/main/java/mobile/miki/RingtoneActivity.java @@ -25,6 +25,7 @@ import mobile.miki.ageingmode.AgeingModeActivity; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; import mobile.miki.util.Logger; public class RingtoneActivity extends BaseActivity implements @@ -221,12 +222,12 @@ public class RingtoneActivity extends BaseActivity implements public void onClick(View arg0) { Intent intent; //传奇不需要mic - String model = Build.MODEL; - if(model != null && model.contains("F6")) { - intent = new Intent(this, SimDetectActivity.class); - } else { - intent = new Intent(this, MikeTest.class); - } +// String model = Build.MODEL; +// if(model != null && model.contains("F6")) { + intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, SimDetectActivity.class); +// } else { +// intent = new Intent(this, MikeTest.class); +// } intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); diff --git a/app/src/main/java/mobile/miki/SimDetectActivity.java b/app/src/main/java/mobile/miki/SimDetectActivity.java index 5b83cb1..7294f86 100644 --- a/app/src/main/java/mobile/miki/SimDetectActivity.java +++ b/app/src/main/java/mobile/miki/SimDetectActivity.java @@ -29,6 +29,7 @@ import java.lang.reflect.Method; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; public class SimDetectActivity extends BaseActivity implements android.view.View.OnClickListener { @@ -235,12 +236,12 @@ public class SimDetectActivity extends BaseActivity implements public void onClick(View arg0) { Intent intent ; - if (pcbatest){ - intent = new Intent(this, GravitySensorActivity.class); - - }else{ - intent = new Intent(this, DialerTestActivity.class); - } +// if (pcbatest){ +// intent = new Intent(this, GravitySensorActivity.class); +// +// }else{ + intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, DialerTestActivity.class); +// } intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); @@ -291,12 +292,12 @@ public class SimDetectActivity extends BaseActivity implements Toast.LENGTH_SHORT).show(); Display myDisplay = getWindowManager().getDefaultDisplay(); Intent intent; - if (pcbatest){ - intent = new Intent(this, GravitySensorActivity.class); - - }else{ - intent = new Intent(this, DialerTestActivity.class); - } +// if (pcbatest){ +// intent = new Intent(this, GravitySensorActivity.class); +// +// }else{ + intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, DialerTestActivity.class); +// } intent.putExtra("running", true); intent.putExtra("pcbatest", pcbatest); startActivity(intent); diff --git a/app/src/main/java/mobile/miki/SystemMemory.java b/app/src/main/java/mobile/miki/SystemMemory.java index 15af500..b479e33 100644 --- a/app/src/main/java/mobile/miki/SystemMemory.java +++ b/app/src/main/java/mobile/miki/SystemMemory.java @@ -16,6 +16,7 @@ import java.io.File; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; +import mobile.miki.util.Config; import mobile.miki.util.FTUtils; public class SystemMemory extends BaseActivity implements OnClickListener{ @@ -114,17 +115,17 @@ public class SystemMemory extends BaseActivity implements OnClickListener{ public void onClick(View arg0) { Intent intent = null; //正指向添加录音测试 - String model = Build.MODEL; - if(model != null && (model.contains("WG1702") || model.contains("PD88-18")) || (model.contains("SCX-N18-18") || model.contains("PD88-8") || model.contains("F6"))) { - intent = new Intent(this, RecordActivity.class); - } else if (FTUtils.isSugar() || FTUtils.isLieBao() || FTUtils.isS06()) { - intent = new Intent(this, KeysTestActivity.class); - } else if (FTUtils.isS06()){ - // s06 - intent = new Intent(this, DSPActivity.class); - } else { - intent = new Intent(this, TestMainActivity.class); - } +// String model = Build.MODEL; +// if(model != null && (model.contains("WG1702") || model.contains("PD88-18")) || (model.contains("SCX-N18-18") || model.contains("PD88-8") || model.contains("F6"))) { +// intent = new Intent(this, RecordActivity.class); +// } else if (FTUtils.isSugar() || FTUtils.isLieBao() || FTUtils.isS06()) { +// intent = new Intent(this, KeysTestActivity.class); +// } else if (FTUtils.isS06()){ +// // s06 +// intent = new Intent(this, DSPActivity.class); +// } else { + intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, TestMainActivity.class); +// } intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); @@ -135,11 +136,9 @@ public class SystemMemory extends BaseActivity implements OnClickListener{ case R.id.btn_two_left: if (!running) { startActivity(intent1); - } else if (FTUtils.isS06()) { - startActivity(intent); - } else { + } else{ // 自动化测试最后一项直接回到主界面 - startActivity(intent1); + startActivity(intent); } PreferenceManager .getDefaultSharedPreferences(getApplicationContext()) @@ -151,10 +150,8 @@ public class SystemMemory extends BaseActivity implements OnClickListener{ case R.id.btn_two_right: if (!running) { startActivity(intent1); - } else if (FTUtils.isS06()) { - startActivity(intent); } else { - startActivity(intent1); + startActivity(intent); } PreferenceManager .getDefaultSharedPreferences(getApplicationContext()) diff --git a/app/src/main/java/mobile/miki/TouchTest.java b/app/src/main/java/mobile/miki/TouchTest.java index 93d313c..b2f9964 100644 --- a/app/src/main/java/mobile/miki/TouchTest.java +++ b/app/src/main/java/mobile/miki/TouchTest.java @@ -23,6 +23,7 @@ import java.util.Iterator; import mobile.miki.lcd.LcdActivity; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; //import sim.android.mtkcit.TestActivity; //import sim.android.mtkcit.cittools.CITTools; @@ -132,7 +133,7 @@ public class TouchTest extends BaseActivity { // systemuiIntent.putExtra("open", true); // sendBroadcast(systemuiIntent); - Intent intent2 = new Intent(this, LcdActivity.class); + Intent intent2 = Config.getNextTestIntent(this,this.getClass());//new Intent(this, LcdActivity.class); intent2.putExtra("running", true); Intent intent1 = new Intent(this, TestMainActivity.class); diff --git a/app/src/main/java/mobile/miki/UltravioletMonitorActivity.java b/app/src/main/java/mobile/miki/UltravioletMonitorActivity.java index 1e90687..b0dd267 100644 --- a/app/src/main/java/mobile/miki/UltravioletMonitorActivity.java +++ b/app/src/main/java/mobile/miki/UltravioletMonitorActivity.java @@ -24,6 +24,7 @@ import java.util.List; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; /** * 紫外线检测 @@ -96,7 +97,7 @@ public class UltravioletMonitorActivity extends BaseActivity @Override public void onClick(View arg0) { - Intent intent = new Intent(this, TestMainActivity.class); + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, TestMainActivity.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/VersionActivity.java b/app/src/main/java/mobile/miki/VersionActivity.java index e09fa89..a08cd8d 100644 --- a/app/src/main/java/mobile/miki/VersionActivity.java +++ b/app/src/main/java/mobile/miki/VersionActivity.java @@ -23,6 +23,7 @@ import android.widget.TextView; 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; import mobile.miki.util.IATUtils; @@ -190,15 +191,15 @@ public class VersionActivity extends BaseActivity implements android.view.View.O @Override public void onClick(View arg0) { Intent intent ; - if (pcbatest) { - intent = new Intent(this, CameraPreview.class); - intent.putExtra("running", true); - intent.putExtra("pcbatest", true); - }else{ - intent = new Intent(this, TouchTest.class); +// if (pcbatest) { +// intent = new Intent(this, CameraPreview.class); +// intent.putExtra("running", true); +// intent.putExtra("pcbatest", true); +// }else{ + intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, TouchTest.class); intent.putExtra("running", true); intent.putExtra("pcbatest",false); - } +// } Intent intent1 = new Intent(this, TestMainActivity.class); // TestResult testResult = (TestResult) getApplicationContext(); diff --git a/app/src/main/java/mobile/miki/WifiTestActiviy.java b/app/src/main/java/mobile/miki/WifiTestActiviy.java index 636931c..90e11f8 100644 --- a/app/src/main/java/mobile/miki/WifiTestActiviy.java +++ b/app/src/main/java/mobile/miki/WifiTestActiviy.java @@ -29,6 +29,7 @@ import mobile.miki.adapter.ListViewAdapter; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; public class WifiTestActiviy extends BaseActivity implements android.view.View.OnClickListener { private ProgressDialog dialogBar; @@ -89,6 +90,7 @@ public class WifiTestActiviy extends BaseActivity implements android.view.View.O this.dialogBar.setMessage(getResources().getString(R.string.wfScaning)); this.dialogBar.setProgressStyle(0); wifiScan(null); + } @@ -173,7 +175,7 @@ public class WifiTestActiviy extends BaseActivity implements android.view.View.O @Override public void onClick(View arg0) { - Intent intent = new Intent(this, GpsTest.class); + Intent intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, GpsTest.class); intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); Intent intent1 = new Intent(this, TestMainActivity.class); @@ -217,7 +219,7 @@ public class WifiTestActiviy extends BaseActivity implements android.view.View.O super.handleMessage(msg); switch (msg.what) { case 0: - Intent intent = new Intent(WifiTestActiviy.this, GpsTest.class); + Intent intent = Config.getNextTestIntent(WifiTestActiviy.this,WifiTestActiviy.this.getClass());//new Intent(WifiTestActiviy.this, GpsTest.class); intent.putExtra("running", true); intent.putExtra("pcbatest",pcbatest); startActivity(intent); diff --git a/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java b/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java index 7404e45..036b05e 100644 --- a/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java +++ b/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java @@ -15,6 +15,7 @@ import mobile.miki.ageingmode.AgeingModeActivity; import mobile.miki.mainui.ButtonViewTwo; import mobile.miki.mainui.TestMainActivity; import mobile.miki.mainui.TestMainList; +import mobile.miki.util.Config; public class LcdJudgActivity extends Activity implements android.view.View.OnClickListener { private ButtonViewTwo buttonView; @@ -34,7 +35,7 @@ public class LcdJudgActivity extends Activity implements android.view.View.OnCli buttonView.setSuccessColor(); buttonView.btn_left.setClickable(true); getLcdIntent(); - + Config.initConfig(this); } private void getLcdIntent() { @@ -60,14 +61,14 @@ public class LcdJudgActivity extends Activity implements android.view.View.OnCli @Override public void onClick(View arg0) { Intent intent; - intent = new Intent(this, CameraPreview.class); + intent = Config.getNextTestIntent(this,LcdActivity.class);//new Intent(this, CameraPreview.class); //正指向，贝尔丰需要震动测试 String model = Build.MODEL; - if(model != null ) { - if(model.contains("WG1702") || model.contains("BF A1") || model.contains("PD88-18") || model.contains("SCX-N18-18") || model.contains("PD88-8") || model.contains("F6")) { - intent = new Intent(this, MotorTestActivity.class); - } - } +// if(model != null ) { +// if(model.contains("WG1702") || model.contains("BF A1") || model.contains("PD88-18") || model.contains("SCX-N18-18") || model.contains("PD88-8") || model.contains("F6")) { +// intent = new Intent(this, MotorTestActivity.class); +// } +// } // intent.putExtra("running", true); diff --git a/app/src/main/java/mobile/miki/mainui/TestMainActivity.java b/app/src/main/java/mobile/miki/mainui/TestMainActivity.java index 31ba878..bd11340 100644 --- a/app/src/main/java/mobile/miki/mainui/TestMainActivity.java +++ b/app/src/main/java/mobile/miki/mainui/TestMainActivity.java @@ -43,6 +43,7 @@ import mobile.miki.VersionActivity; import mobile.miki.WifiTestActiviy; import mobile.miki.adapter.TestMainListAdapter; import mobile.miki.lcd.LcdActivity; +import mobile.miki.util.Config; import mobile.miki.util.FTUtils; /*程序主界面*/ @@ -72,7 +73,6 @@ public class TestMainActivity extends BaseActivity implements OnClickListener, A private GridView gridView; private TestMainListAdapter adapter; - String[] stateArr; @Override protected void onCreate(Bundle savedInstanceState) { @@ -87,11 +87,10 @@ public class TestMainActivity extends BaseActivity implements OnClickListener, A protected void onResume() { super.onResume(); getDeviceInfo(); - adapter = new TestMainListAdapter(this, getArray(), stateArr); + adapter = new TestMainListAdapter(this, Config.getArray(this), Config.stateArr); setSaveColorState(); gridView.setAdapter(adapter); gridView.setOnItemClickListener(this); - } private void getDeviceInfo() { @@ -180,17 +179,17 @@ public class TestMainActivity extends BaseActivity implements OnClickListener, A private void setSaveColorState() { - for (int i = 0; i < testResultList.size(); i++) { - String status = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString(testResultList.get(i), ""); - stateArr[i] = status; + for (int i = 0; i < Config.testResultList.size(); i++) { + String status = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString(Config.testResultList.get(i), ""); + Config.stateArr[i] = status; } } public void clearTestData() { - for (int i = 0; i < testResultList.size(); i++) { - PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString(testResultList.get(i), "").commit(); + for (int i = 0; i < Config.testResultList.size(); i++) { + PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString(Config.testResultList.get(i), "").commit(); } Intent intent = new Intent(this, TestMainActivity.class); startActivity(intent); @@ -229,111 +228,12 @@ public class TestMainActivity extends BaseActivity implements OnClickListener, A } private void startActivity(String text) { - Intent intent = null; - if (text.equals(getResources().getString(R.string.version_new))) { - intent = new Intent(TestMainActivity.this, VersionActivity.class); - } else if (text.equals(getResources().getString(R.string.touch))) { - intent = new Intent(TestMainActivity.this, TouchTest.class); - } else if (text.equals(getResources().getString(R.string.light_new))) { - intent = new Intent(TestMainActivity.this, LcdActivity.class); - } else if (text.equals(getResources().getString(R.string.camera))) { - intent = new Intent(TestMainActivity.this, CameraPreview.class); - } else if (text.equals(getResources().getString(R.string.wifi))) { - intent = new Intent(TestMainActivity.this, WifiTestActiviy.class); - }else if (text.equals(getResources().getString(R.string.gps))) { - intent = new Intent(TestMainActivity.this, GpsTest.class); - }else if (text.equals(getResources().getString(R.string.speak))) { - intent = new Intent(TestMainActivity.this, RingtoneActivity.class); - }else if (text.equals(getResources().getString(R.string.mic_title))) { - intent = new Intent(TestMainActivity.this, MikeTest.class); - }else if (text.equals(getResources().getString(R.string.sim_title))) { - intent = new Intent(TestMainActivity.this, SimDetectActivity.class); - }else if (text.equals(getResources().getString(R.string.dual_new))) { - intent = new Intent(TestMainActivity.this, DialerTestActivity.class); - }else if (text.equals(getResources().getString(R.string.ramromTest))) { - intent = new Intent(TestMainActivity.this, SystemMemory.class); - }else if (text.equals(getResources().getString(R.string.beiguang_new))) { - intent = new Intent(TestMainActivity.this, BrightnessTest.class); - }else if (text.equals(getResources().getString(R.string.test_sensor))) { - intent = new Intent(TestMainActivity.this, GravitySensorActivity.class); - }else if (text.equals(getResources().getString(R.string.test_battery))) { - intent = new Intent(TestMainActivity.this, BatteryTestActivity.class); - }else if (text.equals(getResources().getString(R.string.test_keypad))) { - intent = new Intent(TestMainActivity.this, KeysTestActivity.class); - }else if (text.equals(getResources().getString(R.string.bt))) { - intent = new Intent(TestMainActivity.this, BlooToothActivity.class); - }else if (text.equals(getResources().getString(R.string.shakeTest))) { - intent = new Intent(TestMainActivity.this, MotorTestActivity.class); - }else if (text.equals(getResources().getString(R.string.ultraviolet))) { - intent = new Intent(TestMainActivity.this, UltravioletMonitorActivity.class); - }else if (text.equals(getResources().getString(R.string.dsp))) { - intent = new Intent(TestMainActivity.this, DSPActivity.class); - }else if (text.equals(getResources().getString(R.string.heartrate))) { - intent = new Intent(TestMainActivity.this, HeartRate.class); - } + Intent intent = Config.getIntent(this,text); if (intent != null) { - intent.putExtra("running", false); startActivityForResult(intent, 0); } - - } - - public String[] getList() { - String[] listTem = {getString(R.string.version_new), getString(R.string.touch), getString(R.string.light_new), getString(R.string.camera), - getString(R.string.wifi), getString(R.string.gps), getString(R.string.speak), getString(R.string.mic_title), - getString(R.string.sim_title), getString(R.string.dual_new), getString(R.string.ramromTest), getString(R.string.beiguang_new), - getString(R.string.test_sensor), getString(R.string.test_battery)}; - return listTem; - } - - List testResultList; - private List getArray() { - List list = new ArrayList(); - testResultList = new ArrayList(); - for (int i = 0; i < getList().length; i++) { - list.add(getList()[i]); - testResultList.add(sharedPreferencesArr[i]); - } - if (FTUtils.isLieBao()) { - list.add(getString(R.string.test_keypad)); - testResultList.add("keys"); - } else if (FTUtils.isSugar()) { - list.add(getString(R.string.test_keypad)); - list.add(getString(R.string.bt)); - list.add(getString(R.string.shakeTest)); - list.add(getString(R.string.ultraviolet)); - - testResultList.add("keys"); - testResultList.add("bt"); - testResultList.add("vibrator"); - testResultList.add("Ultraviolet"); - } else if (FTUtils.isS06()) { - // s06 添加dsp测试 - list.add(getString(R.string.hall)); - list.add(getString(R.string.bt)); - list.add(getString(R.string.dsp)); - list.add(getString(R.string.heartrate)); - - testResultList.add("keys"); - testResultList.add("bt"); - testResultList.add("dsp"); - testResultList.add("heartrate"); - } else if (FTUtils.isQ3F()){ - - list.add(getString(R.string.test_keypad)); - list.add(getString(R.string.shakeTest)); - list.add(getString(R.string.heartrate)); - testResultList.add("keys"); - testResultList.add("vibrator"); - testResultList.add("heartrate"); - } - stateArr = new String[testResultList.size()]; - return list; } - String[] sharedPreferencesArr = {"version", "touch", "lcd", "camera", "wifi", "gps", "speak", "mic", "sim", "dialer", - "watchmemory", "light", "Gsensor", "watchbattery"/*, "keys", "bt", "vibrator", "Ultraviolet", "dsp"*/}; - } diff --git a/app/src/main/java/mobile/miki/mainui/TestMainList.java b/app/src/main/java/mobile/miki/mainui/TestMainList.java index 10294c6..d26dcbc 100644 --- a/app/src/main/java/mobile/miki/mainui/TestMainList.java +++ b/app/src/main/java/mobile/miki/mainui/TestMainList.java @@ -27,6 +27,7 @@ import mobile.miki.R; import mobile.miki.VersionActivity; import mobile.miki.ageingmode.AgeingModeActivity; import mobile.miki.flow.DownLoad; +import mobile.miki.util.Config; import mobile.miki.util.FTUtils; import mobile.miki.shutdown_activity; @@ -89,6 +90,7 @@ public class TestMainList extends BaseActivity implements OnClickListener { gpsFulltest.setOnClickListener(this); // Log.d(TAG, "onCreate"); Settings.System.putInt(getContentResolver(), "mobile.miki.FactoryModeRunning", 1); + Config.initConfig(this); } @Override diff --git a/app/src/main/java/mobile/miki/util/Config.java b/app/src/main/java/mobile/miki/util/Config.java new file mode 100644 index 0000000..daced4d --- /dev/null +++ b/app/src/main/java/mobile/miki/util/Config.java @@ -0,0 +1,286 @@ +package mobile.miki.util; + +import android.app.Application; +import android.content.Context; +import android.content.Intent; + +import java.util.ArrayList; +import java.util.List; + +import mobile.miki.BatteryTestActivity; +import mobile.miki.BlooToothActivity; +import mobile.miki.BrightnessTest; +import mobile.miki.CameraPreview; +import mobile.miki.DSPActivity; +import mobile.miki.DialerTestActivity; +import mobile.miki.GpsTest; +import mobile.miki.GravitySensorActivity; +import mobile.miki.HeartRate; +import mobile.miki.KeysTestActivity; +import mobile.miki.MikeTest; +import mobile.miki.MotorTestActivity; +import mobile.miki.MyApplication; +import mobile.miki.R; +import mobile.miki.RingtoneActivity; +import mobile.miki.SimDetectActivity; +import mobile.miki.SystemMemory; +import mobile.miki.TouchTest; +import mobile.miki.UltravioletMonitorActivity; +import mobile.miki.VersionActivity; +import mobile.miki.WifiTestActiviy; +import mobile.miki.lcd.LcdActivity; +import mobile.miki.mainui.TestMainActivity; + +public class Config { + + private static List TestItems=null; + private static List TestResult=null; + public static void setTestItems(List items){ + + if(items==null){ + Logger.d("setTestItems items is null"); + return ; + } + if (TestItems==null){ + TestItems=new ArrayList(); + TestResult=new ArrayList(); + } + TestItems.clear(); + TestResult.clear(); + + for (int i=0;i< items.size();i++ ) { + TestItems.add(i,items.get(i)); + TestResult.add(i,"false"); + } + + } + + public static int getIndexByTestItemName(String name){ + Logger.d("name "+name+" item "+TestItems); + +// if (TestItems==null) initConfig(MyApplication.getInstance().getApplicationContext()); + if(name!=null && TestItems!=null) { + for (int i = 0; i < TestItems.size(); i++) { + Logger.d("name "+name+" item "+TestItems.get(i)+" "+i); + if (name.equals(TestItems.get(i))) { + return i; + } + } + } + return -1; + } + public static String getNextTestItemName(String testItemmName){ + + int index=-1; + index=getIndexByTestItemName(testItemmName); + Logger.d("find "+testItemmName+", index "+index); + if (TestItems!=null && index >=0&& index+1< TestItems.size()){ + String itemname= TestItems.get(index+1); + return itemname; + }else{ + return null; + } + } + public static String getNextTestItemName(int index){ + if (TestItems!=null && index >=0&& index+1< TestItems.size()){ + return TestItems.get(index+1); + }else{ + return null; + } + } + + public static Intent getNextTestIntent(Context context,Class cls){ + String currentTestItemName=getTestNameByClass(context,cls.getSimpleName()); + Logger.d("currentTestItemName="+currentTestItemName); + String nextTestItemName=getNextTestItemName(currentTestItemName); + Logger.d("nextTestItemName="+nextTestItemName); + return getIntent(context,nextTestItemName); + } + public static String getTestNameByClass(Context context,String ClassName){ + + if (context==null || ClassName==null) return null; + if (ClassName.equals(VersionActivity.class.getSimpleName())) { + return context.getResources().getString(R.string.version_new); + }else if (ClassName.equals(TouchTest.class.getSimpleName())){ + return context.getResources().getString(R.string.touch); + }else if (ClassName.equals(LcdActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.light_new); + }else if (ClassName.equals(CameraPreview.class.getSimpleName())){ + return context.getResources().getString(R.string.camera); + }else if (ClassName.equals(WifiTestActiviy.class.getSimpleName())){ + return context.getResources().getString(R.string.wifi); + }else if (ClassName.equals(GpsTest.class.getSimpleName())){ + return context.getResources().getString(R.string.gps); + }else if (ClassName.equals(RingtoneActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.speak); + }else if (ClassName.equals(MikeTest.class.getSimpleName())){ + return context.getResources().getString(R.string.mic_title); + }else if (ClassName.equals(SimDetectActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.sim_title); + }else if (ClassName.equals(DialerTestActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.dual_new); + }else if (ClassName.equals(SystemMemory.class.getSimpleName())){ + return context.getResources().getString(R.string.ramromTest); + }else if (ClassName.equals(BrightnessTest.class.getSimpleName())){ + return context.getResources().getString(R.string.beiguang_new); + }else if (ClassName.equals(GravitySensorActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.test_sensor); + }else if (ClassName.equals(BatteryTestActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.test_battery); + }else if (ClassName.equals(KeysTestActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.test_keypad); + }else if (ClassName.equals(BlooToothActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.bt); + }else if (ClassName.equals(MotorTestActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.shakeTest); + }else if (ClassName.equals(UltravioletMonitorActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.ultraviolet); + }else if (ClassName.equals(DSPActivity.class.getSimpleName())){ + return context.getResources().getString(R.string.dsp); + }else if (ClassName.equals(HeartRate.class.getSimpleName())){ + return context.getResources().getString(R.string.heartrate); + }else { + + return null; + } + + } + public static Intent getIntent(Context context, String testItemName) { + + if (context==null || testItemName==null) + return (new Intent(context, TestMainActivity.class));; + Intent intent = null; + if (testItemName.equals(context.getResources().getString(R.string.version_new))) { + intent = new Intent(context, VersionActivity.class); + } else if (testItemName.equals(context.getResources().getString(R.string.touch))) { + intent = new Intent(context, TouchTest.class); + } else if (testItemName.equals(context.getResources().getString(R.string.light_new))) { + intent = new Intent(context, LcdActivity.class); + } else if (testItemName.equals(context.getResources().getString(R.string.camera))) { + intent = new Intent(context, CameraPreview.class); + } else if (testItemName.equals(context.getResources().getString(R.string.wifi))) { + intent = new Intent(context, WifiTestActiviy.class); + }else if (testItemName.equals(context.getResources().getString(R.string.gps))) { + intent = new Intent(context, GpsTest.class); + }else if (testItemName.equals(context.getResources().getString(R.string.speak))) { + intent = new Intent(context, RingtoneActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.mic_title))) { + intent = new Intent(context, MikeTest.class); + }else if (testItemName.equals(context.getResources().getString(R.string.sim_title))) { + intent = new Intent(context, SimDetectActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.dual_new))) { + intent = new Intent(context, DialerTestActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.ramromTest))) { + intent = new Intent(context, SystemMemory.class); + }else if (testItemName.equals(context.getResources().getString(R.string.beiguang_new))) { + intent = new Intent(context, BrightnessTest.class); + }else if (testItemName.equals(context.getResources().getString(R.string.test_sensor))) { + intent = new Intent(context, GravitySensorActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.test_battery))) { + intent = new Intent(context, BatteryTestActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.test_keypad))) { + intent = new Intent(context, KeysTestActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.bt))) { + intent = new Intent(context, BlooToothActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.shakeTest))) { + intent = new Intent(context, MotorTestActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.ultraviolet))) { + intent = new Intent(context, UltravioletMonitorActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.dsp))) { + intent = new Intent(context, DSPActivity.class); + }else if (testItemName.equals(context.getResources().getString(R.string.heartrate))) { + intent = new Intent(context, HeartRate.class); + } + + if (intent != null) { + intent.putExtra("running", false); + }else{ + intent = new Intent(context, TestMainActivity.class); + } + return intent; + } + public static String getItemAt(int i){ + if (TestItems!=null && i >=0&& i< TestItems.size()){ + return TestItems.get(i); + }else{ + return null; + } + } + public static String getItemResultAt(int i){ + if (TestResult!=null && i >=0&& i< TestResult.size()){ + return TestResult.get(i); + }else{ + return null; + } + } + + public static boolean setTestResult(int i, boolean pass){ + if (TestResult!=null && i >=0&& i< TestResult.size()){ + TestResult.set(i,String.valueOf(pass)); + return true; + } + return false; + } + + public static void initConfig(Context context){ + setTestItems(getArray(context)); + + } + + public static String[] getList(Context context) { + String[] listTem = {context.getString(R.string.version_new), context.getString(R.string.touch), context.getString(R.string.light_new), context.getString(R.string.camera), + context.getString(R.string.wifi), context.getString(R.string.gps), context.getString(R.string.speak), context.getString(R.string.mic_title), + context.getString(R.string.sim_title), context.getString(R.string.dual_new), context.getString(R.string.ramromTest), context.getString(R.string.beiguang_new), + context.getString(R.string.test_sensor), context.getString(R.string.test_battery)}; + return listTem; + } + public static String[] stateArr; + public static List testResultList; + public static List getArray(Context context) { + List list = new ArrayList(); + testResultList = new ArrayList(); + for (int i = 0; i < getList(context).length; i++) { + list.add(getList(context)[i]); + testResultList.add(sharedPreferencesArr[i]); + } + if (FTUtils.isLieBao()) { + list.add(context.getString(R.string.test_keypad)); + testResultList.add("keys"); + } else if (FTUtils.isSugar()) { + list.add(context.getString(R.string.test_keypad)); + list.add(context.getString(R.string.bt)); + list.add(context.getString(R.string.shakeTest)); + list.add(context.getString(R.string.ultraviolet)); + + testResultList.add("keys"); + testResultList.add("bt"); + testResultList.add("vibrator"); + testResultList.add("Ultraviolet"); + } else if (FTUtils.isS06()) { + // s06 添加dsp测试 + list.add(context.getString(R.string.hall)); + list.add(context.getString(R.string.bt)); + list.add(context.getString(R.string.dsp)); + list.add(context.getString(R.string.heartrate)); + + testResultList.add("keys"); + testResultList.add("bt"); + testResultList.add("dsp"); + testResultList.add("heartrate"); + } else if (FTUtils.isQ3F()){ + + list.add(context.getString(R.string.test_keypad)); + list.add(context.getString(R.string.shakeTest)); + list.add(context.getString(R.string.heartrate)); + testResultList.add("keys"); + testResultList.add("vibrator"); + testResultList.add("heartrate"); + } + stateArr = new String[testResultList.size()]; + return list; + } + + + static String[] sharedPreferencesArr = {"version", "touch", "lcd", "camera", "wifi", "gps", "speak", "mic", "sim", "dialer", + "watchmemory", "light", "Gsensor", "watchbattery"/*, "keys", "bt", "vibrator", "Ultraviolet", "dsp"*/}; +} diff --git a/app/src/main/java/mobile/miki/util/FTUtils.java b/app/src/main/java/mobile/miki/util/FTUtils.java index 9f909af..00efe3b 100644 --- a/app/src/main/java/mobile/miki/util/FTUtils.java +++ b/app/src/main/java/mobile/miki/util/FTUtils.java @@ -143,17 +143,17 @@ public class FTUtils { for (int i = 0; i < 16; i++) { resCid[i] = buf[i + 28]; } - for (int i = 0; i < 16; i++) { - if ((resCid[i] >= 0x30 && resCid[i] <= 0x39) || (resCid[i] >= 0x61 && resCid[i] <= 0x7A) || (resCid[i] >= 0x41 && resCid[i] <= 0x5A)) { - // valid - } else { - // invalid - for (int j = 28; j < 28 + 16; j++) { - resCid[j] = 0x30; - } - break; - } - } +// for (int i = 0; i < 16; i++) { +// if ((resCid[i] >= 0x30 && resCid[i] <= 0x39) || (resCid[i] >= 0x61 && resCid[i] <= 0x7A) || (resCid[i] >= 0x41 && resCid[i] <= 0x5A)) { +// // valid +// } else { +// // invalid +// for (int j = 28; j < 28 + 16; j++) { +// resCid[j] = 0x30; +// } +// break; +// } +// } } catch (Exception e) { e.printStackTrace(); }