From: snickersun <scy@incartech.cn>
Date: Wed, 20 Nov 2019 12:49:39 +0000 (+0800)
Subject: 1、增加关机选项
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=48da0f279e5f45251bda5a8c0b8ab021168693e5;p=factoryMode.git

1、增加关机选项
2、pcba测试去除打电话测试项
3、GPS测试按照PCBA测试，整机测试，手动测试分为三个通过标准，并显示在测试界面最上端。
分别是：1颗星SNR大于30，3颗星SNR大于30，必须定位。
4、优化GPS最大三颗星的计算方法
5、版本号改为3，  20191120-2030
---

diff --git a/app/build.gradle b/app/build.gradle
index d371f2e..11a4213 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         applicationId "mobile.miki"
         minSdkVersion 18
         targetSdkVersion 20
-        versionCode 1
-        versionName "20191116-0900"
+        versionCode 2
+        versionName "20191120-2030"
     }
     buildTypes {
         release {
diff --git a/app/release/FactoryMode.apk b/app/release/FactoryMode.apk
index bb0f9d0..12e01de 100644
Binary files a/app/release/FactoryMode.apk and b/app/release/FactoryMode.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index afaee1e..e38fc25 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"20191116-0900","enabled":true,"outputFile":"FactoryMode.apk","fullName":"release","baseName":"release"},"path":"FactoryMode.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"20191120-2030","enabled":true,"outputFile":"FactoryMode.apk","fullName":"release","baseName":"release"},"path":"FactoryMode.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/mobile/miki/GpsTest.java b/app/src/main/java/mobile/miki/GpsTest.java
index db60476..0d3a260 100644
--- a/app/src/main/java/mobile/miki/GpsTest.java
+++ b/app/src/main/java/mobile/miki/GpsTest.java
@@ -87,7 +87,16 @@ public class GpsTest extends BaseActivity implements
         readGpsThread = new ReadGpsThread();
         readGpsThread.start();
         locationManager.addGpsStatusListener(statusListener);//搜星
-        getLocationInfo();
+        if(running){
+            if(pcbatest){
+                tvGps.setText(getString(R.string.pcbatest_gps_pass_rules));
+            }else{
+                tvGps.setText(getString(R.string.ageing_gps_pass_rules));
+            }
+        }else{
+            tvGps.setText(getString(R.string.gps_pass_rules));
+        }
+        getLocationInfo(); //设定GPS优先
 
     }
 
