From: snickersun <scy@incartech.cn>
Date: Thu, 17 Sep 2020 10:17:23 +0000 (+0800)
Subject: release V50
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=3cdea2f47bab1624e1942b18add89a1538a1ab89;p=factoryMode.git

release V50
添加可以呼叫出协议状态窗口的隐藏按钮。
---

diff --git a/app/release/FactoryMode_V49_202009142141_release.apk b/app/release/FactoryMode_V50_202009171815_release.apk
similarity index 80%
rename from app/release/FactoryMode_V49_202009142141_release.apk
rename to app/release/FactoryMode_V50_202009171815_release.apk
index 7074816..658ac0a 100644
Binary files a/app/release/FactoryMode_V49_202009142141_release.apk and b/app/release/FactoryMode_V50_202009171815_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index e4ddfaa..8a8b49c 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":49,"versionName":"202009142141","enabled":true,"outputFile":"FactoryMode_V49_202009142141_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V49_202009142141_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":50,"versionName":"202009171815","enabled":true,"outputFile":"FactoryMode_V50_202009171815_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V50_202009171815_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/mobile/miki/mainui/ModeSelectActivity.java b/app/src/main/java/mobile/miki/mainui/ModeSelectActivity.java
index 6dd2692..c09ff62 100644
--- a/app/src/main/java/mobile/miki/mainui/ModeSelectActivity.java
+++ b/app/src/main/java/mobile/miki/mainui/ModeSelectActivity.java
@@ -16,6 +16,8 @@ import mobile.miki.R;
 public class ModeSelectActivity extends Activity implements OnClickListener {
 	Button engineer_button, more_button,unbound_button;
 	String ACTION_UNBOUND_TERMINAL = "com.enqualcomm.support.ACTION_UNBOUND_TERMINAL";
+	String ACTION_SMS_CMD = "com.enqualcomm.support.SMSCMD";
+	String KEY_CMD = "smsCmd";
 	String SERVICE_PKG_NAME = "com.enqualcomm.support";
 	String SERVICE_CLS_NAME = "com.enqualcomm.support.CoreService";
 	@Override
@@ -25,7 +27,7 @@ public class ModeSelectActivity extends Activity implements OnClickListener {
 		engineer_button = (Button) findViewById(R.id.engineer_button);
 		more_button = (Button) findViewById(R.id.more_button);
 		unbound_button=(Button)findViewById(R.id.unbound_button);
-		unbound_button.setVisibility(View.GONE);
+//		unbound_button.setVisibility(View.GONE);
 		engineer_button.setOnClickListener(this);
 		more_button.setOnClickListener(this);
 		unbound_button.setOnClickListener(this);
@@ -69,19 +71,22 @@ public class ModeSelectActivity extends Activity implements OnClickListener {
 	{
 		try {
 	        ComponentName componentName = new ComponentName(SERVICE_PKG_NAME, SERVICE_CLS_NAME);
-	        Intent intent = new Intent(ACTION_UNBOUND_TERMINAL).setComponent(componentName);
-			intent.putExtra("Unbound", true);
-	        startService(intent);
-	        Intent intent1 = new Intent(ACTION_UNBOUND_TERMINAL);
-			intent.putExtra("Unbound", true);
+	        Intent intent = new Intent().setComponent(componentName);
+	        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			startService(intent);
+	        Thread.sleep(1000);
+	        Intent intent1 = new Intent(ACTION_SMS_CMD);
+			intent1.putExtra(KEY_CMD, "#showui#");
 			sendBroadcast(intent1);
 		} catch (Exception e) {
 			// TODO: handle exception
+
+			e.printStackTrace();
 		}
 	}
 	private void unBound() {
 		AlertDialog.Builder build = new AlertDialog.Builder(ModeSelectActivity.this);
-		build.setTitle(getResources().getString(R.string.unbound));
+		build.setTitle(getResources().getString(R.string.showProtocolInfo));
 		build.setPositiveButton(getResources().getString(R.string.submit), new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/res/layout/mode_select_activity.xml b/app/src/main/res/layout/mode_select_activity.xml
index c9efdff..ac8cd23 100644
--- a/app/src/main/res/layout/mode_select_activity.xml
+++ b/app/src/main/res/layout/mode_select_activity.xml
@@ -27,7 +27,7 @@
         android:id="@+id/unbound_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/unbound"
+        android:text="@string/showProtocolInfo"
         android:layout_centerHorizontal="true"
         android:textSize="26sp" 
         android:layout_marginTop="30dp"/>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9aea62a..1ec16b3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -912,5 +912,6 @@
     <string name="seconds">秒</string>
     <string name="meter">ç±³</string>
     <!-- add end -->
+    <string name="showProtocolInfo">显示协议状态</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a6fb074..6a0be1f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -415,6 +415,7 @@
     <string name="engineerMode">Engineering model</string>
     <string name="more">More settings</string>
     <string name="unbound">Unbound</string>
+    <string name="showProtocolInfo">ShowProtocolInfo</string>
     <string name="touchtest_toast">Please touch screen test</string>
     <string name="testing_lcd">Testing LCD</string>
     <string name="fail">FAIL</string>
diff --git a/app/version_code.properties b/app/version_code.properties
index 31880c5..f9f0cec 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Sep 14 21:41:30 CST 2020
-VERSION_CODE=49
+#Thu Sep 17 18:15:02 CST 2020
+VERSION_CODE=50