From 3b7b3e40249d47aa6989f42e0c627e4e09db13d0 Mon Sep 17 00:00:00 2001
From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 12 Oct 2021 11:48:52 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E8=A8=80=E7=BF=BB?=
 =?utf8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  1 -
 .../enqualcomm/support/service/Deliver.java   |  1 -
 .../enqualcomm/support/utils/CameraUtil.java  | 45 +++++------------
 .../java/com/ic/protocols/protocol_s123.java  | 12 +----
 app/src/main/res/values/strings.xml           | 50 +++++++++----------
 5 files changed, 39 insertions(+), 70 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b84b7c47..9d4d8f8c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,7 +131,6 @@ def releaseTime() {
 }
 
 preBuild {
-
     doLast {
         def imlFile = file(project.name + ".iml")
         println 'Change ' + project.name + '.iml order'
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 59537031..de6d242d 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -504,7 +504,6 @@ public class Deliver extends AbstractConnectionService {
                         HeartRateManager.getInstance().triggerPPGTest(FROM_SERVER);
                     }
                 }
-
                 CoreService.getInstance().getConnection().DeliverCMDMessageToSystem("SentVoicePacket", "");
             }
             return true;
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 f2ff1fa4..5e0c9f00 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
@@ -46,16 +46,11 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
 
     String mNumber;
 
-    private int mOrientation;
     private int custom_camera_orientation = 0;
     private int custom_camera_mirror = 0;
     private Camera.Parameters mPs;
 
-    private Camera.ShutterCallback shutterCallback = new Camera.ShutterCallback() {
-        public void onShutter() {
-            ICLogger.i("camera shutterCallback");
-        }
-    };
+    private Camera.ShutterCallback shutterCallback = () -> ICLogger.i("camera shutterCallback");
 
     private SurfaceTexture surfaceTexture;
 
@@ -72,7 +67,6 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
         byte b = 0;
         while (b < i) {
             Camera.getCameraInfo(b, cameraInfo);
-
             if (cameraInfo.facing == 0) {
                 try {
                     camera = Camera.open(b);
@@ -99,7 +93,6 @@ 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 {
@@ -115,9 +108,6 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
                 str = stringBuilder.toString();
                 Bitmap bitmap1 = BitmapFactory.decodeByteArray(paramArrayOfByte, 0, paramArrayOfByte.length);
                 Bitmap bitmap2 = bitmap1;
-
-
-//        if ((this.context.getResources().getConfiguration()).orientation == 1) {
                 custom_camera_mirror = Util.getSystemPropertiesInt("persist.sys.camera_cap_mirror", 0);
                 Matrix matrix = new Matrix();
                 matrix.reset();
@@ -150,13 +140,13 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
                     bitmap3 = ImageUtil.drawTextToLeftTop(this.context, bitmap2, TimeUtil.getSystemTimeForCameraMark(), 50, Color.RED, 25, 25);
                 }
                 File file = new File(str);
-                if (!file.exists())
+                if (!file.exists()) {
                     file.createNewFile();
+                }
                 BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file));
                 bitmap3.compress(Bitmap.CompressFormat.JPEG, jpg_quality, bufferedOutputStream);
                 bufferedOutputStream.flush();
                 bufferedOutputStream.close();
-
                 ICLogger.i("camera Take Photo and Save to " + str);
             }
             return str;
