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 (file)
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 (file)
--- 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 (file)
--- 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 {\r
        Button engineer_button, more_button,unbound_button;\r
        String ACTION_UNBOUND_TERMINAL = "com.enqualcomm.support.ACTION_UNBOUND_TERMINAL";\r
+       String ACTION_SMS_CMD = "com.enqualcomm.support.SMSCMD";\r
+       String KEY_CMD = "smsCmd";\r
        String SERVICE_PKG_NAME = "com.enqualcomm.support";\r
        String SERVICE_CLS_NAME = "com.enqualcomm.support.CoreService";\r
        @Override\r
@@ -25,7 +27,7 @@ public class ModeSelectActivity extends Activity implements OnClickListener {
                engineer_button = (Button) findViewById(R.id.engineer_button);\r
                more_button = (Button) findViewById(R.id.more_button);\r
                unbound_button=(Button)findViewById(R.id.unbound_button);\r
-               unbound_button.setVisibility(View.GONE);\r
+//             unbound_button.setVisibility(View.GONE);\r
                engineer_button.setOnClickListener(this);\r
                more_button.setOnClickListener(this);\r
                unbound_button.setOnClickListener(this);\r
@@ -69,19 +71,22 @@ public class ModeSelectActivity extends Activity implements OnClickListener {
        {\r
                try {\r
                ComponentName componentName = new ComponentName(SERVICE_PKG_NAME, SERVICE_CLS_NAME);\r
-               Intent intent = new Intent(ACTION_UNBOUND_TERMINAL).setComponent(componentName);\r
-                       intent.putExtra("Unbound", true);\r
-               startService(intent);\r
-               Intent intent1 = new Intent(ACTION_UNBOUND_TERMINAL);\r
-                       intent.putExtra("Unbound", true);\r
+               Intent intent = new Intent().setComponent(componentName);\r
+               intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);\r
+                       startService(intent);\r
+               Thread.sleep(1000);\r
+               Intent intent1 = new Intent(ACTION_SMS_CMD);\r
+                       intent1.putExtra(KEY_CMD, "#showui#");\r
                        sendBroadcast(intent1);\r
                } catch (Exception e) {\r
                        // TODO: handle exception\r
+\r
+                       e.printStackTrace();\r
                }\r
        }\r
        private void unBound() {\r
                AlertDialog.Builder build = new AlertDialog.Builder(ModeSelectActivity.this);\r
-               build.setTitle(getResources().getString(R.string.unbound));\r
+               build.setTitle(getResources().getString(R.string.showProtocolInfo));\r
                build.setPositiveButton(getResources().getString(R.string.submit), new DialogInterface.OnClickListener() {\r
                        @Override\r
                        public void onClick(DialogInterface dialog, int which) {\r

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 (file)
--- 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"\r
         android:layout_width="wrap_content"\r
         android:layout_height="wrap_content"\r
-        android:text="@string/unbound"\r
+        android:text="@string/showProtocolInfo"\r
         android:layout_centerHorizontal="true"\r
         android:textSize="26sp" \r
         android:layout_marginTop="30dp"/>\r

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 (file)
--- 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>\r
     <string name="meter">米</string>\r
     <!-- add end -->\r
+    <string name="showProtocolInfo">显示协议状态</string>\r
 \r
 </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 (file)
--- 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>\r
     <string name="more">More settings</string>\r
     <string name="unbound">Unbound</string>\r
+    <string name="showProtocolInfo">ShowProtocolInfo</string>\r
     <string name="touchtest_toast">Please touch screen test</string>\r
     <string name="testing_lcd">Testing LCD</string>\r
     <string name="fail">FAIL</string>\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 31880c5..f9f0cec 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Sep 14 21:41:30 CST 2020\r
-VERSION_CODE=49\r
+#Thu Sep 17 18:15:02 CST 2020\r
+VERSION_CODE=50\r