From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 8 Jun 2021 08:49:55 +0000 (+0800)
Subject: fixed some bugs of anan protocol.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=61c3e26fdc2411c16994265bdc8dd05c9d40b191;p=protocol_srv.git

fixed some bugs of anan protocol.
---

diff --git a/app/release/ICSer_V787_2105291657_release.apk b/app/release/ICSer_V788_2106081538_release.apk
similarity index 76%
rename from app/release/ICSer_V787_2105291657_release.apk
rename to app/release/ICSer_V788_2106081538_release.apk
index 4987a495..e01c208c 100644
Binary files a/app/release/ICSer_V787_2105291657_release.apk and b/app/release/ICSer_V788_2106081538_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index fc7dacfe..78403c20 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":787,"versionName":"2105291657","enabled":true,"outputFile":"ICSer_V787_2105291657_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V787_2105291657_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":788,"versionName":"2106081538","enabled":true,"outputFile":"ICSer_V788_2106081538_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V788_2106081538_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 650b4b52..da012f84 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -226,7 +226,7 @@ public class CoreService extends Service {
                 setHeartRateDetectAlarm(1);
                 setEmegencyLocationSTOPAlarm(5);
             } else if (ACTION_LOCAL_SOS_ACTION.endsWith(param1Intent.getAction())) {
-                VibrateUtil.getInstance(runtime.getContextProxy().context).VibrateOn(true);
+                VibrateUtil.getInstance(runtime.getContextProxy().context).vibrateOn(true);
 //               if( param1Intent.getIntExtra("type", 1) == 1) {
                 boolean needHRSTestOnSOS = Util.getSystemProperties("persist.sys.needHRSOnSOS", "false").equals("true");
                 if (needHRSTestOnSOS) {
@@ -943,7 +943,7 @@ public class CoreService extends Service {
                     //平均 每分钟活动数 小于参考久坐计步值，表示久坐
                     ICLogger.i("SitCheck 平均 每分钟活动数 小于参考久坐计步值，表示久坐");
                     WakeLockUtil.ScreenOnWakeLockTemperary(this);
-                    VibrateUtil.getInstance(this).VibrateOn(true);
+                    VibrateUtil.getInstance(this).vibrateOn(true);
                     Util.mSleep(1000);
                     runtime.getContextProxy().sendBroadcastSitLongAlarm(); //广播久坐消息
 
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index ad31d797..14ebfa51 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -1147,7 +1147,7 @@ public class ICSmsManager extends BroadcastReceiver {
         } else if (cmd.startsWith("playnotifiy")) {
 
             AudioService.getInstance().play(runtime.getContextProxy().context.getAssets(), "ring_msg.mp3");
-            VibrateUtil.getInstance(runtime.getContextProxy().context).VibrateOn(true);
+            VibrateUtil.getInstance(runtime.getContextProxy().context).vibrateOn(true);
 
         } else if (cmd.startsWith("DeliverSMS")) {
 
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 198fe150..d0ed3027 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -115,7 +115,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                     var5.addCategory("android.intent.category.DEFAULT");
                     var5.addFlags(FLAG_ACTIVITY_NEW_TASK);
                     var5.setComponent(var3);
-                    VibrateUtil.getInstance(context).VibrateOn(false);
+                    VibrateUtil.getInstance(context).vibrateOn(false);
                     try {
                         context.startActivity(var5);
                     } catch (Exception e) {
@@ -127,7 +127,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             }).setNegativeButton(context.getString(R.string.cancel), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface var1, int var2) {
                     var1.dismiss();
-                    VibrateUtil.getInstance(context).VibrateOn(false);
+                    VibrateUtil.getInstance(context).vibrateOn(false);
                 }
             }).create();
             mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);
@@ -141,7 +141,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             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);
+                    VibrateUtil.getInstance(context).vibrateOn(false);
                 }
             }).create();
             mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);
@@ -158,7 +158,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                     var5.addCategory("android.intent.category.DEFAULT");
                     var5.addFlags(FLAG_ACTIVITY_NEW_TASK);
                     var5.setComponent(var3);