@@ -174,10 +164,9 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
             try {
                 this.mCamera.setPreviewDisplay(surfaceView.getHolder());
                 this.mPs = this.mCamera.getParameters();
-                String picsize = Util.getSystemProperties("persist.sys.camera_capsize", "640x480");
-
-                if (!picsize.trim().isEmpty()) {
-                    String sizes[] = picsize.toLowerCase().split("x");
+                String picSize = Util.getSystemProperties("persist.sys.camera_capsize", "640x480");
+                if (!picSize.trim().isEmpty()) {
+                    String sizes[] = picSize.toLowerCase().split("x");
                     if (sizes.length == 2) {
                         try {
                             int tmpw = Integer.parseInt(sizes[0]);
@@ -185,6 +174,7 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
                             width = tmpw;
                             height = tmph;
                         } catch (Exception e) {
+                            e.printStackTrace();
                         }
                     }
                 }
@@ -219,13 +209,11 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
     }
 
     public int getDisplayRotation(Context paramContext) {
-        int i = ((WindowManager) paramContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
-
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("camera getDisplayRotation rotation=");
-        stringBuilder.append(i);
-        ICLogger.i(stringBuilder.toString());
-
+        int i = ((WindowManager) paramContext
+                .getSystemService(Context.WINDOW_SERVICE))
+                .getDefaultDisplay().getRotation();
+        String stringBuilder = "camera getDisplayRotation rotation=" + i;
+        ICLogger.i(stringBuilder);
         switch (i) {
             default:
                 return 0;
@@ -263,17 +251,8 @@ public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
         } else {
             paramInt = (custom_camera_orientation - paramInt + 360) % 360;
         }
-        /*
-    if (cameraInfo.facing == 1) {
-      paramInt = (360 - (cameraInfo.orientation + paramInt) % 360) % 360;
-    } else {
-      paramInt = (cameraInfo.orientation - paramInt + 360) % 360;
-    }*/
-
         ICLogger.i("camera final display orientation " + paramInt);
-
         paramCamera.setDisplayOrientation(paramInt);
-        this.mOrientation = paramInt;
     }
 }
 
diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index eccf8396..ecdf5d27 100644
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -2765,7 +2765,6 @@ public class protocol_s123 {
         String[] cmdlist = cmd.split(CMDSPLIT);
 
         if (cmdlist.length >= 4) {
-            String imei = cmdlist[1];
             String id = cmdlist[2];
             String cdd = cmdlist[3];
             if (cmdlist.length == 5) {
@@ -2775,19 +2774,12 @@ public class protocol_s123 {
             Context context = mRuntime.getContextProxy().context.getApplicationContext();
             if (cdd.equals("1")) {
                 //delay 启动
-
 //            Intent intent = new Intent(context, com.enqualcomm.support.CoreService.class);
 //            intent.setAction(ACTION_REMOTE_CAMERA);
 //            intent.putExtra("remote_number", id);
 //                context.startService(intent);
 //            runtime.getContextProxy().context.sendBroadcast(intent);
-                mHandler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        (new CameraUtil(context)).getPicture(id);
-                    }
-                });
-
+                mHandler.post(() -> (new CameraUtil(context)).getPicture(id));
             } else if (cdd.equals("2")) {
                 Intent intent = new Intent();
                 intent.setAction(DIALOG_ACTION);
@@ -2892,7 +2884,7 @@ public class protocol_s123 {
          * 8:冻结小雨
          * 9:小雨
          * 10:冻雨
-         * 11:阵雨
+         * 11:雨
          * 12:阵雨
          * 13:雪飘雪
          * 14:小雪阵雨
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aecaad18..ba1b4412 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -180,33 +180,33 @@
     <string name="close_text">Close</string>
     <string name="commit_text">Confirm</string>
     <string name="sport_aim_achieve_tips_text">Congratulations！</string>
-    <string name="oxygen_exception_tips_text">血氧异常(</string>
-    <string name="heart_rate_exception_tips_text">心率异常(BPM</string>
-    <string name="blood_presure_exception_tips_text">血压异常(</string>
-    <string name="body_temperature_exception_tips_text">体温异常(</string>
-    <string name="web_sms_title_text">Web短信提醒</string>
-    <string name="close_tips_text">关闭</string>
-    <string name="low_power_warning_text">低电量报警</string>
-    <string name="sos_warning_msg_text">SOS紧急报警</string>
+    <string name="oxygen_exception_tips_text">Oxygen Warning(</string>
+    <string name="heart_rate_exception_tips_text">Heart rate warning(BPM</string>
+    <string name="blood_presure_exception_tips_text">BP Warning(</string>
+    <string name="body_temperature_exception_tips_text">Temperature Warning(</string>
+    <string name="web_sms_title_text">Web Msg</string>
+    <string name="close_tips_text">Close</string>
+    <string name="low_power_warning_text">Power low</string>
+    <string name="sos_warning_msg_text">SOS Call</string>
 
     <string name="sos_sms_content_text">SOS was sent from "%s". %s</string>
-    <string name="read_text">已阅读</string>
-    <string name="reply_text">回复</string>
-    <string name="send_msg_error_tips_text">发送失败请重试</string>
-    <string name="send_success_tips_text">发送成功</string>
-    <string name="back_text">返回</string>
-    <string name="send_text">发送</string>
+    <string name="read_text">READ</string>
+    <string name="reply_text">REPLY</string>
+    <string name="send_msg_error_tips_text">Send Failed</string>
+    <string name="send_success_tips_text">Send Success</string>
+    <string name="back_text">Back</string>
+    <string name="send_text">Send</string>
     <string name="receiver_we_talk_msg">We talk msg.</string>
-    <string name="alarm_pill_time_tips">吃药提醒</string>
-    <string name="alarm_drink_time_tips_text">喝水提醒</string>
-    <string name="alarm_sit_too_long_tips_text">久坐提醒</string>
-    <string name="alarm_text">闹钟</string>
-    <string name="out_temp_too_high_text">环境温度过高</string>
-    <string name="out_temp_too_low_text">环境温度过低</string>
-    <string name="tips_charge_text">低电，请充电</string>
-    <string name="urgent_call_text">紧急呼救</string>
-    <string name="battery_to_low">电量过低</string>
-    <string name="device_shutdown_tips_text">设备随时关机,请及时充电</string>
-    <string name="sms_title_text">短信</string>
+    <string name="alarm_pill_time_tips">Take pill</string>
+    <string name="alarm_drink_time_tips_text">Drink Tips</string>
+    <string name="alarm_sit_too_long_tips_text">Sit too long</string>
+    <string name="alarm_text">Alarm</string>
+    <string name="out_temp_too_high_text">Env Temp too high</string>
+    <string name="out_temp_too_low_text">Env Temp too low</string>
+    <string name="tips_charge_text">Please charge</string>
+    <string name="urgent_call_text">Urgent call</string>
+    <string name="battery_to_low">Power low</string>
+    <string name="device_shutdown_tips_text">Charge or will shutdown</string>
+    <string name="sms_title_text">SMS</string>
 
 </resources>
-- 
2.17.1