fixed dialog show close by sos but player not stop issues.
authorTrillGates <williamtrillgates@gmail.com>
Wed, 11 Aug 2021 03:02:14 +0000 (11:02 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Wed, 11 Aug 2021 03:02:14 +0000 (11:02 +0800)
12 files changed:
app/release/ICSer_V910_2108101433_release.apk [moved from app/release/ICSer_V907_2108052021_release.apk with 75% similarity]
app/release/output.json
app/src/main/AndroidManifest.xml
app/src/main/java/com/enqualcomm/support/CoreService.java
app/src/main/java/com/enqualcomm/support/service/Deliver.java
app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
app/src/main/java/com/ic/protocols/protocol_fzd.java
app/src/main/res/values-de-rCH/strings.xml
app/src/main/res/values-ja/strings.xml
app/src/main/res/values-w820dp/strings.xml [deleted file]
app/src/main/res/values/strings.xml
app/version_code.properties

similarity index 75%
rename from app/release/ICSer_V907_2108052021_release.apk
rename to app/release/ICSer_V910_2108101433_release.apk
index 42b609f..eb8c9d2 100644 (file)
Binary files a/app/release/ICSer_V907_2108052021_release.apk and b/app/release/ICSer_V910_2108101433_release.apk differ
index 7c006ab..f13c477 100644 (file)
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":907,"versionName":"2108052021","enabled":true,"outputFile":"ICSer_V907_2108052021_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V907_2108052021_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":910,"versionName":"2108101433","enabled":true,"outputFile":"ICSer_V910_2108101433_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V910_2108101433_release.apk","properties":{}}]
\ No newline at end of file
index 18afbfc..86da3a1 100644 (file)
             android:name=".provider.ICNotificationProvider"
             android:authorities="com.ic.notification"
             android:exported="true" />
-        
+
         <provider
             android:name=".provider.ShootTextProvider"
             android:authorities="com.ic.shoot"
index 029b833..c63f00c 100644 (file)
@@ -433,7 +433,7 @@ public class CoreService extends Service {
 
         @Override
         public void onConnectionClose(String errorName) {
-            CoreService coreService = (CoreService) this.mReference.get();
+            CoreService coreService = this.mReference.get();
             if (coreService == null)
                 return;
             ICLogger.i("onConnectionClose++ retry to connect again!  Close Error " + errorName);
@@ -442,7 +442,7 @@ public class CoreService extends Service {
 
         @Override
         public void onConnectionOpen() {
-            CoreService coreService = (CoreService) this.mReference.get();
+            CoreService coreService = this.mReference.get();
             if (coreService == null)
                 return;
             coreService.connectionServiceChain.processConnectionOpen(coreService.connection, coreService.runtime);
@@ -1832,7 +1832,7 @@ public class CoreService extends Service {
         unregisterReceiver(this.AtCallbackBroadcastReceiver);
         unregisterReceiver(this.broadcastSOSReceiver);
         unregisterReceiver(this.broadcastPracticeCMDReceiver);
-        if(smsManager != null){
+        if (smsManager != null) {
             unregisterReceiver(smsManager);
         }
         batteryUtil.unregisterBroadReceiver();
index b26fbff..81568e5 100644 (file)
@@ -604,24 +604,21 @@ public class Deliver extends AbstractConnectionService {
                 ICLogger.d(Constants.ACTION_MESSAGE_RECEIVED + " " + paramStringMessage.isFromCache());
                 //显示提示窗口
                 intent.setAction(DIALOG_ACTION);
-                intent.putExtra("findDev", "Find Device");
+                String string = context.getString(R.string.findDev);
+                intent.putExtra("findDev", string);
                 context.sendBroadcast(intent);
             }, 500);
 
             return true;
         } else if ("takephoto".equals(paramStringMessage.cmd())) {
-
-            mSendMSGHandler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    final Context context = (Deliver.this.mRuntime.getContextProxy()).context;
-                    Intent intent = new Intent();
-                    ICLogger.d(Constants.ACTION_MESSAGE_RECEIVED + " " + paramStringMessage.isFromCache());
-                    //显示提示窗口
-                    intent.setAction(DIALOG_ACTION);
-                    intent.putExtra("takephoto", "Take Photo !");
-                    context.sendBroadcast(intent);
-                }
+            mSendMSGHandler.postDelayed(() -> {
+                final Context context = (Deliver.this.mRuntime.getContextProxy()).context;
+                Intent intent = new Intent();
+                ICLogger.d(Constants.ACTION_MESSAGE_RECEIVED + " " + paramStringMessage.isFromCache());
+                //显示提示窗口
+                intent.setAction(DIALOG_ACTION);
+                intent.putExtra("takephoto", "Take Photo !");
+                context.sendBroadcast(intent);
             }, 500);
 
             return true;
index d3f37ef..91ea611 100644 (file)
@@ -104,12 +104,7 @@ public class ProcessReceiver extends BroadcastReceiver {
         CustomDialog.Builder tmpDialog;
         if (app_id == 1) {
             tmpDialog = this.mDialog.setTitle(context.getString(R.string.setting_title)).setApp(1);
-            StringBuilder contentBuilder = new StringBuilder();
-            contentBuilder.append(context.getString(R.string.voiceMessage));
-            contentBuilder.append("  ");
-            contentBuilder.append(fromWhere);
-            contentBuilder.append(context.getString(R.string.voiceMessageEnd));
-            mCustomDialog = tmpDialog.setMessage(contentBuilder.toString()).setPositiveButton(context.getString(R.string.ok), new DialogInterface.OnClickListener() {
+            mCustomDialog = tmpDialog.setMessage(fromWhere).setPositiveButton(context.getString(R.string.ok), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface var1x, int var2x) {
                     var1x.dismiss();
                     ComponentName var3 = new ComponentName("com.ic.wetalk",
@@ -214,10 +209,12 @@ public class ProcessReceiver extends BroadcastReceiver {
             mCustomDialog = tmpDialog.setMessage(var7.toString()).setPositiveButton(context.getString(R.string.ok), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface var1, int var2) {
                     var1.dismiss();
-                    VibrateUtil.getInstance(context).vibrateOn(false);
-                    stopmediaplayer();
                 }
             }).create();
+            mCustomDialog.setOnDismissListener(dialog -> {
+                VibrateUtil.getInstance(context).vibrateOn(false);
+                stopmediaplayer();
+            });
             mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);
             mCustomDialog.show();
         } else if (app_id == 6) {
@@ -229,7 +226,6 @@ public class ProcessReceiver extends BroadcastReceiver {
                     var1.dismiss();
                     VibrateUtil.getInstance(context).vibrateOn(false);
                     stopmediaplayer();
-
                     if (msg.contains("Take Photo")) {
                         String packagename = "com.eqc.camera";
                         String activityName = "com.eqc.camera.TakePictureActivity";
@@ -475,7 +471,6 @@ public class ProcessReceiver extends BroadcastReceiver {
                     this.initMyDialog(paramContext, null, 5, finddevtxt, false);
                     this.playFindDevVoice(paramContext);
                     VibrateUtil.getInstance(paramContext).vibrateOn(true);
-
                     this.screenOn(paramContext);
                 }
             } else if (paramIntent.hasExtra("takephoto")) {
index a144dee..7bc74d3 100644 (file)
@@ -93,7 +93,7 @@ public class protocol_fzd {
     private static final String CMD_HEADER_SPLIT = "*";
     private static final String CMD_SPLIT = ",";
     private static final boolean doEncryption = Util.getSystemProperties("persist.sys.encrypt_fzd", "true").equals("true");
-    public static final String defaultServerIP = "fzd.xcloudtech.com";
+    public static final String defaultServerIP = "api.xcloudtech.com";
     public static final int defaultServerPort = 9000;
     private final SharedPreferences sharedPreferences;
     private final Handler mHandler;
@@ -2866,7 +2866,7 @@ public class protocol_fzd {
             ICLogger.d("members result == > " + str);
             //对数据进行切割
             String[] split = str.split(CMD_SPLIT);
-            if (split != null && split.length % 3 != 0) {
+            if (split.length % 3 != 0) {
                 str = str + "0";
                 ICLogger.d("str result == > " + str);
                 split = str.split(CMD_SPLIT);
index 80d7cbc..c6629cf 100644 (file)
     <string name="send_success_tips_text">发送成功</string>\r
     <string name="back_text">返回</string>\r
     <string name="send_text">发送</string>\r
-    <string name="receiver_we_talk_msg">收到微聊消息.</string>\r
+    <string name="receiver_we_talk_msg">We talk msg.</string>\r
 </resources>\r
index d712bea..3723f86 100644 (file)
     <string name="low_power_warning_text">低電力アラート</string>
     <string name="sos_warning_msg_text">緊急SOS</string>
     <string name="sos_sms_content_text">%sからSOSが発信されました。%s</string>
-    <string name="read_text">已阅读</string>
+    <string name="read_text">既読</string>
     <string name="reply_text">回复</string>
-    <string name="send_msg_error_tips_text">发送失败请重试</string>
-    <string name="send_success_tips_text">发送成功</string>
-    <string name="back_text">返回</string>
-    <string name="send_text">发送</string>
-    <string name="receiver_we_talk_msg">收到微聊消息.</string>
+    <string name="send_msg_error_tips_text">送信失败</string>
+    <string name="send_success_tips_text">送信成功</string>
+    <string name="back_text">戻る</string>
+    <string name="send_text">送信</string>
+    <string name="receiver_we_talk_msg">チャットメッセージが届く.</string>
 
 </resources>
diff --git a/app/src/main/res/values-w820dp/strings.xml b/app/src/main/res/values-w820dp/strings.xml
deleted file mode 100644 (file)
index 3132e01..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="read_text">已阅读</string>
-    <string name="reply_text">回复</string>
-    <string name="send_msg_error_tips_text">发送失败请重试</string>
-    <string name="send_success_tips_text">发送成功</string>
-    <string name="back_text">返回</string>
-    <string name="send_text">发送</string>
-    <string name="receiver_we_talk_msg">收到微聊消息.</string>
-</resources>
\ No newline at end of file
index 35755d1..34a4762 100644 (file)
     <string name="send_success_tips_text">发送成功</string>
     <string name="back_text">返回</string>
     <string name="send_text">发送</string>
-    <string name="receiver_we_talk_msg">收到微聊消息.</string>
+    <string name="receiver_we_talk_msg">We talk msg.</string>
 
 </resources>
index 9e98f56..84c86cf 100644 (file)
@@ -1,2 +1,2 @@
-#Fri Aug 06 21:21:29 CST 2021\r
-VERSION_CODE=909\r
+#Tue Aug 10 14:33:30 CST 2021\r
+VERSION_CODE=910\r