adjust vibrateUtils codes.

diff --git a/app/release/ICSer_V932_2108311721_release.apk b/app/release/ICSer_V933_2108312051_release.apk
similarity index 77%
rename from app/release/ICSer_V932_2108311721_release.apk
rename to app/release/ICSer_V933_2108312051_release.apk
index ca57242..ce2b84f 100644 (file)
Binary files a/app/release/ICSer_V932_2108311721_release.apk and b/app/release/ICSer_V933_2108312051_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 1575c6f..977ca3a 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":932,"versionName":"2108311721","enabled":true,"outputFile":"ICSer_V932_2108311721_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V932_2108311721_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":933,"versionName":"2108312051","enabled":true,"outputFile":"ICSer_V933_2108312051_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V933_2108312051_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
index 3e9b9d6..d2605d7 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
@@ -10,11 +10,15 @@ public class VibrateUtil {
     private static Context mContext = null;\r
 \r
     public static VibrateUtil getInstance(Context context) {\r
-        if (mContext == null)\r
+        if (mContext == null) {\r
             mContext = context;\r
-        if (vibrator == null)\r
+        }\r
+        if (vibrator == null) {\r
             vibrator = (Vibrator) mContext.getSystemService(VIBRATOR_SERVICE);\r
-        vibrateUtil = new VibrateUtil();\r
+        }\r
+        if (vibrateUtil == null) {\r
+            vibrateUtil = new VibrateUtil();\r
+        }\r
         return vibrateUtil;\r
     }\r
 \r

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 1307cb8..3609af4 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -697,14 +697,11 @@ public class protocol_s123 {
     }
 
     public int getBP28Amrlen(String cmd) {
-
         String Name;
         String appendIndex;
         int packetCount;
         int currentId;
         int packetLen;
-
-
         String[] msg = cmd.split(CMDSPLIT);
         if (msg.length >= 6) {
             try {
@@ -713,24 +710,19 @@ public class protocol_s123 {
                 packetCount = Integer.parseInt(msg[3]);
                 currentId = Integer.parseInt(msg[4]);
                 packetLen = Integer.parseInt(msg[5]);
-
                 StringBuffer stringBuffer = new StringBuffer();
                 stringBuffer.append("getBP28AmrLen name = ").append(Name)
                         .append(",appendIndex = ").append(appendIndex)
                         .append(",packetCount = ").append(packetCount)
                         .append(",currentId = ").append(currentId)
                         .append(",packetLen = ").append(packetLen);
-
-
                 log(stringBuffer.toString());
                 return packetLen;
             } catch (Exception e) {
                 ICLogger.e(e.getMessage(), e);
             }
-
         } else {
             log("getBP28AmrLen", "format Error");
-
         }
         return -1;
     }

diff --git a/app/version_code.properties b/app/version_code.properties
index 04f82e1..284aebf 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Aug 31 17:21:49 CST 2021\r
-VERSION_CODE=932\r
+#Tue Aug 31 20:51:41 CST 2021\r
+VERSION_CODE=933\r