-                    VibrateUtil.getInstance(context).VibrateOn(false);
+                    VibrateUtil.getInstance(context).vibrateOn(false);
                     try {
                         context.startActivity(var5);
                     } catch (Exception e) {
@@ -169,7 +169,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             }).setNegativeButton(context.getString(R.string.cancel), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface var1, int var2) {
                     var1.dismiss();
-                    VibrateUtil.getInstance(context).VibrateOn(false);
+                    VibrateUtil.getInstance(context).vibrateOn(false);
                 }
             }).create();
             mCustomDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);
@@ -183,7 +183,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                 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);
+                        VibrateUtil.getInstance(context).vibrateOn(false);
                         if (CoreService.getInstance() != null) {
                             Runtime runtime = CoreService.getInstance().getRuntime();
                             if (Config.custom_name.equals("YQ") || Config.custom_name.equals("YQ_EN")) {
@@ -200,7 +200,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                 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);
+                        VibrateUtil.getInstance(context).vibrateOn(false);
                     }
                 }).create();
             }
@@ -213,7 +213,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             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);
+                    VibrateUtil.getInstance(context).vibrateOn(false);
                     stopmediaplayer();
                 }
             }).create();
@@ -226,7 +226,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             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);
+                    VibrateUtil.getInstance(context).vibrateOn(false);
                     stopmediaplayer();
 
                     if (msg.contains("Take Photo")) {
@@ -415,7 +415,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                     if (!DeviceInfoUtil.isTopActivity(paramContext)) {
                         this.initMyDialog(paramContext, contact, 1, "", false);
                         this.playNotificationVoice(paramContext);
-                        VibrateUtil.getInstance(paramContext).VibrateOn(true);
+                        VibrateUtil.getInstance(paramContext).vibrateOn(true);
                     }
 
                     this.screenOn(paramContext);
@@ -428,7 +428,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                     //if (!DeviceInfoUtil.isTopActivity(paramContext)) {
                     this.initMyDialog(paramContext, null, 3, sms, false);
                     this.playNotificationVoice(paramContext);
-                    VibrateUtil.getInstance(paramContext).VibrateOn(true);
+                    VibrateUtil.getInstance(paramContext).vibrateOn(true);
                     //}
 
                     this.screenOn(paramContext);
@@ -445,7 +445,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                     if (!DeviceInfoUtil.isTopActivity(paramContext)) {
                         this.initMyDialog(paramContext, null, 4, sms, needreply);
                         this.playNotificationVoice(paramContext);
-                        VibrateUtil.getInstance(paramContext).VibrateOn(true);
+                        VibrateUtil.getInstance(paramContext).vibrateOn(true);
                     }
 
                     this.screenOn(paramContext);
@@ -457,7 +457,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                 if (finddevtxt != null && !isSilence) {
                     this.initMyDialog(paramContext, null, 5, finddevtxt, false);
                     this.playFindDevVoice(paramContext);
-                    VibrateUtil.getInstance(paramContext).VibrateOn(true);
+                    VibrateUtil.getInstance(paramContext).vibrateOn(true);
 
                     this.screenOn(paramContext);
                 }
@@ -466,10 +466,9 @@ public class ProcessReceiver extends BroadcastReceiver {
                 SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
                 isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
                 if (takephoto != null && !isSilence) {
-
                     this.initMyDialog(paramContext, null, 6, takephoto, false);
                     this.playNotificationVoice(paramContext);
-                    VibrateUtil.getInstance(paramContext).VibrateOn(true);
+                    VibrateUtil.getInstance(paramContext).vibrateOn(true);
 
                     this.screenOn(paramContext);
                 }
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 465f2627..25fefa8b 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
@@ -7,43 +7,44 @@ import static android.content.Context.VIBRATOR_SERVICE;
 
 public class VibrateUtil {
 
-    private static Context mContext=null;
-    public static VibrateUtil getInstance(Context context){
-        if (mContext==null)
-            mContext=context;
-        if (vibrator==null)
-            vibrator=(Vibrator)mContext.getSystemService(VIBRATOR_SERVICE);
-        vibrateUtil=new VibrateUtil();
+    private static Context mContext = null;
+
+    public static VibrateUtil getInstance(Context context) {
+        if (mContext == null)
+            mContext = context;
+        if (vibrator == null)
+            vibrator = (Vibrator) mContext.getSystemService(VIBRATOR_SERVICE);
+        vibrateUtil = new VibrateUtil();
         return vibrateUtil;
     }
-    private  static Vibrator vibrator = null;
-    private static VibrateUtil vibrateUtil=null;
 
-    private static long patter_item= 1000;
-    private long[] patter = { patter_item, 1000, patter_item,1000}; //1秒开，1秒关，2秒开，50ms关
+    private static Vibrator vibrator = null;
+    private static VibrateUtil vibrateUtil = null;
+
+    private static long patter_item = 1000;
+    private long[] patter = {patter_item, 1000, patter_item, 1000}; //1秒开，1秒关，2秒开，50ms关
     private long[] patterOnce = {patter_item, 1000}; //1秒开，1秒关，2秒开，50ms关
 
     /**
      * 设置震动时长
+     *
      * @param l 单位ms
      */
-    public static void setVibPattern(int l){
-        patter_item=l;
+    public static void setVibPattern(int l) {
+        patter_item = l;
     }
-    public void VibrateOn(boolean on){
-        if (patter_item>0) {
-            if (vibrator != null) {
-                patter = new long[]{patter_item, 1000, patter_item, 1000};
-                if (on)
-//                vibrator.vibrate(patter, 0);//一直循环
-                    vibrator.vibrate(patter, -1);//不循环
-                else
-                    vibrator.cancel();
-            }
+
+    public void vibrateOn(boolean on) {
+        if (vibrator != null) {
+            if (on)
+                vibrator.vibrate(1000);//不循环
+            else
+                vibrator.cancel();
         }
     }
-    public void VibrateOnOnce(boolean on){
-        if (patter_item>0) {
+
+    public void VibrateOnOnce(boolean on) {
+        if (patter_item > 0) {
             if (vibrator != null) {
                 patterOnce = new long[]{patter_item, 1000};
                 if (on)
diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java
index 7899f422..87169197 100644
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -42,6 +42,7 @@ import com.enqualcomm.support.utils.SharePreferenceUtil;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
+import com.enqualcomm.support.utils.VibrateUtil;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -625,6 +626,9 @@ public class protocol_anan {
         View okBtn = view.findViewById(R.id.button_ok);
         okBtn.setOnClickListener(v -> {
             if (manager != null) {
+                //抖一下
+                //并且震动
+                VibrateUtil.getInstance(context).vibrateOn(true);
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 //今天已经展示过了。
                 //今天的执法犯法
diff --git a/app/src/main/res/layout/dialog_tips.xml b/app/src/main/res/layout/dialog_tips.xml
index 8b27874b..dc586bf9 100644
--- a/app/src/main/res/layout/dialog_tips.xml
+++ b/app/src/main/res/layout/dialog_tips.xml
@@ -3,47 +3,37 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/grey"
-    android:padding="4dp"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp">
+    android:padding="20dp">
+
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="10dp"
+        android:src="@mipmap/achievement" />
 
     <TextView
-        android:id="@+id/title"
+        android:id="@+id/description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:gravity="center_vertical|center_horizontal"
-        android:text="@string/sport_target_achieve"
+        android:layout_below="@id/icon"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="10dp"
+        android:gravity="left"
+        android:padding="4dp"
+        android:text="@string/sport_aim_achieve_tips_text"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="@color/white"
-        android:textIsSelectable="true" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/title"
-        android:layout_marginBottom="46dp"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp">
-
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="left"
-            android:padding="4dp"
-            android:text="@string/sport_aim_achieve_tips_text"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/white"
-            android:textIsSelectable="true"
-            android:textSize="18sp" />
-    </ScrollView>
+        android:textIsSelectable="true"
+        android:textSize="26sp" />
 
     <!-- Alert dialog style buttons along the bottom. -->
     <Button
         android:id="@+id/button_ok"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:background="@drawable/selector_next_step"
@@ -55,7 +45,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_above="@id/button_ok"
-        android:layout_marginBottom="5dp"
+        android:layout_marginBottom="10dp"
         android:background="@color/white" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/mipmap-mdpi/achievement.png b/app/src/main/res/mipmap-mdpi/achievement.png
new file mode 100644
index 00000000..f47ed297
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/achievement.png differ
diff --git a/app/version_code.properties b/app/version_code.properties
index c85ac0c9..87152c1d 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat May 29 16:57:18 CST 2021
-VERSION_CODE=787
+#Tue Jun 08 15:38:05 CST 2021
+VERSION_CODE=788