From: TrillGates Date: Wed, 11 Aug 2021 03:02:14 +0000 (+0800) Subject: fixed dialog show close by sos but player not stop issues. X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=70de2ca1049fb3ec0ce4850397a076705301b3fe;p=icsupport.git fixed dialog show close by sos but player not stop issues. --- diff --git a/app/release/ICSer_V907_2108052021_release.apk b/app/release/ICSer_V910_2108101433_release.apk similarity index 75% rename from app/release/ICSer_V907_2108052021_release.apk rename to app/release/ICSer_V910_2108101433_release.apk index 42b609f3..eb8c9d21 100644 Binary files a/app/release/ICSer_V907_2108052021_release.apk and b/app/release/ICSer_V910_2108101433_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 7c006ab5..f13c477a 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -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 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 18afbfcf..86da3a1f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -236,7 +236,7 @@ android:name=".provider.ICNotificationProvider" android:authorities="com.ic.notification" android:exported="true" /> - + { + 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; diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java index d3f37eff..91ea6110 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -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")) { diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java index a144deeb..7bc74d37 100644 --- a/app/src/main/java/com/ic/protocols/protocol_fzd.java +++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java @@ -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); diff --git a/app/src/main/res/values-de-rCH/strings.xml b/app/src/main/res/values-de-rCH/strings.xml index 80d7cbce..c6629cf6 100644 --- a/app/src/main/res/values-de-rCH/strings.xml +++ b/app/src/main/res/values-de-rCH/strings.xml @@ -165,5 +165,5 @@ 发送成功 返回 发送 - 收到微聊消息. + We talk msg. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d712bea6..3723f866 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -160,12 +160,12 @@ 低電力アラート 緊急SOS %sからSOSが発信されました。%s - 已阅读 + 既読 回复 - 发送失败请重试 - 发送成功 - 返回 - 发送 - 收到微聊消息. + 送信失败 + 送信成功 + 戻る + 送信 + チャットメッセージが届く. diff --git a/app/src/main/res/values-w820dp/strings.xml b/app/src/main/res/values-w820dp/strings.xml deleted file mode 100644 index 3132e01e..00000000 --- a/app/src/main/res/values-w820dp/strings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - 已阅读 - 回复 - 发送失败请重试 - 发送成功 - 返回 - 发送 - 收到微聊消息. - \ 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 35755d10..34a4762c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -196,6 +196,6 @@ 发送成功 返回 发送 - 收到微聊消息. + We talk msg. diff --git a/app/version_code.properties b/app/version_code.properties index 9e98f566..84c86cf4 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri Aug 06 21:21:29 CST 2021 -VERSION_CODE=909 +#Tue Aug 10 14:33:30 CST 2021 +VERSION_CODE=910