Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

韩亚云
2 parents 52f94a04 801f67e2
Showing 14 changed files with 92 additions and 55 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/receivers/CollServiceReceiver.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/receivers/ServiceReceiver.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/CheckUtil.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/NotificationUtil.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.7.2",
+            version: "0.7.8",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -303,8 +303,8 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             public void onClick(View view) {
                 //先获取打点数量
                 int canTakePointCount = CollStepUtil.getCollImportPointSize(getContext(), CollCommonInfo.getUserId(getContext()));
-                if (0 == canTakePointCount) {
-                    AlertUtil.showDeftToast(getContext(), "您尚未打点,请打点后结束");
+                if (canTakePointCount<2) {
+                    AlertUtil.showDeftToast(getContext(), "请至少打两个点后结束");
                 } else {
                     if (null != followMyLocation) {
                         currentImportLatLng = new LatLng(followMyLocation.latitude, followMyLocation.longitude);
@@ -653,28 +653,31 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     fragment.binding.ivGpsState.setBackground(getContext().getResources().getDrawable(R.drawable.rt_training_gps_3));
                 }
             }
-            if (followMyLocation == null || followMyLocation.latitude == 0 || followMyLocation.longitude == 0) {
+            //过滤定位精度
+            if (location.getRadius() > Constant.LOCA_ACCURACY) {
                 return;
             }
-            MapStatus.Builder builder = new MapStatus.Builder();
-            mCurrentAccracy = location.getRadius();
-            followMyLocation = new MyLocationData.Builder()
-                    .accuracy(location.getRadius())
-                    // 此处设置开发者获取到的方向信息，顺时针0-360
-                    .direction(mCurrentDirection).latitude(location.getLatitude())
-                    .longitude(location.getLongitude()).build();
             //第一次定位
             if (isFirstLoc) {
                 isFirstLoc = false;
+                mCurrentAccracy = location.getRadius();
+                followMyLocation = new MyLocationData.Builder()
+                        .accuracy(location.getRadius())
+                        // 此处设置开发者获取到的方向信息，顺时针0-360
+                        .direction(mCurrentDirection).latitude(location.getLatitude())
+                        .longitude(location.getLongitude()).build();
                 baiduMap.setMyLocationData(followMyLocation);
+                MapStatus.Builder builder = new MapStatus.Builder();
                 builder.target(new LatLng(followMyLocation.latitude, followMyLocation.longitude)).zoom(DEFULT_ZOOM);
                 baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
             } else {
                 //不是第一次定位状态
-                //过滤定位精度
-                if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    return;
-                }
+                mCurrentAccracy = location.getRadius();
+                followMyLocation = new MyLocationData.Builder()
+                        .accuracy(location.getRadius())
+                        // 此处设置开发者获取到的方向信息，顺时针0-360
+                        .direction(mCurrentDirection).latitude(location.getLatitude())
+                        .longitude(location.getLongitude()).build();
                 if (null != currentWalkPoints) {
                     if (currentWalkPoints.size() > 0) {
                         //进行判断
@@ -689,7 +692,6 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     currentWalkPoints.add(new LatLng(location.getLatitude(),
                             location.getLongitude()));
                 }
-
                 //判断当前集合列表是否可以划线(至少两个点)
                 if (currentWalkPoints != null && currentWalkPoints.size() > 1) {
                     //判断当前是否已经在地图上画点
@@ -204,7 +204,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
             startLocation.setPointName(eventShoeLinesBean.getStartLocation());
             startLocation.setLatitude(0);
             startLocation.setLongitude(0);
-        }else {
+        } else {
             startLocation = new CollectPoint();
             startLocation.setPointName("");
             startLocation.setLatitude(0);
@@ -217,7 +217,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
             endLocation.setPointName(eventShoeLinesBean.getEndLocation());
             endLocation.setLatitude(0);
             endLocation.setLongitude(0);
-        }else {
+        } else {
             endLocation = new CollectPoint();
             endLocation.setPointName("");
             endLocation.setLatitude(0);
@@ -253,7 +253,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
         //设置用户头像
         if (!TextUtils.isEmpty(eventShoeLinesBean.getUserMsg().getImage())) {
             GlideApp.with(getContext()).load(eventShoeLinesBean.getUserMsg().getImage()).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
-        }else {
+        } else {
             GlideApp.with(getContext()).load(getContext().getResources().getString(R.string.default_face_url)).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
         }
         //设置用户行走公里
@@ -414,7 +414,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
         if (5102 == createFenceResponse.getStatus()) {
             QMUITipDialogUtil.dismessDialog();
             QMUITipDialogUtil.failedDialog(fragment.getActivity(), createFenceResponse.getMessage(), 1);
-        } else {
+        } else if (0 == createFenceResponse.getStatus()) {
             if (null != eventShoeLinesBean) {
                 QMUITipDialogUtil.dismessDialog();
                 if (null == fragment.getPresenter() || null == getContext()) {
@@ -422,6 +422,9 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                 }
                 fragment.getPresenter().bindingShoeLine(getContext(), eventShoeLinesBean.getId(), eventShoeLinesBean.getEventId(), createFenceResponse.getFenceId() + "", eventShoeLinesBean.getEventName(), position);
             }
+        } else {
+            QMUITipDialogUtil.dismessDialog();
+            QMUITipDialogUtil.failedDialog(fragment.getActivity(), createFenceResponse.getMessage(), 1);
         }
     }
@@ -347,8 +347,6 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         option.setCoorType("gcj02"); // 设置坐标类型
         //可选，默认false，设置是否开启Gps定位
         option.setOpenGps(true);
-        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者，该模式下开发者无需再关心定位间隔是多少，定位SDK本身发现位置变化就会及时回调给开发者
-        option.setOpenAutoNotifyMode();
         //可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
         //可选，设置是否需要地址信息，默认不需要
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.media.AudioManager;
 import android.os.Build;
 import android.os.PowerManager;
 import android.util.Log;
@@ -35,6 +36,9 @@ public class CollServiceReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         Log.e(TAG, "接收到广播:" + intent.getAction());
+        if (null!=context){
+            initSound(context);
+        }
         //todo 这里判断要保活的服务
         boolean isRunStepService = CollCommonInfo.getIsRunStepService(context);
         if (isRunStepService) {
@@ -97,7 +101,16 @@ public class CollServiceReceiver extends BroadcastReceiver {
         }
     }
-
+    private void initSound(Context context) {
+        try {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+            if (0 == currentVolume) {
+                audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, 1, AudioManager.FLAG_PLAY_SOUND);
+            }
+        } catch (Exception e) {
+        }
+    }
 //    /**
 //     * 发送关闭广播
 //     */
@@ -71,7 +71,7 @@ public class CollRunRaceDetailActivity extends QMUIFragmentActivity {
         super.onResume();
         boolean isSet = CheckUtil.isIgnoringBatteryOptimizationss(this);
         if (!isSet) {
-            isSet = CheckUtil.isIgnoringBatteryOptimizationss(this);
+            CheckUtil.toSetIgnore(this);
         }
     }
@@ -75,11 +75,13 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
             } else {
                 boolean isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(StartCollectTraceActivity.this);
                 if (!isSetBattery) {
-                    isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(StartCollectTraceActivity.this);
+                    CheckUtil.toSetIgnore(this);
                 } else {
                     getPermissionsWithTip();
                 }
             }
+        } else {
+            NotificationUtil.goToSettingNo(this);
         }
     }
