From: snickersun <snickersun@qq.com>
Date: Wed, 2 Sep 2020 14:27:38 +0000 (+0800)
Subject: protocol_ic
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=d9aea528a5842f4f0b8694fe210eaa6a6b656e93;p=protocol_srv.git

protocol_ic
协议拍照thread进行。 camera 照片压缩图片50%，
---

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 6918ae63..9905d701 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -27,6 +27,7 @@ import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.service.Deliver;
 import com.enqualcomm.support.service.SmsDatabaseChaneObserver;
 import com.enqualcomm.support.utils.APNUtil;
+import com.enqualcomm.support.utils.CameraUtil;
 import com.enqualcomm.support.utils.CellInfoUtil;
 import com.enqualcomm.support.utils.ContextProxy;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
@@ -1061,11 +1062,22 @@ 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+"#logctl#=")){
                  *   。。。。。
                  * 添加新命令道这里
                  */
+
             }else {
                 return false;
             }
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 d4876605..d60005b3 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -314,7 +314,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 b056e68f..ddad172c 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
+import android.os.Handler;
 
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.CoreService;
@@ -2163,7 +2164,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！");
@@ -2212,7 +2219,7 @@ public class protocol_ic {
 
             if (cdd.equals("1")) {
                 //delay 启动
-                Context context = mRuntime.getContextProxy().context.getApplicationContext();
+//                Context context = mRuntime.getContextProxy().context.getApplicationContext();
                 CoreService.getInstance().DevliverStringMessage("StartMonitor",tmp);
             }
         }else{