From: snickersun Date: Fri, 15 May 2020 13:05:27 +0000 (+0800) Subject: release V417 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=8c25f08c359fde63266018cbd78f5a77252da4bd;p=protocol_srv.git release V417 1、在main界面天加更多的info，显示服务器地址等信息 2、修复切换协议不直接生效问题 3、添加beehome消息推送的提示窗口显示。 --- diff --git a/app/release/ICSer_V416_2005151932_release.apk b/app/release/ICSer_V416_2005151932_release.apk deleted file mode 100644 index b13bed52..00000000 Binary files a/app/release/ICSer_V416_2005151932_release.apk and /dev/null differ diff --git a/app/release/ICSer_V417_2005152102_release.apk b/app/release/ICSer_V417_2005152102_release.apk new file mode 100644 index 00000000..3656bd40 Binary files /dev/null and b/app/release/ICSer_V417_2005152102_release.apk differ diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index b3135ae8..7a9385b6 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -802,6 +802,7 @@ public class ICSmsManager { Config.setProtocolServerAddr(mContext,"",Config.BeehomePort); Config.setProtocolServerHost(mContext,Config.BeehomeHost); Config.getProtocolNumber(); + Config.loadServerSettings(runtime); sendSMS(phonenumber, "set setprotocol to Beehome Protocol!"); CoreService.getInstance().disconnect_server(); CoreService.getInstance().ReConnectToServer(); @@ -815,6 +816,7 @@ public class ICSmsManager { Config.setProtocolServerAddr(mContext, "", Config.JiAiPort); Config.setProtocolServerHost(mContext, Config.JiAiHost); Config.getProtocolNumber(); + Config.loadServerSettings(runtime); sendSMS(phonenumber, "set setprotocol to JiAi Protocol!"); CoreService.getInstance().disconnect_server(); CoreService.getInstance().ReConnectToServer(); @@ -868,14 +870,6 @@ public class ICSmsManager { if (handleSMS_CMD(from,message)==false){ //说明不是sms命令，提示短信接收。 ContextProxy.sendMsgBroadcast(context,message,1); - Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1() { - public void call(Long param1Long) { - Intent intent = new Intent(); - intent.setAction(DIALOG_ACTION); - intent.putExtra("sms", "SMS"); - context.sendBroadcast(intent); - } - }); } } })).start(); diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java index 054cec45..3169d288 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java @@ -28,10 +28,15 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Calendar; import java.util.Iterator; +import java.util.concurrent.TimeUnit; + +import rx.Observable; +import rx.functions.Action1; import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static com.enqualcomm.support.Constants.ACTION_ISCONNECTED; +import static com.enqualcomm.support.Constants.DIALOG_ACTION; public class ContextProxy { private static final long ONE_WEEK = 604800000L; @@ -319,6 +324,7 @@ public class ContextProxy { public void sendMsgBroadcast(String msg, int msgType) { sendMsgBroadcast(this.context,msg,msgType); + } public static void sendMsgBroadcast(Context _context,String msg, int msgType) { @@ -326,6 +332,26 @@ public class ContextProxy { intent.putExtra("msgType", 0); //0 代表 server下发消息，1代表 SMS消息 intent.putExtra("txtMsg", msg); _context.sendBroadcast(intent); + + if (msgType==0){ + Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1() { + public void call(Long param1Long) { + Intent intent = new Intent(); + intent.setAction(DIALOG_ACTION); + intent.putExtra("pushtxt", msg); + _context.sendBroadcast(intent); + } + }); + }else{ + Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1() { + public void call(Long param1Long) { + Intent intent = new Intent(); + intent.setAction(DIALOG_ACTION); + intent.putExtra("sms", msg); + _context.sendBroadcast(intent); + } + }); + } } public void sendStheartRateBroadcast(String paramString, int paramInt) { Intent intent = new Intent(); diff --git a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java index 0bacfd04..146e140b 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java @@ -232,7 +232,7 @@ public class DeviceInfoUtil { .append(sim.getNetworkType()==SimSignalUtil.IS_2G?"2G":(sim.getNetworkType()==SimSignalUtil.IS_3G)?"3G":(sim.getNetworkType()==SimSignalUtil.IS_4G?"4G":"unknown")) .append(" [").append(runtime.getSignalStrength()).append(",").append(runtime.getSignalInfo()).append("] ") .append(runtime.IMEI()) - .append("\n SocketConnection ").append(KeepAlive.isConnected).append(" , HBcycle ").append(runtime.getHeartBeatCycle()) + .append("\n Srv [").append(runtime.getHost()).append(":").append(runtime.getPort()).append("]").append(KeepAlive.isConnected).append(" , HBcycle ").append(runtime.getHeartBeatCycle()) .append("\n ServerConnected is ").append(runtime.isServerProtocolConnected()) .append(" \n Bat ").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage()) .append(" charged ").append(runtime.isPowerConnected()) 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 2e0c9f71..f7c3c9d0 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -80,7 +80,7 @@ public class ProcessReceiver extends BroadcastReceiver { private float y2 = 0.0F; - private void initMyDialog(final Context context, final Contact contact, int app_id) { + private void initMyDialog(final Context context, final Contact contact, int app_id,String msg) { String var4 = contact==null?"SMS":contact.name; if (this.mDialog == null) { @@ -174,6 +174,18 @@ public class ProcessReceiver extends BroadcastReceiver { }).create(); mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST); mCustomDialog.show(); + }else if (app_id ==4) { + tmpDialog = this.mDialog.setTitle("WEB"+context.getString(R.string.sms_title)).setApp(1); + StringBuilder var7 = new StringBuilder(); + var7.append(msg); + mCustomDialog = tmpDialog.setMessage(var7.toString()).setPositiveButton("确定", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface var1, int var2) { + var1.dismiss(); + VibrateUtil.getInstance(context).VibrateOn(false); + } + }).create(); + mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST); + mCustomDialog.show(); } } @@ -238,7 +250,7 @@ public class ProcessReceiver extends BroadcastReceiver { isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false); if (contact != null && !isSilence) { if (!DeviceInfoUtil.isTopActivity(paramContext)) { - this.initMyDialog(paramContext, contact, 1); + this.initMyDialog(paramContext, contact, 1,""); this.playNotificationVoice(paramContext); VibrateUtil.getInstance(paramContext).VibrateOn(true); } @@ -251,7 +263,20 @@ public class ProcessReceiver extends BroadcastReceiver { isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false); if (sms != null && !isSilence) { if (!DeviceInfoUtil.isTopActivity(paramContext)) { - this.initMyDialog(paramContext, null, 3); + this.initMyDialog(paramContext, null, 3,sms); + this.playNotificationVoice(paramContext); + VibrateUtil.getInstance(paramContext).VibrateOn(true); + } + + this.screenOn(paramContext); + } + }else if (paramIntent.hasExtra("pushtxt")) { + String sms = paramIntent.getStringExtra("pushtxt"); + SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false); + isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false); + if (sms != null && !isSilence) { + if (!DeviceInfoUtil.isTopActivity(paramContext)) { + this.initMyDialog(paramContext, null, 4,sms); this.playNotificationVoice(paramContext); VibrateUtil.getInstance(paramContext).VibrateOn(true); } @@ -265,7 +290,7 @@ public class ProcessReceiver extends BroadcastReceiver { contact.extra = paramIntent.getStringExtra("date"); isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false); if (contact != null && !isSilence) { - this.initMyDialog(paramContext, contact, 2); + this.initMyDialog(paramContext, contact, 2,""); this.playNotificationVoice(paramContext); VibrateUtil.getInstance(paramContext).VibrateOn(true); this.screenOn(paramContext); diff --git a/app/version_code.properties b/app/version_code.properties index 7ff68814..df7eb81d 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri May 15 19:32:38 CST 2020 -VERSION_CODE=416 +#Fri May 15 21:02:38 CST 2020 +VERSION_CODE=417