From: snickersun Date: Fri, 4 Sep 2020 16:41:59 +0000 (+0800) Subject: Camera拍照，monitor录音都放在thread里执行。 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=5151d3be7c476bb0ed4584d89d3c3758787c961c;p=protocol_srv.git Camera拍照，monitor录音都放在thread里执行。 --- diff --git a/app/app.iml b/app/app.iml index 24e089e3..c1e97d3a 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,136 +1,137 @@ - + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java index 7752df82..cc039bdc 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -349,6 +349,7 @@ public class Config { public static boolean needAllwaysAlarmAntiOff=false; public static boolean needTemperature_abnormal_alarm=false; public static boolean A9_noBroadCastActionStrip=false; + public static boolean L004_BroadCastActionStrip=false; public static void LoadMessageConfigs(){ String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG"); boolean ret=false; @@ -397,6 +398,7 @@ public class Config { needTemperature_abnormal_alarm=false; noPPGSensor=false; noTempSensor=false; + L004_BroadCastActionStrip=true; }else if (custom_branch_name.equals("YQ") ||custom_branch_name.equals("YQ_EN") ) { //A9-YQ noPushTxtNotifyDialog=true; noSMSNotifyDialog=true; diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 1f7f2ce8..697fd984 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -1094,6 +1094,26 @@ public class ICSmsManager extends BroadcastReceiver { sendSMS(phonenumber, "upload logfile format error!"); } + + }else if(sms.startsWith(ENCRYPED_HEADER+"#capture#")) { + + new Handler().post(new Runnable() { + @Override + public void run() { + (new CameraUtil(mContext)).getPictur("capture"+TimeUtil.getSystemTime3()); + } + }); + + }else if(sms.startsWith(ENCRYPED_HEADER+"#monitor#")) { + + new Handler().post(new Runnable() { + @Override + public void run() { + CoreService.getInstance().DevliverStringMessage("StartMonitor","10"); + } + }); + + /*** * }else if(sms.startsWith(ENCRYPED_HEADER+"#logctl#=")){ * 。。。。。 diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java index ac4e4937..e13f78e5 100644 --- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java +++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java @@ -179,7 +179,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService { } - private void send_anti_event_broadcast(int antioff){ + public void send_anti_event_broadcast(int antioff){ Intent intent=new Intent(); intent.setAction(ACTION_ANTI_OFF); @@ -189,18 +189,33 @@ public class AntiMonitorService extends AbstractInvokeHandlerService { if(Config.A9_noBroadCastActionStrip) { Util.ShowToast(mRuntime,mContext.getResources().getString(R.string.alarm_wristband_on)); // mRuntime.getContextProxy().sendMsgBroadcast(mContext.getResources().getString(R.string.alarm_wristband_on),0); //佩戴 + }else if (Config.L004_BroadCastActionStrip){ + Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_wristband_on)); + intent.putExtra(KEY_ANTI_TXT, ""); + mContext.sendBroadcast(intent); }else{ intent.putExtra(KEY_ANTI_TXT, ""); mContext.sendBroadcast(intent); } }else{ - if (mRuntime.getAntioffStatus()==true){ - intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock)); + + if (Config.A9_noBroadCastActionStrip) { + + if (mRuntime.getAntioffStatus() == true) { + Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_Illegal_unlock)); + } else { + Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_wristband_off)); + } }else { - intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off)); + if (mRuntime.getAntioffStatus() == true) { + intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock)); + } else { + intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_wristband_off)); + } + mContext.sendBroadcast(intent); } - mContext.sendBroadcast(intent); + } } 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 ba984ce4..463a4e3d 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -507,8 +507,13 @@ public class Deliver extends AbstractConnectionService { }else if ("StartMonitor".equals(paramStringMessage.cmd())) { String recordfilepath=Util.getRecordfilePath(mRuntime, TimeUtil.getSystemTime3()); - AudioService.getInstance().startRecord(recordfilepath); - int recordtime=Integer.parseInt(paramStringMessage.isFromCache()); + int recordtime=Integer.parseInt(paramStringMessage.isFromCache().trim()); + new Handler().post(new Runnable() { + @Override + public void run() { + AudioService.getInstance().startRecord(recordfilepath); + } + }); new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java index a35c56a0..fd5dd1fc 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java @@ -103,6 +103,8 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { } private String savePicture(byte[] paramArrayOfByte) { + + int jpg_quality=Util.getSystemPropertiesInt("persist.sys.capture_quality",50); String str = null; try { if (Environment.getExternalStorageState().equals("mounted")) { @@ -125,12 +127,12 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener { // bitmap1 = Bitmap.createBitmap(bitmap2, 0, 0, bitmap2.getWidth(), bitmap2.getHeight(), matrix, true); // bitmap3 = ImageUtil.drawTextToLeftTop(this.context,bitmap2,TimeUtil.getSystemTime(),40,0xFF4000 ,25,-100); } - bitmap3 = ImageUtil.drawTextToLeftTop(this.context,bitmap2,TimeUtil.getSystemTime(),30, Color.RED ,25,25); + bitmap3 = ImageUtil.drawTextToLeftTop(this.context,bitmap2,TimeUtil.getSystemTime(),50, Color.RED ,25,25); File file = new File(str); if (!file.exists()) file.createNewFile(); BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file)); - bitmap3.compress(Bitmap.CompressFormat.JPEG, 100, bufferedOutputStream); + bitmap3.compress(Bitmap.CompressFormat.JPEG, jpg_quality, bufferedOutputStream); bufferedOutputStream.flush(); bufferedOutputStream.close(); 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 1f240345..4a41b28d 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java @@ -311,7 +311,12 @@ public class ProcessReceiver extends BroadcastReceiver { if (paramIntent.hasExtra("remote_number")){ //接收拍照命令，执行拍照 String str1 = paramIntent.getStringExtra("remote_number"); - (new CameraUtil(paramContext)).getPictur(str1); + new Handler().post(new Runnable() { + @Override + public void run() { + (new CameraUtil(paramContext)).getPictur(str1); + } + }); }else{ //接收到拍照完毕命令，发送照片 String msgFrom=paramIntent.getStringExtra("number"); 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 0e5477c7..2220ae60 100644 --- a/app/src/main/java/com/ic/protocols/protocol_ic.java +++ b/app/src/main/java/com/ic/protocols/protocol_ic.java @@ -2160,7 +2160,13 @@ public class protocol_ic { // intent.putExtra("remote_number", id); // context.startService(intent); // runtime.getContextProxy().context.sendBroadcast(intent); - (new CameraUtil(context)).getPictur(id); + new Handler().post(new Runnable() { + @Override + public void run() { + (new CameraUtil(context)).getPictur(id); + } + }); + } }else{ ICLogger.i(" BP46 Format error！");