@@ -391,26 +400,77 @@ public class GpsTest extends BaseActivity implements
     private GpsStatus.Listener statusListener = new GpsStatus.Listener() {
         public void onGpsStatusChanged(int event) { // GPS状态变化时的回调，如卫星数
             GpsStatus status = locationManager.getGpsStatus(null); //取当前状态
-            int satelliteInfo = updateGpsStatus(event, status);
-            numberOfSatellites = satelliteInfo;
-            if (numberOfSatellites >= 3) {
-                tvResult.setText(getResources().getString(
-                        R.string.location_sucess));
-                if (readGpsThread != null) {
-                    readGpsThread.endThread();
-                }
-                if (flag) {
-                    flag = false;
-                   pass();
-                }
+            updateGpsStatus(event, status); //只更新状态
+            numberOfSatellites = numSatelliteList.size();
+
+            switch (event){
+                case  GpsStatus.GPS_EVENT_SATELLITE_STATUS:
+
+                    if (running && !pcbatest){
+                        //如果是自动测试，则有3颗大于20的就算通过
+                        if (max3Satellite.size() >= 3  && max3Satellite.get(2).getSnr()>=30) {
+                            tvResult.setText(getResources().getString(
+                                    R.string.location_sucess));
+                            if (readGpsThread != null) {
+                                readGpsThread.endThread();
+                            }
+                            if (flag) {
+                                flag = false;
+                                pass();
+                            }
+                        }
+                    }
+                    if (running && pcbatest){
+                        //如果是pcba测试，则只要有一颗大于30的星就算通过。
+                        if (max3Satellite.size() > 0  && max3Satellite.get(0).getSnr()>=30) {
+                            tvResult.setText(getResources().getString(
+                                    R.string.location_sucess));
+                            if (readGpsThread != null) {
+                                readGpsThread.endThread();
+                            }
+                            if (flag) {
+                                flag = false;
+                                pass();
+                            }
+                        }
+                    }
+
+                    break;
+                case  GpsStatus.GPS_EVENT_FIRST_FIX:
+                    //普通测试，必须定位才算通过
+                    tvResult.setText(getResources().getString(
+                            R.string.location_sucess));
+                    if (readGpsThread != null) {
+                        readGpsThread.endThread();
+                    }
+                    if (flag) {
+                        flag = false;
+                        pass();
+                    }
+                    break;
+                case  GpsStatus.GPS_EVENT_STARTED:
+                   // tvGps.setText("GPS_EVENT_STARTED");
+                    break;
+                case  GpsStatus.GPS_EVENT_STOPPED:
+                  //  tvGps.setText("GPS_EVENT_STOPPED");
+                    break;
+                default:
+                    break;
             }
 
+
+
+
         }
     };
 
     private void get3MaxSnrSatellite(GpsSatellite gst){
 
         float snr = gst.getSnr();
+        for (int k=0;k<max3Satellite.size();k++) {
+           if( max3Satellite.get(k).getPrn()==gst.getPrn())
+               max3Satellite.remove(k);
+        }
         max3Satellite.add(gst);//先添加进来。
 
         //从大到小排序
@@ -441,16 +501,17 @@ public class GpsTest extends BaseActivity implements
             while (it.hasNext() && count <= maxSatellites) {
                 GpsSatellite s = it.next();
                 float snr = s.getSnr();
-                if (snr >= 20) {//只有信躁比不为0的时候才算搜到了星
+                if (snr > 0) {//只有信躁比不为0的时候才算搜到了星
                     strengh = snr;
 //	                	Toast.makeText(this, "信躁比大于20", Toast.LENGTH_LONG).show();
                     //排序取得最大3个SNR
                     get3MaxSnrSatellite(s);
+                    numSatelliteList.add(s);
                 }
-                numSatelliteList.add(s);
+
                 count++;
             }
-            sb2.append("搜索到卫星个数(SNR>20)：" + numSatelliteList.size()+" \n Max 3 SNRs[ " );
+            sb2.append("搜索到卫星个数(SNR>0)：" + numSatelliteList.size()+" \n Max 3 SNRs[ " );
             for (int i=0;i<max3Satellite.size();i++){
                 sb2.append(max3Satellite.get(i).getSnr());
                 sb2.append(", ");
@@ -462,9 +523,6 @@ public class GpsTest extends BaseActivity implements
         Log.e("dxc", sb2.toString());
         //tv_satellites.setText(null);
         tv_satellites.setText(sb2);
-        if (strengh >= 20 && numSatelliteList.size() >= 3) {
-            return numSatelliteList.size();
-        }
 
         return 0;
     }
diff --git a/app/src/main/java/mobile/miki/SimDetectActivity.java b/app/src/main/java/mobile/miki/SimDetectActivity.java
index 3136892..d60e5e7 100644
--- a/app/src/main/java/mobile/miki/SimDetectActivity.java
+++ b/app/src/main/java/mobile/miki/SimDetectActivity.java
@@ -211,7 +211,15 @@ public class SimDetectActivity extends BaseActivity implements
 
 	@Override
 	public void onClick(View arg0) {
-		Intent intent = new Intent(this, DialerTestActivity.class);
+		Intent intent ;
+
+		if (pcbatest){
+			intent = new Intent(this, GravitySensorActivity.class);
+
+		}else{
+			intent = new Intent(this, DialerTestActivity.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/mainui/TestMainList.java b/app/src/main/java/mobile/miki/mainui/TestMainList.java
index e463f07..1449638 100644
--- a/app/src/main/java/mobile/miki/mainui/TestMainList.java
+++ b/app/src/main/java/mobile/miki/mainui/TestMainList.java
@@ -39,6 +39,7 @@ public class TestMainList extends BaseActivity implements OnClickListener {
 	private LinearLayout mapcopytools;
 	private TextView Factory_test_title;
 	private LinearLayout download_mode;
+	private LinearLayout shutdown_system;
 	private LinearLayout dial;
 	private LinearLayout flagPosition;
 
@@ -56,6 +57,7 @@ public class TestMainList extends BaseActivity implements OnClickListener {
 		mapcopytools = (LinearLayout) findViewById(R.id.map_copy_tools);
 		Factory_test_title = (TextView) findViewById(R.id.Factory_test_title);
 		download_mode = (LinearLayout) findViewById(R.id.download_mode);
+		shutdown_system = (LinearLayout)findViewById(R.id.shutdown_system);
 		dial = (LinearLayout)findViewById(R.id.dail);
 		download_mode.setVisibility(View.GONE);
 		flagPosition = (LinearLayout)findViewById(R.id.flagposiontion);
@@ -72,6 +74,7 @@ public class TestMainList extends BaseActivity implements OnClickListener {
 		download_mode.setOnClickListener(this);
 		dial.setOnClickListener(this);
 		flagPosition.setOnClickListener(this);
+		shutdown_system.setOnClickListener(this);
 
 //		Log.d(TAG, "onCreate");
 		Settings.System.putInt(getContentResolver(), "mobile.miki.FactoryModeRunning", 1);
@@ -134,6 +137,11 @@ public class TestMainList extends BaseActivity implements OnClickListener {
 
 			break;
 
+		case R.id.shutdown_system:
+			Intent ii = new Intent();
+			ii.setAction("com.eqc.shutdown_sos_noneed");
+			startActivity(ii);
+			break;
 		case R.id.Factory_test_title:
 			long secondTime = System.currentTimeMillis();
 			// 判断每次点击的事件间隔是否符合连击的有效范围
diff --git a/app/src/main/res/layout/dig_layout_testlist.xml b/app/src/main/res/layout/dig_layout_testlist.xml
index f382f42..c54b7d9 100644
--- a/app/src/main/res/layout/dig_layout_testlist.xml
+++ b/app/src/main/res/layout/dig_layout_testlist.xml
@@ -223,6 +223,39 @@
             android:layout_height="1dp"
             android:background="#c0c0c0" />
 
+        <LinearLayout
+            android:id="@+id/shutdown_system"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/listpress"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/title_text_large_style"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="@string/poweroff"
+                android:textSize="22sp" />
+
+            <TextView
+                style="@style/content_text_medium_style"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="2dp"
+                android:gravity="center_vertical"
+                android:text="@string/Engineer_mode_title"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <View
+            android:id="@+id/view2"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#c0c0c0" />
+
         <LinearLayout
             android:id="@+id/dail"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4d755ef..9ce1e5d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -379,7 +379,9 @@
     <string name="brightness_test">屏幕亮度(请拖动滚动条):</string>
     <string name="acc_test">acc点火测试</string>
     <string name="brightLight">按键灯测试</string>
-
+    <string name="pcbatest_gps_pass_rules">通过标准：有1颗星 SNR > 30 </string>
+    <string name="ageing_gps_pass_rules">通过标准：有3颗星 SNR > 30</string>
+    <string name="gps_pass_rules">通过标准：GPS必须定位</string>
     <string name="ring_test">正在播放音乐，请注意收听...</string>
     <string name="fm_isRing">提示：将收音机的频率调至101.0MHZ，测试收音机是否收到音乐,收到则成功，反之则失败。</string>
     <string name="sim_hasRead">已识别</string>
@@ -718,6 +720,7 @@
     <string name="china_dianxin">  "中国电信" </string>
     <string name="sim_fail1">  "SIM卡过期" </string>
     <string name="benji">  " 工厂测试" </string>
+    <string name="poweroff">关机</string>
     <string name="gongcheng">  "工厂测试" </string>
     <string name="moshi">  "工程模式" </string>
     <string name="shintool">  "地图拷贝工具" </string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08c17af..336922c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -389,6 +389,7 @@
     <string name="start_test_new">Start Testing</string>
     <string name="benji">Factory test</string>
     <string name="resunme">Reset</string>
+    <string name="poweroff">PowerOff</string>
     <string name="tip2">Logo: pass (green), not pass (red), not measured (white)</string>
     <string name="clear_new">Clear the test data</string>
     <string name="version_new">Version and calibration</string>
@@ -413,6 +414,9 @@
     <string name="fail">FAIL</string>
     <string name="success">SUCCESS</string>
     <string name="network">network</string>
+    <string name="pcbatest_gps_pass_rules">Pass Rule: one satellite SNR > 30 </string>
+    <string name="ageing_gps_pass_rules">Pass Rule: 3 satellites SNR > 30</string>
+    <string name="gps_pass_rules">Pass Rule: GPS Must Fixed</string>
     <string name="location_sucess">Location success </string>
     <string name="location_fail">Location fail</string>
     <string name="gps_searching">Getting Gps information...</string>