自动测试改为用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 (file)
--- 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;
 \r
 import mobile.miki.mainui.ButtonViewTwo;\r
 import mobile.miki.mainui.TestMainActivity;\r
+import mobile.miki.util.Config;\r
 \r
 public class BatteryTestActivity extends BaseActivity implements\r
                OnClickListener {\r
@@ -179,7 +180,7 @@ public class BatteryTestActivity extends BaseActivity implements
 \r
        @Override\r
        public void onClick(View arg0) {\r
-               Intent intent = new Intent(this, SystemMemory.class);\r
+               Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, SystemMemory.class);\r
                intent.putExtra("running", true);\r
                intent.putExtra("pcbatest",pcbatest);\r
                Intent intent1 = new Intent(this, TestMainActivity.class);\r

diff --git a/app/src/main/java/mobile/miki/BlooToothActivity.java b/app/src/main/java/mobile/miki/BlooToothActivity.java
index 8d68a20..eb1c671 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 import mobile.miki.util.StringUtil;\r
 \r
 public class BlooToothActivity extends BaseActivity implements OnClickListener {\r
@@ -192,7 +193,7 @@ public class BlooToothActivity extends BaseActivity implements OnClickListener {
                                        switch (msg.what) {\r
                                        case 0:\r
                                                Intent intent;\r
-                                               intent = new Intent(BlooToothActivity.this, MotorTestActivity.class);\r
+                                               intent = Config.getNextTestIntent(BlooToothActivity.this,BlooToothActivity.this.getClass());//new Intent(BlooToothActivity.this, MotorTestActivity.class);\r
                                                intent.putExtra("running", true);\r
                                                startActivity(intent);\r
                                                BlooToothActivity.this.finish();\r
@@ -220,7 +221,7 @@ public class BlooToothActivity extends BaseActivity implements OnClickListener {
        public void onClick(View arg0) {\r
                Intent intent;\r
 \r
-               intent = new Intent(this, MotorTestActivity.class);\r
+               intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, MotorTestActivity.class);\r
                intent.putExtra("running", true);\r
                Intent intent1 = new Intent(this, TestMainActivity.class);\r
                // TestResult testResult = (TestResult) getApplicationContext();\r

diff --git a/app/src/main/java/mobile/miki/BrightnessTest.java b/app/src/main/java/mobile/miki/BrightnessTest.java
index 8e4826b..5ce0906 100644 (file)
--- 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 (file)
--- 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;\r
 import mobile.miki.mainui.ButtonViewTwo;\r
 import mobile.miki.mainui.TestMainActivity;\r
+import mobile.miki.util.Config;\r
 import mobile.miki.util.FTUtils;\r
 \r
 public class CameraPreview extends BaseActivity implements SurfaceHolder.Callback, OnClickListener {\r
@@ -414,7 +415,7 @@ public class CameraPreview extends BaseActivity implements SurfaceHolder.Callbac
 \r
        @Override\r
        public void onClick(View arg0) {\r
-               Intent intent = new Intent(this, WifiTestActiviy.class);\r
+               Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, WifiTestActiviy.class);\r
                intent.putExtra("running", true);\r
                intent.putExtra("pcbatest",pcbatest);\r
                Intent intent1 = new Intent(this, TestMainActivity.class);\r

diff --git a/app/src/main/java/mobile/miki/DSPActivity.java b/app/src/main/java/mobile/miki/DSPActivity.java
index 0a346f9..41d78d3 100644 (file)
--- 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;
 \r
 import mobile.miki.mainui.ButtonViewTwo;\r
 import mobile.miki.mainui.TestMainActivity;\r
+import mobile.miki.util.Config;\r
 \r
 public class DSPActivity extends BaseActivity implements View.OnClickListener {\r
 \r
@@ -189,7 +190,7 @@ public class DSPActivity extends BaseActivity implements View.OnClickListener {
 \r
     @Override\r
     public void onClick(View view) {\r
-        Intent intent = new Intent(this, HeartRate.class);\r
+        Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, HeartRate.class);\r
         intent.putExtra("running", true);\r
         Intent intent1 = new Intent(this, TestMainActivity.class);\r
         switch (view.getId()) {\r

diff --git a/app/src/main/java/mobile/miki/DialerTestActivity.java b/app/src/main/java/mobile/miki/DialerTestActivity.java
index c2ee799..69dd62e 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 \r
 public class DialerTestActivity extends BaseActivity implements android.view.View.OnClickListener{\r
     private static final String TAG = "DialerTestActivity";\r
@@ -99,12 +100,12 @@ public class DialerTestActivity extends BaseActivity implements android.view.Vie
        public void onClick(View arg0) {\r
 \r
                Intent intent;\r
-               if (pcbatest){\r
-                       intent = new Intent(this, GravitySensorActivity.class);\r
-\r
-               }else{\r
-                       intent = new Intent(this, BrightnessTest.class);\r
-               }\r
+//             if (pcbatest){\r
+//                     intent = new Intent(this, GravitySensorActivity.class);\r
+//\r
+//             }else{\r
+                       intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, BrightnessTest.class);\r
+//             }\r
 \r
                intent.putExtra("running", true);\r
                intent.putExtra("pcbatest",pcbatest);\r

diff --git a/app/src/main/java/mobile/miki/GpsTest.java b/app/src/main/java/mobile/miki/GpsTest.java
index 42c1010..6d54b33 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 \r
 public class GpsTest extends BaseActivity implements\r
         android.view.View.OnClickListener {\r
@@ -286,7 +287,7 @@ public class GpsTest extends BaseActivity implements
     public void onClick(View arg0) {\r
         Display myDisplay = getWindowManager().getDefaultDisplay();\r
         Intent intent;\r
-        intent = new Intent(this, RingtoneActivity.class);\r
+        intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, RingtoneActivity.class);\r
 \r
         intent.putExtra("running", true);\r
         intent.putExtra("pcbatest",pcbatest);\r
@@ -336,8 +337,7 @@ public class GpsTest extends BaseActivity implements
                         case 0:\r
 \r
                             Intent intent;\r
-                            intent = new Intent(GpsTest.this,\r
-                                    RingtoneActivity.class);\r
+                            intent =  Config.getNextTestIntent(GpsTest.this,GpsTest.this.getClass());//new Intent(GpsTest.this,  RingtoneActivity.class);\r
                             intent.putExtra("running", true);\r
                             intent.putExtra("pcbatest", pcbatest);\r
                             startActivity(intent);\r

diff --git a/app/src/main/java/mobile/miki/GravitySensorActivity.java b/app/src/main/java/mobile/miki/GravitySensorActivity.java
index 2a9e878..0ee06cc 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 \r
 public class GravitySensorActivity extends BaseActivity\r
                implements SensorEventListener, android.view.View.OnClickListener {\r
@@ -113,7 +114,7 @@ public class GravitySensorActivity extends BaseActivity
 \r
        @Override\r
        public void onClick(View arg0) {\r
-               Intent intent = new Intent(this, BatteryTestActivity.class);\r
+               Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, BatteryTestActivity.class);\r
                intent.putExtra("running", true);\r
                intent.putExtra("pcbatest",pcbatest);\r
                Intent intent1 = new Intent(this, TestMainActivity.class);\r
@@ -168,7 +169,7 @@ public class GravitySensorActivity extends BaseActivity
                                        buttonView.setSuccessColor();\r
                                        \r
                                        if (running) {\r
-                                               Intent intent = new Intent(GravitySensorActivity.this, BatteryTestActivity.class);\r
+                                               Intent intent = Config.getNextTestIntent(GravitySensorActivity.this,GravitySensorActivity.this.getClass());//new Intent(GravitySensorActivity.this, BatteryTestActivity.class);\r
                                                intent.putExtra("running", true);\r
                                                intent.putExtra("pcbatest", pcbatest);\r
                                                startActivity(intent);\r

diff --git a/app/src/main/java/mobile/miki/HeartRate.java b/app/src/main/java/mobile/miki/HeartRate.java
index da231ec..92f2cfd 100644 (file)
--- 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;
 \r
 import mobile.miki.mainui.ButtonViewTwo;\r
 import mobile.miki.mainui.TestMainActivity;\r
+import mobile.miki.util.Config;\r
 import mobile.miki.util.Logger;\r
 \r
 public class HeartRate extends BaseActivity implements View.OnClickListener {\r
@@ -92,7 +93,7 @@ public class HeartRate extends BaseActivity implements View.OnClickListener {
 \r
     @Override\r
     public void onClick(View view) {\r
-        Intent intent = new Intent(this, SimDetectActivity.class);\r
+        Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, SimDetectActivity.class);\r
         intent.putExtra("running", true);\r
         Intent intent1 = new Intent(this, TestMainActivity.class);\r
         // TestResult testResult = (TestResult) getApplicationContext();\r

diff --git a/app/src/main/java/mobile/miki/KeysTestActivity.java b/app/src/main/java/mobile/miki/KeysTestActivity.java
index a221074..667f6ee 100644 (file)
--- 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;\r
 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 KeysTestActivity extends BaseActivity implements\r
@@ -273,10 +274,10 @@ public class KeysTestActivity extends BaseActivity implements
     @Override\r
     public void onClick(View arg0) {\r
 \r
-        Intent intent = new Intent(this, TestMainActivity.class);\r
-        if (FTUtils.isSugar()) {\r
-            intent = new Intent(this, BlooToothActivity.class);\r
-        }\r
+        Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, TestMainActivity.class);\r
+//        if (FTUtils.isSugar()) {\r
+//            intent = new Intent(this, BlooToothActivity.class);\r
+//        }\r
         intent.putExtra("running", true);\r
         Intent intent1 = new Intent(this, TestMainActivity.class);\r
         // TestResult testResult = (TestResult) getApplicationContext();\r
@@ -310,10 +311,7 @@ public class KeysTestActivity extends BaseActivity implements
     private void pass() {\r
         buttonView.setSuccessColor();\r
         if (running) {\r
-            Intent intent = new Intent(this, TestMainActivity.class);\r
-            if (FTUtils.isSugar() || FTUtils.isS06()) {\r
-                intent = new Intent(this, BlooToothActivity.class);\r
-            }\r
+            Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, TestMainActivity.class);\r
             intent.putExtra("running", true);\r
             startActivity(intent);\r
             PreferenceManager\r

diff --git a/app/src/main/java/mobile/miki/MikeTest.java b/app/src/main/java/mobile/miki/MikeTest.java
index 553d117..a3455b0 100644 (file)
--- 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 (file)
--- 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;
 \r
 import mobile.miki.mainui.ButtonViewTwo;\r
 import mobile.miki.mainui.TestMainActivity;\r
+import mobile.miki.util.Config;\r
 import mobile.miki.util.FTUtils;\r
 \r
 public class MotorTestActivity extends BaseActivity implements android.view.View.OnClickListener{\r
@@ -168,10 +169,10 @@ public class MotorTestActivity extends BaseActivity implements android.view.View
 \r
        @Override\r
        public void onClick(View arg0) {\r
-               Intent intent = new Intent(this, UltravioletMonitorActivity.class);\r
-               if (FTUtils.isS06()) {\r
-                       intent = new Intent(this, DSPActivity.class);\r
-               }\r
+               Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, UltravioletMonitorActivity.class);\r
+//             if (FTUtils.isS06()) {\r
+//                     intent = new Intent(this, DSPActivity.class);\r
+//             }\r
                intent.putExtra("running", true);\r
                Intent intent1 = new Intent(this, TestMainActivity.class);\r
                switch (arg0.getId()) {\r

diff --git a/app/src/main/java/mobile/miki/RingtoneActivity.java b/app/src/main/java/mobile/miki/RingtoneActivity.java
index ec84d9c..d5303a9 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 import mobile.miki.util.Logger;\r
 \r
 public class RingtoneActivity extends BaseActivity implements\r
@@ -221,12 +222,12 @@ public class RingtoneActivity extends BaseActivity implements
        public void onClick(View arg0) {\r
                Intent intent;\r
                //传奇不需要mic\r
-               String model = Build.MODEL;\r
-               if(model != null && model.contains("F6")) {\r
-                       intent = new Intent(this, SimDetectActivity.class);\r
-               } else {\r
-                       intent = new Intent(this, MikeTest.class);\r
-               }\r
+//             String model = Build.MODEL;\r
+//             if(model != null && model.contains("F6")) {\r
+                       intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, SimDetectActivity.class);\r
+//             } else {\r
+//                     intent = new Intent(this, MikeTest.class);\r
+//             }\r
                \r
                intent.putExtra("running", true);\r
                intent.putExtra("pcbatest",pcbatest);\r

diff --git a/app/src/main/java/mobile/miki/SimDetectActivity.java b/app/src/main/java/mobile/miki/SimDetectActivity.java
index 5b83cb1..7294f86 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 \r
 public class SimDetectActivity extends BaseActivity implements\r
                android.view.View.OnClickListener {\r
@@ -235,12 +236,12 @@ public class SimDetectActivity extends BaseActivity implements
        public void onClick(View arg0) {\r
                Intent intent ;\r
 \r
-               if (pcbatest){\r
-                       intent = new Intent(this, GravitySensorActivity.class);\r
-\r
-               }else{\r
-                       intent = new Intent(this, DialerTestActivity.class);\r
-               }\r
+//             if (pcbatest){\r
+//                     intent = new Intent(this, GravitySensorActivity.class);\r
+//\r
+//             }else{\r
+                       intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, DialerTestActivity.class);\r
+//             }\r
 \r
                intent.putExtra("running", true);\r
                intent.putExtra("pcbatest",pcbatest);\r
@@ -291,12 +292,12 @@ public class SimDetectActivity extends BaseActivity implements
                                        Toast.LENGTH_SHORT).show();\r
                        Display myDisplay = getWindowManager().getDefaultDisplay();\r
             Intent intent;\r
-            if (pcbatest){\r
-                intent = new Intent(this, GravitySensorActivity.class);\r
-\r
-            }else{\r
-                intent = new Intent(this, DialerTestActivity.class);\r
-            }\r
+//            if (pcbatest){\r
+//                intent = new Intent(this, GravitySensorActivity.class);\r
+//\r
+//            }else{\r
+                intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, DialerTestActivity.class);\r
+//            }\r
                        intent.putExtra("running", true);\r
                        intent.putExtra("pcbatest", pcbatest);\r
                        startActivity(intent);\r

diff --git a/app/src/main/java/mobile/miki/SystemMemory.java b/app/src/main/java/mobile/miki/SystemMemory.java
index 15af500..b479e33 100644 (file)
--- 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;
 \r
 import mobile.miki.mainui.ButtonViewTwo;\r
 import mobile.miki.mainui.TestMainActivity;\r
+import mobile.miki.util.Config;\r
 import mobile.miki.util.FTUtils;\r
 \r
 public class SystemMemory extends BaseActivity implements OnClickListener{\r
@@ -114,17 +115,17 @@ public class SystemMemory extends BaseActivity implements OnClickListener{
        public void onClick(View arg0) {\r
                Intent intent = null;\r
                //正指向添加录音测试\r
-               String model = Build.MODEL;\r
-               if(model != null && (model.contains("WG1702") || model.contains("PD88-18")) || (model.contains("SCX-N18-18") || model.contains("PD88-8") || model.contains("F6"))) {\r
-                       intent = new Intent(this, RecordActivity.class);\r
-               } else if (FTUtils.isSugar() || FTUtils.isLieBao() || FTUtils.isS06()) {\r
-                       intent = new Intent(this, KeysTestActivity.class);\r
-               } else if (FTUtils.isS06()){\r
-                       // s06\r
-                       intent = new Intent(this, DSPActivity.class);\r
-               } else {\r
-                       intent = new Intent(this, TestMainActivity.class);\r
-               }\r
+//             String model = Build.MODEL;\r
+//             if(model != null && (model.contains("WG1702") || model.contains("PD88-18")) || (model.contains("SCX-N18-18") || model.contains("PD88-8") || model.contains("F6"))) {\r
+//                     intent = new Intent(this, RecordActivity.class);\r
+//             } else if (FTUtils.isSugar() || FTUtils.isLieBao() || FTUtils.isS06()) {\r
+//                     intent = new Intent(this, KeysTestActivity.class);\r
+//             } else if (FTUtils.isS06()){\r
+//                     // s06\r
+//                     intent = new Intent(this, DSPActivity.class);\r
+//             } else {\r
+                       intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, TestMainActivity.class);\r
+//             }\r
 \r
                intent.putExtra("running", true);\r
                intent.putExtra("pcbatest",pcbatest);\r
@@ -135,11 +136,9 @@ public class SystemMemory extends BaseActivity implements OnClickListener{
                case R.id.btn_two_left:\r
                        if (!running) {\r
                                startActivity(intent1);\r
-                       } else if (FTUtils.isS06()) {\r
-                               startActivity(intent);\r
-                       } else {\r
+                       } else{\r
                                // 自动化测试最后一项直接回到主界面\r
-                               startActivity(intent1);\r
+                               startActivity(intent);\r
                        }\r
                        PreferenceManager\r
                                        .getDefaultSharedPreferences(getApplicationContext())\r
@@ -151,10 +150,8 @@ public class SystemMemory extends BaseActivity implements OnClickListener{
                case R.id.btn_two_right:\r
                        if (!running) {\r
                                startActivity(intent1);\r
-                       } else if (FTUtils.isS06()) {\r
-                               startActivity(intent);\r
                        } else {\r
-                               startActivity(intent1);\r
+                               startActivity(intent);\r
                        }\r
                        PreferenceManager\r
                                        .getDefaultSharedPreferences(getApplicationContext())\r

diff --git a/app/src/main/java/mobile/miki/TouchTest.java b/app/src/main/java/mobile/miki/TouchTest.java
index 93d313c..b2f9964 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 \r
 //import sim.android.mtkcit.TestActivity;\r
 //import sim.android.mtkcit.cittools.CITTools;\r
@@ -132,7 +133,7 @@ public class TouchTest extends BaseActivity {
 //             systemuiIntent.putExtra("open", true);\r
 //             sendBroadcast(systemuiIntent);\r
 \r
-               Intent intent2 = new Intent(this, LcdActivity.class);\r
+               Intent intent2 =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, LcdActivity.class);\r
                intent2.putExtra("running", true);\r
                Intent intent1 = new Intent(this, TestMainActivity.class);\r
 \r

diff --git a/app/src/main/java/mobile/miki/UltravioletMonitorActivity.java b/app/src/main/java/mobile/miki/UltravioletMonitorActivity.java
index 1e90687..b0dd267 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 \r
 /**\r
  * 紫外线检测\r
@@ -96,7 +97,7 @@ public class UltravioletMonitorActivity extends BaseActivity
 \r
     @Override\r
     public void onClick(View arg0) {\r
-        Intent intent = new Intent(this, TestMainActivity.class);\r
+        Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, TestMainActivity.class);\r
         intent.putExtra("running", true);\r
         Intent intent1 = new Intent(this, TestMainActivity.class);\r
         // TestResult testResult = (TestResult) getApplicationContext();\r

diff --git a/app/src/main/java/mobile/miki/VersionActivity.java b/app/src/main/java/mobile/miki/VersionActivity.java
index e09fa89..a08cd8d 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 import mobile.miki.util.FTUtils;\r
 import mobile.miki.util.IATUtils;\r
 \r
@@ -190,15 +191,15 @@ public class VersionActivity extends BaseActivity implements android.view.View.O
     @Override\r
     public void onClick(View arg0) {\r
         Intent intent ;\r
-        if (pcbatest) {\r
-            intent = new Intent(this, CameraPreview.class);\r
-            intent.putExtra("running", true);\r
-            intent.putExtra("pcbatest", true);\r
-        }else{\r
-            intent = new Intent(this, TouchTest.class);\r
+//        if (pcbatest) {\r
+//            intent = new Intent(this, CameraPreview.class);\r
+//            intent.putExtra("running", true);\r
+//            intent.putExtra("pcbatest", true);\r
+//        }else{\r
+            intent = Config.getNextTestIntent(this,this.getClass());//new Intent(this, TouchTest.class);\r
             intent.putExtra("running", true);\r
             intent.putExtra("pcbatest",false);\r
-        }\r
+//        }\r
 \r
         Intent intent1 = new Intent(this, TestMainActivity.class);\r
         // TestResult testResult = (TestResult) getApplicationContext();\r

diff --git a/app/src/main/java/mobile/miki/WifiTestActiviy.java b/app/src/main/java/mobile/miki/WifiTestActiviy.java
index 636931c..90e11f8 100644 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 \r
 public class WifiTestActiviy extends BaseActivity implements android.view.View.OnClickListener {\r
        private ProgressDialog dialogBar;\r
@@ -89,6 +90,7 @@ public class WifiTestActiviy extends BaseActivity implements android.view.View.O
                this.dialogBar.setMessage(getResources().getString(R.string.wfScaning));\r
                this.dialogBar.setProgressStyle(0);\r
                wifiScan(null);\r
+\r
        }\r
 \r
 \r
@@ -173,7 +175,7 @@ public class WifiTestActiviy extends BaseActivity implements android.view.View.O
 \r
        @Override\r
        public void onClick(View arg0) {\r
-               Intent intent = new Intent(this, GpsTest.class);\r
+               Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, GpsTest.class);\r
                intent.putExtra("running", true);\r
                intent.putExtra("pcbatest",pcbatest);\r
                Intent intent1 = new Intent(this, TestMainActivity.class);\r
@@ -217,7 +219,7 @@ public class WifiTestActiviy extends BaseActivity implements android.view.View.O
                                        super.handleMessage(msg);\r
                                        switch (msg.what) {\r
                                        case 0:\r
-                                               Intent intent = new Intent(WifiTestActiviy.this, GpsTest.class);\r
+                                               Intent intent =  Config.getNextTestIntent(WifiTestActiviy.this,WifiTestActiviy.this.getClass());//new Intent(WifiTestActiviy.this, GpsTest.class);\r
                                                intent.putExtra("running", true);\r
                                                intent.putExtra("pcbatest",pcbatest);\r
                                                startActivity(intent);\r

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 (file)
--- 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;\r
 import mobile.miki.mainui.TestMainActivity;\r
 import mobile.miki.mainui.TestMainList;\r
+import mobile.miki.util.Config;\r
 \r
 public class LcdJudgActivity extends Activity implements android.view.View.OnClickListener {\r
        private ButtonViewTwo buttonView;\r
@@ -34,7 +35,7 @@ public class LcdJudgActivity extends Activity implements android.view.View.OnCli
                buttonView.setSuccessColor();\r
                buttonView.btn_left.setClickable(true);\r
                 getLcdIntent();\r
-               \r
+               Config.initConfig(this);\r
        }\r
        \r
        private void getLcdIntent() {\r
@@ -60,14 +61,14 @@ public class LcdJudgActivity extends Activity implements android.view.View.OnCli
        @Override\r
        public void onClick(View arg0) {\r
                Intent intent;\r
-               intent = new Intent(this, CameraPreview.class);\r
+               intent =  Config.getNextTestIntent(this,LcdActivity.class);//new Intent(this, CameraPreview.class);\r
                //正指向，贝尔丰需要震动测试\r
                String model = Build.MODEL;\r
-               if(model != null ) {\r
-                       if(model.contains("WG1702") || model.contains("BF A1") || model.contains("PD88-18") || model.contains("SCX-N18-18") || model.contains("PD88-8") || model.contains("F6")) {\r
-                               intent = new Intent(this, MotorTestActivity.class);\r
-                       }\r
-               }\r
+//             if(model != null ) {\r
+//                     if(model.contains("WG1702") || model.contains("BF A1") || model.contains("PD88-18") || model.contains("SCX-N18-18") || model.contains("PD88-8") || model.contains("F6")) {\r
+//                             intent = new Intent(this, MotorTestActivity.class);\r
+//                     }\r
+//             }\r
                //\r
                \r
                intent.putExtra("running", true);\r

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 (file)
--- 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<String> testResultList;
-    private List<String> getArray() {
-        List<String> list = new ArrayList<String>();
-        testResultList = new ArrayList<String>();
-        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 (file)
--- 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 (file)
index 0000000..daced4d
--- /dev/null
+++ b/app/src/main/java/mobile/miki/util/Config.java
@@ -0,0 +1,286 @@
+package mobile.miki.util;\r
+\r
+import android.app.Application;\r
+import android.content.Context;\r
+import android.content.Intent;\r
+\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
+import mobile.miki.BatteryTestActivity;\r
+import mobile.miki.BlooToothActivity;\r
+import mobile.miki.BrightnessTest;\r
+import mobile.miki.CameraPreview;\r
+import mobile.miki.DSPActivity;\r
+import mobile.miki.DialerTestActivity;\r
+import mobile.miki.GpsTest;\r
+import mobile.miki.GravitySensorActivity;\r
+import mobile.miki.HeartRate;\r
+import mobile.miki.KeysTestActivity;\r
+import mobile.miki.MikeTest;\r
+import mobile.miki.MotorTestActivity;\r
+import mobile.miki.MyApplication;\r
+import mobile.miki.R;\r
+import mobile.miki.RingtoneActivity;\r
+import mobile.miki.SimDetectActivity;\r
+import mobile.miki.SystemMemory;\r
+import mobile.miki.TouchTest;\r
+import mobile.miki.UltravioletMonitorActivity;\r
+import mobile.miki.VersionActivity;\r
+import mobile.miki.WifiTestActiviy;\r
+import mobile.miki.lcd.LcdActivity;\r
+import mobile.miki.mainui.TestMainActivity;\r
+\r
+public class Config {\r
+\r
+    private static List<String> TestItems=null;\r
+    private static List<String> TestResult=null;\r
+    public static void setTestItems(List<String> items){\r
+\r
+        if(items==null){\r
+            Logger.d("setTestItems items is null");\r
+            return ;\r
+        }\r
+        if (TestItems==null){\r
+            TestItems=new ArrayList<String>();\r
+            TestResult=new ArrayList<String>();\r
+        }\r
+        TestItems.clear();\r
+        TestResult.clear();\r
+\r
+        for (int i=0;i< items.size();i++ ) {\r
+            TestItems.add(i,items.get(i));\r
+            TestResult.add(i,"false");\r
+        }\r
+\r
+   }\r
+\r
+   public static int getIndexByTestItemName(String name){\r
+       Logger.d("name "+name+" item "+TestItems);\r
+\r
+//       if (TestItems==null) initConfig(MyApplication.getInstance().getApplicationContext());\r
+        if(name!=null && TestItems!=null) {\r
+            for (int i = 0; i < TestItems.size(); i++) {\r
+                Logger.d("name "+name+" item "+TestItems.get(i)+" "+i);\r
+                if (name.equals(TestItems.get(i))) {\r
+                    return i;\r
+                }\r
+            }\r
+        }\r
+        return -1;\r
+   }\r
+    public static String getNextTestItemName(String testItemmName){\r
+\r
+        int index=-1;\r
+        index=getIndexByTestItemName(testItemmName);\r
+        Logger.d("find "+testItemmName+", index "+index);\r
+        if (TestItems!=null && index >=0&& index+1< TestItems.size()){\r
+            String itemname= TestItems.get(index+1);\r
+            return itemname;\r
+        }else{\r
+            return null;\r
+        }\r
+    }\r
+   public static String getNextTestItemName(int index){\r
+       if (TestItems!=null && index >=0&& index+1< TestItems.size()){\r
+           return TestItems.get(index+1);\r
+       }else{\r
+           return null;\r
+       }\r
+   }\r
+\r
+   public static Intent getNextTestIntent(Context context,Class cls){\r
+        String currentTestItemName=getTestNameByClass(context,cls.getSimpleName());\r
+        Logger.d("currentTestItemName="+currentTestItemName);\r
+        String nextTestItemName=getNextTestItemName(currentTestItemName);\r
+       Logger.d("nextTestItemName="+nextTestItemName);\r
+       return getIntent(context,nextTestItemName);\r
+   }\r
+   public static String getTestNameByClass(Context context,String ClassName){\r
+\r
+        if (context==null || ClassName==null) return null;\r
+        if (ClassName.equals(VersionActivity.class.getSimpleName())) {\r
+            return context.getResources().getString(R.string.version_new);\r
+        }else if (ClassName.equals(TouchTest.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.touch);\r
+        }else if (ClassName.equals(LcdActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.light_new);\r
+        }else if (ClassName.equals(CameraPreview.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.camera);\r
+        }else if (ClassName.equals(WifiTestActiviy.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.wifi);\r
+        }else if (ClassName.equals(GpsTest.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.gps);\r
+        }else if (ClassName.equals(RingtoneActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.speak);\r
+        }else if (ClassName.equals(MikeTest.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.mic_title);\r
+        }else if (ClassName.equals(SimDetectActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.sim_title);\r
+        }else if (ClassName.equals(DialerTestActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.dual_new);\r
+        }else if (ClassName.equals(SystemMemory.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.ramromTest);\r
+        }else if (ClassName.equals(BrightnessTest.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.beiguang_new);\r
+        }else if (ClassName.equals(GravitySensorActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.test_sensor);\r
+        }else if (ClassName.equals(BatteryTestActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.test_battery);\r
+        }else if (ClassName.equals(KeysTestActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.test_keypad);\r
+        }else if (ClassName.equals(BlooToothActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.bt);\r
+        }else if (ClassName.equals(MotorTestActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.shakeTest);\r
+        }else if (ClassName.equals(UltravioletMonitorActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.ultraviolet);\r
+        }else if (ClassName.equals(DSPActivity.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.dsp);\r
+        }else if (ClassName.equals(HeartRate.class.getSimpleName())){\r
+            return context.getResources().getString(R.string.heartrate);\r
+        }else {\r
+\r
+            return null;\r
+        }\r
+\r
+   }\r
+    public static Intent getIntent(Context context, String testItemName) {\r
+\r
+        if (context==null || testItemName==null)\r
+            return (new Intent(context, TestMainActivity.class));;\r
+        Intent intent = null;\r
+        if (testItemName.equals(context.getResources().getString(R.string.version_new))) {\r
+            intent = new Intent(context, VersionActivity.class);\r
+        } else if (testItemName.equals(context.getResources().getString(R.string.touch))) {\r
+            intent = new Intent(context, TouchTest.class);\r
+        } else if (testItemName.equals(context.getResources().getString(R.string.light_new))) {\r
+            intent = new Intent(context, LcdActivity.class);\r
+        } else if (testItemName.equals(context.getResources().getString(R.string.camera))) {\r
+            intent = new Intent(context, CameraPreview.class);\r
+        } else if (testItemName.equals(context.getResources().getString(R.string.wifi))) {\r
+            intent = new Intent(context, WifiTestActiviy.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.gps))) {\r
+            intent = new Intent(context, GpsTest.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.speak))) {\r
+            intent = new Intent(context, RingtoneActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.mic_title))) {\r
+            intent = new Intent(context, MikeTest.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.sim_title))) {\r
+            intent = new Intent(context, SimDetectActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.dual_new))) {\r
+            intent = new Intent(context, DialerTestActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.ramromTest))) {\r
+            intent = new Intent(context, SystemMemory.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.beiguang_new))) {\r
+            intent = new Intent(context, BrightnessTest.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.test_sensor))) {\r
+            intent = new Intent(context, GravitySensorActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.test_battery))) {\r
+            intent = new Intent(context, BatteryTestActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.test_keypad))) {\r
+            intent = new Intent(context, KeysTestActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.bt))) {\r
+            intent = new Intent(context, BlooToothActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.shakeTest))) {\r
+            intent = new Intent(context, MotorTestActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.ultraviolet))) {\r
+            intent = new Intent(context, UltravioletMonitorActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.dsp))) {\r
+            intent = new Intent(context, DSPActivity.class);\r
+        }else if (testItemName.equals(context.getResources().getString(R.string.heartrate))) {\r
+            intent = new Intent(context, HeartRate.class);\r
+        }\r
+\r
+        if (intent != null) {\r
+            intent.putExtra("running", false);\r
+        }else{\r
+            intent = new Intent(context, TestMainActivity.class);\r
+        }\r
+        return intent;\r
+    }\r
+   public static String getItemAt(int i){\r
+       if (TestItems!=null && i >=0&& i< TestItems.size()){\r
+           return TestItems.get(i);\r
+       }else{\r
+           return null;\r
+       }\r
+   }\r
+    public static String getItemResultAt(int i){\r
+        if (TestResult!=null && i >=0&& i< TestResult.size()){\r
+            return TestResult.get(i);\r
+        }else{\r
+            return null;\r
+        }\r
+    }\r
+\r
+    public static boolean setTestResult(int i, boolean pass){\r
+        if (TestResult!=null && i >=0&& i< TestResult.size()){\r
+             TestResult.set(i,String.valueOf(pass));\r
+             return true;\r
+        }\r
+        return false;\r
+    }\r
+\r
+    public static void initConfig(Context context){\r
+        setTestItems(getArray(context));\r
+\r
+    }\r
+\r
+    public static String[] getList(Context context) {\r
+        String[] listTem = {context.getString(R.string.version_new), context.getString(R.string.touch), context.getString(R.string.light_new), context.getString(R.string.camera),\r
+                context.getString(R.string.wifi), context.getString(R.string.gps), context.getString(R.string.speak), context.getString(R.string.mic_title),\r
+                context.getString(R.string.sim_title), context.getString(R.string.dual_new), context.getString(R.string.ramromTest), context.getString(R.string.beiguang_new),\r
+                context.getString(R.string.test_sensor), context.getString(R.string.test_battery)};\r
+        return listTem;\r
+    }\r
+    public static String[] stateArr;\r
+    public static List<String> testResultList;\r
+    public static List<String> getArray(Context context) {\r
+        List<String> list = new ArrayList<String>();\r
+        testResultList = new ArrayList<String>();\r
+        for (int i = 0; i < getList(context).length; i++) {\r
+            list.add(getList(context)[i]);\r
+            testResultList.add(sharedPreferencesArr[i]);\r
+        }\r
+        if (FTUtils.isLieBao()) {\r
+            list.add(context.getString(R.string.test_keypad));\r
+            testResultList.add("keys");\r
+        } else if (FTUtils.isSugar()) {\r
+            list.add(context.getString(R.string.test_keypad));\r
+            list.add(context.getString(R.string.bt));\r
+            list.add(context.getString(R.string.shakeTest));\r
+            list.add(context.getString(R.string.ultraviolet));\r
+\r
+            testResultList.add("keys");\r
+            testResultList.add("bt");\r
+            testResultList.add("vibrator");\r
+            testResultList.add("Ultraviolet");\r
+        } else if (FTUtils.isS06()) {\r
+            // s06 添加dsp测试\r
+            list.add(context.getString(R.string.hall));\r
+            list.add(context.getString(R.string.bt));\r
+            list.add(context.getString(R.string.dsp));\r
+            list.add(context.getString(R.string.heartrate));\r
+\r
+            testResultList.add("keys");\r
+            testResultList.add("bt");\r
+            testResultList.add("dsp");\r
+            testResultList.add("heartrate");\r
+        } else if (FTUtils.isQ3F()){\r
+\r
+            list.add(context.getString(R.string.test_keypad));\r
+            list.add(context.getString(R.string.shakeTest));\r
+            list.add(context.getString(R.string.heartrate));\r
+            testResultList.add("keys");\r
+            testResultList.add("vibrator");\r
+            testResultList.add("heartrate");\r
+        }\r
+        stateArr = new String[testResultList.size()];\r
+        return list;\r
+    }\r
+\r
+\r
+    static String[] sharedPreferencesArr = {"version", "touch", "lcd", "camera", "wifi", "gps", "speak", "mic", "sim", "dialer",\r
+            "watchmemory", "light", "Gsensor", "watchbattery"/*, "keys", "bt", "vibrator", "Ultraviolet", "dsp"*/};\r
+}\r

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 (file)
--- 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++) {\r
                 resCid[i] = buf[i + 28];\r
             }\r
-            for (int i = 0; i < 16; i++) {\r
-                if ((resCid[i] >= 0x30 && resCid[i] <= 0x39) || (resCid[i] >= 0x61 && resCid[i] <= 0x7A) || (resCid[i] >= 0x41 && resCid[i] <= 0x5A)) {\r
-                    // valid\r
-                } else {\r
-                    // invalid\r
-                    for (int j = 28; j < 28 + 16; j++) {\r
-                        resCid[j] = 0x30;\r
-                    }\r
-                    break;\r
-                }\r
-            }\r
+//            for (int i = 0; i < 16; i++) {\r
+//                if ((resCid[i] >= 0x30 && resCid[i] <= 0x39) || (resCid[i] >= 0x61 && resCid[i] <= 0x7A) || (resCid[i] >= 0x41 && resCid[i] <= 0x5A)) {\r
+//                    // valid\r
+//                } else {\r
+//                    // invalid\r
+//                    for (int j = 28; j < 28 + 16; j++) {\r
+//                        resCid[j] = 0x30;\r
+//                    }\r
+//                    break;\r
+//                }\r
+//            }\r
         } catch (Exception e) {\r
             e.printStackTrace();\r
         }\r