@@ -135,7 +135,7 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
         if(millseconds < System.currentTimeMillis()){
             String birthday = DateTimeUtil.formatDateTime(millseconds, "yyyy-MM-dd");
             CommonInfo.setBirthday(fragment.getActivity(),birthday,userId);
-            fragment.binding.birthday.setText(DateTimeUtil.formatDateTime(millseconds, "yyyy-MM-dd"));
+            fragment.binding.birthday.setText(birthday);
         }else {
             AlertUtil.showDeftToast(fragment.getActivity(),"无法选择该日期");
         }
@@ -641,8 +641,7 @@ public class RunMainFragmentView implements MvpView {
         Log.e(TAG, "setSQLPauseTime: ");
 //        if (needWriteDataFlag) {
         //将当前计时器时间戳写入数据库
-        if (!TextUtils.isEmpty(id)) {
-            UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), uid);
+            UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), id);
             if (userStepEntity != null) {
                 userStepEntity.setChronometerBase(fragment.binding.chronometer.getBase());
                 //设置当前暂停的时间戳
@@ -654,7 +653,6 @@ public class RunMainFragmentView implements MvpView {
                 //更新数据
                 StepUtil.updateStepData(fragment.getActivity(), userStepEntity);
             }
-        }
 //        }
     }
@@ -397,7 +397,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             MapStatus.Builder builder = new MapStatus.Builder();
             //不是第一次定位状态
             if (!isFirstLoc) {
-                if (currentPoints.size() > 0) {
+                if (null != currentPoints && currentPoints.size() > 0) {
                     //进行判断
                     LatLng lastLatLng = currentPoints.get(currentPoints.size() - 1);
                     LatLng curLatLng = new LatLng(location.getLatitude(),
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.media.AudioManager;
 import android.os.Build;
 import android.os.PowerManager;
 import android.util.Log;
@@ -36,6 +37,9 @@ public class ServiceReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         Log.e(TAG, "接收到广播:" + intent.getAction());
+        if (null != context) {
+            initSound(context);
+        }
         //todo 这里判断要保活的服务
         boolean isRunStepService = CommonInfo.getIsRunStepService(context);
         if (isRunStepService) {
@@ -45,7 +49,7 @@ public class ServiceReceiver extends BroadcastReceiver {
                 } else {
                     context.startService(new Intent(context, StepService.class));
                 }
-            }else {
+            } else {
                 Log.e(TAG, "计步服务已经在运行");
             }
@@ -56,7 +60,7 @@ public class ServiceReceiver extends BroadcastReceiver {
                     if (StepService.mClient != null && StepService.mTrace != null && StepService.traceListener != null) {
                         StepService.mClient.startTrace(StepService.mTrace, StepService.traceListener);
                     }
-                }else {
+                } else {
                     Log.e(TAG, "鹰眼服务已经在运行");
                 }
@@ -99,6 +103,16 @@ public class ServiceReceiver extends BroadcastReceiver {
         }
     }
+    private void initSound(Context context) {
+        try {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+            if (0 == currentVolume) {
+                audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, 1, AudioManager.FLAG_PLAY_SOUND);
+            }
+        } catch (Exception e) {
+        }
+    }
 //    /**
 //     * 发送关闭广播
 //     */
@@ -142,11 +142,13 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
             } else {
                 boolean isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
                 if (!isSetBattery) {
-                    isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
+                    CheckUtil.toSetIgnore(this);
                 } else {
                     getPermissionsWithTip();
                 }
             }
+        }else {
+            NotificationUtil.goToSettingNo(this);
         }
     }
