From 5c7e82ccb5970b4b5df4373feac2236478c8ab37 Mon Sep 17 00:00:00 2001 From: snickersun Date: Mon, 2 Nov 2020 17:56:30 +0800 Subject: [PATCH] =?utf8?q?=E6=A0=B9=E6=8D=AEH88=20=E9=9C=80=E6=B1=82?= =?utf8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8B=8D=E7=85=A7=E6=96=B0=E5=91=BD?= =?utf8?q?=E4=BB=A4=20IWBP46,353456789012345,080835,2,[=E5=8F=82=E6=95=B0]?= =?utf8?q?#=EF=BC=8C=E6=AD=A4=E5=91=BD=E4=BB=A4=E5=BC=B9=E7=AA=97=E7=94=A8?= =?utf8?q?app=E6=8B=8D=E7=85=A7=EF=BC=8C=E4=B8=8D=E6=98=AF=E5=90=8E?= =?utf8?q?=E5=8F=B0=E6=8B=8D=E7=85=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../enqualcomm/support/service/Deliver.java | 19 +++++- .../support/utils/ProcessReceiver.java | 58 ++++++++++++++++--- .../com/enqualcomm/support/utils/Util.java | 14 +++++ .../java/com/ic/protocols/protocol_ic.java | 18 +++++- 4 files changed, 99 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index 78eb6860..f58c39e9 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -529,7 +529,24 @@ public class Deliver extends AbstractConnectionService { },500); return true; - }else if ("StartMonitor".equals(paramStringMessage.cmd())) { + }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); + } + },500); + + return true; + + }else if ("StartMonitor".equals(paramStringMessage.cmd())) { String recordfilepath=Util.getRecordfilePath(mRuntime, TimeUtil.getSystemTime3()); int recordtime=Integer.parseInt(paramStringMessage.isFromCache().trim()); 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 ebf56d10..9e607201 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -117,7 +117,7 @@ public class ProcessReceiver extends BroadcastReceiver { var6.append(" "); var6.append(var4); var6.append(context.getString(R.string.voiceMessageEnd)); - mCustomDialog = tmpDialog.setMessage(var6.toString()).setPositiveButton("确定", new DialogInterface.OnClickListener() { + mCustomDialog = tmpDialog.setMessage(var6.toString()).setPositiveButton(context.getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface var1x, int var2x) { var1x.dismiss(); ComponentName var3 = new ComponentName("com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.chat.ChatActivity_"); @@ -135,7 +135,7 @@ public class ProcessReceiver extends BroadcastReceiver { } } - }).setNegativeButton("取消", new DialogInterface.OnClickListener() { + }).setNegativeButton(context.getString(R.string.cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface var1, int var2) { var1.dismiss(); VibrateUtil.getInstance(context).VibrateOn(false); @@ -149,7 +149,7 @@ public class ProcessReceiver extends BroadcastReceiver { var7.append(context.getString(R.string.hht_call_start)); var7.append(var4); var7.append(context.getString(R.string.hht_call_end)); - mCustomDialog = tmpDialog.setMessage(var7.toString()).setPositiveButton("确定", new DialogInterface.OnClickListener() { + 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); @@ -161,7 +161,7 @@ public class ProcessReceiver extends BroadcastReceiver { tmpDialog = this.mDialog.setTitle(context.getString(R.string.sms_title)).setApp(1); StringBuilder var7 = new StringBuilder(); var7.append(context.getString(R.string.sms_notify)); - mCustomDialog = tmpDialog.setMessage(var7.toString()).setPositiveButton("确定", new DialogInterface.OnClickListener() { + mCustomDialog = tmpDialog.setMessage(var7.toString()).setPositiveButton(context.getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface var1, int var2) { var1.dismiss(); ComponentName var3 = new ComponentName("com.zmapp.sms", "com.zmapp.sms.MainActivity"); @@ -176,7 +176,7 @@ public class ProcessReceiver extends BroadcastReceiver { var4.printStackTrace(); } } - }).setNegativeButton("取消", new DialogInterface.OnClickListener() { + }).setNegativeButton(context.getString(R.string.cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface var1, int var2) { var1.dismiss(); VibrateUtil.getInstance(context).VibrateOn(false); @@ -188,7 +188,7 @@ public class ProcessReceiver extends BroadcastReceiver { 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() { + 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); @@ -203,7 +203,7 @@ public class ProcessReceiver extends BroadcastReceiver { tmpDialog = this.mDialog.setTitle(context.getString(R.string.findDev)).setApp(1); StringBuilder var7 = new StringBuilder(); var7.append(msg); - mCustomDialog = tmpDialog.setMessage(var7.toString()).setPositiveButton("确定", new DialogInterface.OnClickListener() { + 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); @@ -212,6 +212,36 @@ public class ProcessReceiver extends BroadcastReceiver { }).create(); mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST); mCustomDialog.show(); + }else if (app_id ==6) { + tmpDialog = this.mDialog.setTitle(context.getString(R.string.notification_title)).setApp(1); + StringBuilder var7 = new StringBuilder(); + var7.append(msg); + 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(); + + String packagename="com.eqc.camera"; + String activityName="com.eqc.camera.TakePictureActivity"; + if (Util.installed(context,"com.ic.camera")){ + packagename="com.ic.camera"; + activityName="com.ic.camera.MainActivity"; + } + ComponentName var3 = new ComponentName(packagename, activityName); + Intent var5 = new Intent("android.intent.action.MAIN"); + var5.addCategory("android.intent.category.DEFAULT"); + var5.addFlags(FLAG_ACTIVITY_NEW_TASK); + var5.setComponent(var3); + try { + context.startActivity(var5); + } catch (Exception var4) { + var4.printStackTrace(); + } + } + }).create(); + mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST); + mCustomDialog.show(); } } private void playFindDevVoice(Context context){ @@ -418,6 +448,20 @@ public class ProcessReceiver extends BroadcastReceiver { } + this.screenOn(paramContext); + } + }else if (paramIntent.hasExtra("takephoto")) { + String takephoto = paramIntent.getStringExtra("takephoto"); + SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false); + isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false); + if (takephoto != null && !isSilence) { + if (!DeviceInfoUtil.isTopActivity(paramContext)) { + this.initMyDialog(paramContext, null, 6,takephoto); + this.playNotificationVoice(paramContext); + VibrateUtil.getInstance(paramContext).VibrateOn(true); + + } + this.screenOn(paramContext); } } diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java index 5fc111ad..4d88c3c0 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/Util.java +++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java @@ -3,6 +3,8 @@ package com.enqualcomm.support.utils; import android.annotation.TargetApi; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.media.MediaPlayer; @@ -74,6 +76,18 @@ public class Util { }catch ( Exception e){} } + + public static boolean installed(Context context,String appPackageName) { + PackageManager packageManager = context.getPackageManager();// 获取packagemanager + List pinfo = packageManager.getInstalledPackages(0);// 获取所有已安装程序的包信息 + for (PackageInfo pkif : pinfo) { + String pn = pkif.packageName; + if (appPackageName.equals(pn)) { + return true; + } + } + return false; + } public static boolean is_FT6236U_upgrade_firmware_support(){ boolean ret=getSystemProperties("product.tp.upgradeable").toLowerCase().equals("true"); return ret; diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java index 6759e89b..7307b558 100644 --- a/app/src/main/java/com/ic/protocols/protocol_ic.java +++ b/app/src/main/java/com/ic/protocols/protocol_ic.java @@ -39,6 +39,7 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_INCLUDE_STOPPED_PACKAGES; import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START; import static com.enqualcomm.support.Constants.ACTION_REMOTE_CAMERA; +import static com.enqualcomm.support.Constants.DIALOG_ACTION; import static com.enqualcomm.support.LocationClient.LOCATION_MODE; import static com.enqualcomm.support.bean.Contact.GROUP_ALL; import static java.lang.Math.abs; @@ -79,6 +80,8 @@ public class protocol_ic { BPTM, APCH,//充电提示 BPCH, + APBR,//上传蓝牙扫描结果 + BPBR, /* 服务器发起*/ AP12, BP12,//SOS 号码设置 @@ -152,6 +155,8 @@ public class protocol_ic { BPTQ, APAT,//剪断消息开关 BPAT, + APBT, //设置蓝牙扫描间隔 + BPBT, UNKNOWN_CMD, } @@ -185,6 +190,8 @@ public class protocol_ic { cmdMap.put(CMD_TYPE.BPTM, "BPTM"); cmdMap.put(CMD_TYPE.APCH, "APCH"); cmdMap.put(CMD_TYPE.BPCH, "BPCH"); + cmdMap.put(CMD_TYPE.APBR, "APBR"); + cmdMap.put(CMD_TYPE.BPBR, "BPBR"); /* 服务器发起*/ cmdMap.put(CMD_TYPE.AP12, "AP12"); cmdMap.put(CMD_TYPE.BP12, "BP12"); @@ -258,6 +265,8 @@ public class protocol_ic { cmdMap.put(CMD_TYPE.BPTQ, "BPTQ"); cmdMap.put(CMD_TYPE.APAT, "APAT"); cmdMap.put(CMD_TYPE.BPAT, "BPAT"); + cmdMap.put(CMD_TYPE.APBT, "APBT"); + cmdMap.put(CMD_TYPE.BPBT, "BPBT"); } @@ -2293,10 +2302,10 @@ public class protocol_ic { String tmp = cmdlist[4]; } connection.send(AP46(id,cdd)); - + Context context = mRuntime.getContextProxy().context.getApplicationContext(); if (cdd.equals("1")) { //delay 启动 - Context context = mRuntime.getContextProxy().context.getApplicationContext(); + // Intent intent = new Intent(context, com.enqualcomm.support.CoreService.class); // intent.setAction(ACTION_REMOTE_CAMERA); // intent.putExtra("remote_number", id); @@ -2309,6 +2318,11 @@ public class protocol_ic { } }); + }else if(cdd.equals("2")){ + Intent intent = new Intent(); + intent.setAction(DIALOG_ACTION); + intent.putExtra("takephoto", "Take Photo !"); + context.sendBroadcast(intent); } }else{ ICLogger.i(" BP46 Format error！"); -- 2.17.1