1 修复vivo手机步数暴增的问题

YangShuai
1 parent 51a32df2
Showing 6 changed files with 25 additions and 25 deletions
config.gradle
gradle.properties
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/ChineseToSpeechUtil.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.14-beta1",
+            version: "1.0.14-beta2",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -13,4 +13,5 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 #android.useAndroidX=true
 #android.enableJetifier=true
+android.injected.testOnly=false
@@ -57,7 +57,7 @@ import java.util.Date;
 public class CollStepService extends Service implements SensorEventListener {
-    private String TAG = "StepService";
+    private String TAG = "CollStepService";
     /**
      * 通知栏相关
      */
@@ -819,17 +819,17 @@ public class CollStepService extends Service implements SensorEventListener {
     private void addCountStepListener() {
         if (sensorManager == null) return;
         Sensor countSensor = null;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-            countSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER,true);
-        }else {
-            countSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER);
-        }
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+//            countSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER,true);
+//        }else {
+        countSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER);
+//        }
         Sensor detectorSensor = null;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-            detectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_DETECTOR,true);
-        }else {
-            detectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_DETECTOR);
-        }
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+//            detectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_DETECTOR,true);
+//        }else {
+        detectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_DETECTOR);
+//        }
         if (countSensor != null) {
             stepSensorType = Sensor.TYPE_STEP_COUNTER;
             Log.v(TAG, "Sensor.TYPE_STEP_COUNTER");
@@ -48,6 +48,7 @@ public class Constant {
     public static final int COLL_GEORESULT_RADIUS = 20;//打点逆地理半径
     public static final int WEBVIEW_FONT_SIZE = 40;//webview显示的网页文字大小
     public static final int Need_ZOOM_IN_RADUIS = 100;//需要扩大精度范围
-    public static final int MINI_USER_STEP_COUNT = 100;//用户必须走的最小步数
+//    public static final int MINI_USER_STEP_COUNT = 100;//用户必须走的最小步数
+    public static final int MINI_USER_STEP_COUNT = -1;//用户必须走的最小步数
 }
@@ -1009,17 +1009,17 @@ public class StepService extends Service implements SensorEventListener {
     private void addCountStepListener() {
         if (sensorManager == null) return;
         Sensor countSensor = null;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-            countSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER, true);
-        } else {
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+//            countSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER, true);
+//        } else {
             countSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER);
-        }
+//        }
         Sensor detectorSensor = null;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-            detectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_DETECTOR, true);
-        } else {
+//        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
+//            detectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_DETECTOR, true);
+//        } else {
             detectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_STEP_DETECTOR);
-        }
+//        }
         if (countSensor != null) {
             stepSensorType = Sensor.TYPE_STEP_COUNTER;
             Log.v(TAG, "Sensor.TYPE_STEP_COUNTER");
@@ -11,7 +11,6 @@ public class ChineseToSpeechUtil {
     public static synchronized void speech(Context context, String text) {
-        destroy();
         if (textToSpeech == null) {
             textToSpeech = new TextToSpeech(context, new TextToSpeech.OnInitListener() {
                 @Override
@@ -31,19 +30,18 @@ public class ChineseToSpeechUtil {
                     }
                 }
             });
-        }else {
+        } else {
             textToSpeech.speak(text, TextToSpeech.QUEUE_FLUSH, null);
         }
-
     }
     public static void destroy() {
         if (textToSpeech != null) {
             textToSpeech.stop();
             textToSpeech.shutdown();
-            textToSpeech=null;
+            textToSpeech = null;
         }
     }