@@ -7,6 +7,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.PowerManager;
 import android.provider.Settings;
+import android.widget.Toast;
 import com.cnlive.libs.base.util.AlertUtil;
@@ -21,27 +22,34 @@ public class CheckUtil {
      * @return
      */
     public static boolean isIgnoringBatteryOptimizationss(Activity context) {
-        String carrier = android.os.Build.MANUFACTURER;
-        if (!"smartisan".equals(carrier)) {
-            PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-                boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
-                if (!hasIgnored) {
-                    Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                    intent.setData(Uri.parse("package:" + context.getPackageName()));
-                    PackageManager pm = context.getPackageManager();
-                    if (intent.resolveActivity(pm) != null) {
-                        context.startActivity(intent);
-                    }
-                    AlertUtil.showDeftToast(context, "请选择允许加入电池优化白名单,否则将会影响您的正常使用!");
-                    return false;
-                } else {
-                    return true;
+        try {
+            String carrier = android.os.Build.MANUFACTURER;
+            if (!"smartisan".equals(carrier)) {
+                PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+                    return hasIgnored;
                 }
+            } else {
+                return true;
             }
-        } else {
+            return false;
+        } catch (Exception e) {
             return true;
         }
-        return false;
+    }
+
+    public static void toSetIgnore(Activity context) {
+        try {
+            Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+            intent.setData(Uri.parse("package:" + context.getPackageName()));
+            PackageManager pm = context.getPackageManager();
+            if (intent.resolveActivity(pm) != null) {
+                context.startActivity(intent);
+                AlertUtil.showDeftToast(context, "请选择允许加入电池优化白名单,否则将会影响您的正常使用!");
+
+            }
+        } catch (Exception e) {
+        }
     }
 }
@@ -20,13 +20,10 @@ public class NotificationUtil {
         //监测通知权限是否打开
         notificationManagerCompat = NotificationManagerCompat.from(activity);
         isOpen = notificationManagerCompat.areNotificationsEnabled();
-        if (!isOpen) {
-            goToSettingNo(activity);
-        }
         return isOpen;
     }
-    private static void goToSettingNo(Activity activity) {
+    public static void goToSettingNo(Activity activity) {
         Toast.makeText(activity, "您尚未开启通知权限,无法进行计步", Toast.LENGTH_LONG).show();
         Intent intent1 = new Intent();
         try {