1 修复BUG

杨帅
1 parent a90484e2
Showing 11 changed files with 87 additions and 56 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
config.gradle
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.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/service/CollKeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/res/values/strings.xml
@@ -31,8 +31,8 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-//        String uid = "10535072";
-        String uid = "358916";
+        String uid = "10535072";
+//        String uid = "358916";
 //        String uid = "358689";
         findViewById(R.id.recordd).setOnClickListener(new View.OnClickListener() {
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.6.21",
+            version: "0.7.0",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -52,36 +52,46 @@
         android:required="true" />
     <application android:persistent="true">
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity"
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <service
             android:name="com.cnlive.moudle.pedometer.service.StepService"
@@ -183,7 +193,7 @@
             android:enabled="true"
             android:exported="true"
             android:priority="1000"
-            android:process=":re" />
+            android:process=":alive" />
         <service
             android:name="com.cnlive.moudle.collectionTrace.service.CollStepService"
             android:enabled="true"
@@ -221,22 +231,27 @@
         <activity
             android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
         <activity
             android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait" />
     </application>
@@ -534,7 +534,6 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         mLocClient = new LocationClient(getContext());
         mLocClient.registerLocationListener(myListener);
         LocationClientOption option = new LocationClientOption();
-        option.setOpenGps(true); // 打开gps
         //可选，设置返回经纬度坐标类型，默认GCJ02
         //GCJ02：国测局坐标；
         //BD09ll：百度经纬度坐标；
@@ -551,11 +550,11 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         //LocationMode. Device_Sensors：仅使用设备；
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);
         //可选，设置是否需要地址信息，默认不需要
-        option.setIsNeedAddress(true);
+        option.setIsNeedAddress(false);
         //可选，设置是否需要地址描述
-        option.setIsNeedLocationDescribe(true);
+        option.setIsNeedLocationDescribe(false);
         //需要POI信息
-        option.setIsNeedLocationPoiList(true);
+        option.setIsNeedLocationPoiList(false);
         //可选，设置是否需要设备方向结果
         option.setNeedDeviceDirect(false);
         //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
@@ -604,6 +603,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
             if (location == null || mMapView == null || getContext() == null) {
                 return;
             }
+
             //正在搜索GPS信号
             if (location.getGpsAccuracyStatus() == BDLocation.GPS_ACCURACY_UNKNOWN) {
                 if (fragment.binding.tvGpsPopBg.getVisibility() != View.VISIBLE) {
@@ -653,9 +653,9 @@ 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) {
-//                return;
-//            }
+            if (followMyLocation == null || followMyLocation.latitude == 0 || followMyLocation.longitude == 0) {
+                return;
+            }
             MapStatus.Builder builder = new MapStatus.Builder();
             mCurrentAccracy = location.getRadius();
             followMyLocation = new MyLocationData.Builder()
@@ -8,6 +8,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.os.Build;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
@@ -156,7 +157,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
      */
     public void checkIsHasRunningRace() {
         //先判断有没有数据
-        CollUserStepEntity userStepEntity = CollStepUtil.getCollUserStepData(getContext(), CommonInfo.getUserId(getContext()));
+        CollUserStepEntity userStepEntity = CollStepUtil.getCollUserStepData(getContext(), CollCommonInfo.getUserId(getContext()));
         if (null != userStepEntity) {
             //判断用户是否点击wanc
             if (0 == userStepEntity.getFinishTimeStamp()) {
@@ -259,7 +260,11 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         CollCommonInfo.setTsRunBaiduTraceService(context, true);
         CollCommonInfo.setIsWriteUserStep(context, true);
         Intent intent = new Intent(fragment.getActivity(), CollKeepLiveService.class);
-        ContextCompat.startForegroundService(fragment.getActivity(), intent);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            fragment.getActivity().startForegroundService(intent);
+        } else {
+            fragment.getActivity().startService(intent);
+        }
     }
@@ -448,7 +453,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                     MapStatus.Builder builder = new MapStatus.Builder();
                     builder.target(new LatLng(followMyLocation.latitude, followMyLocation.longitude)).zoom(DEFULT_ZOOM);
                     baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
-                    isFollowUserShow=false;
+                    isFollowUserShow = false;
                 }
             }
 //            if (location.hasAddr()) {
@@ -23,7 +23,7 @@ public class CollServiceReceiver extends BroadcastReceiver {
     private final String TAG = "CollServiceReceiver";
     public CollServiceReceiver() {
-
+        super();
     }
     public CollServiceReceiver(PowerManager.WakeLock wakeLock) {
@@ -72,7 +72,7 @@ public class CollServiceReceiver extends BroadcastReceiver {
                 }
                 Log.e(TAG, "启动KeepLiveService");
             } else {
-                Log.e(TAG, "KeepLiveService已经在运行");
+                Log.e(TAG, "collKeepLiveService已经在运行");
             }
             String action = intent.getAction();
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
@@ -19,6 +20,8 @@ import android.util.Log;
 import com.cnlive.moudle.collectionTrace.receivers.CollServiceReceiver;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
+import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.example.moudle_pedometer.R;
@@ -36,19 +39,19 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
     public static MediaPlayer mMediaPlayer;
     //广播
     private static CollServiceReceiver myReceiver;
-    private String CHANNEL_ONE_ID = "com.cnlive.keep";
-    private String CHANNEL_ONE_NAME = "KeepLive";
+    private String CHANNEL_ONE_ID = "com.cnlive.collkeep";
+    private String CHANNEL_ONE_NAME = "collKeepLive";
     private NotificationManager mNM;
     private Notification notification = null;
     //是否在后台运行
     public static boolean isKeepService = true;
     public static CollKeepLiveService instance;
-    private int startId;
     private final String TAG = "CollKeepLiveService";
     private Handler handler;
     private Runnable runnable;
     private boolean isRegisterReceiver = false;
     private boolean isStartForegroundService = false;
+    private final int NOTIFICATION_ID = 1;
     public CollKeepLiveService() {
     }
@@ -70,7 +73,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
                     handler.postDelayed(this, 5000);
                 } else {
                     try {
-                        if (myReceiver != null&&isRegisterReceiver) {
+                        if (myReceiver != null && isRegisterReceiver) {
                             unregisterReceiver(myReceiver);
                         }
                     } catch (Exception e) {
@@ -143,16 +146,15 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
                 }
             }
         }
-        this.startId = startId;
         //跨进程读取配置文件
         boolean isRun = CollCommonInfo.getIsRunKeepAliveService(getApplicationContext());
         if (isRun) {
+            showHideForegroundNotification();
+            startPlaySong();
             if (runnable != null) {
                 handler.postDelayed(runnable, 5000);
             }
-            showHideForegroundNotification();
-            startPlaySong();
         }
         return START_STICKY;
     }
@@ -205,21 +207,26 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
             channel.setLockscreenVisibility(NotificationCompat.VISIBILITY_PRIVATE);
             mNM.createNotificationChannel(channel);
         }
+        Intent notificationIntent = new Intent(this, CollRunningMapActivity.class);
         notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID)
+                .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0))
+                .setSmallIcon(R.mipmap.ic_launcher)
+//                .setCustomContentView(remoteViews)
                 .setContentTitle(getResources().getString(R.string.app_name))
-                .setContentText("正在记录您的运动")
-                .setWhen(System.currentTimeMillis())
+                .setContentText(getResources().getString(R.string.keep_service_tip))
+                .setCategory(Notification.CATEGORY_SERVICE)
                 .setSound(null)
+                .setWhen(System.currentTimeMillis())
                 .build();
         // 0 隐藏前台服务通知
-        startForeground(100, notification);
+        startForeground(NOTIFICATION_ID, notification);
         isStartForegroundService = true;
-//        stopForeground(true);
     }
     @Override
     public void onDestroy() {
         super.onDestroy();
+        Log.e(TAG, "onDestroy: ");
         try {
             if (myReceiver != null && isRegisterReceiver) {
                 unregisterReceiver(myReceiver);
@@ -268,7 +275,7 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple
     @Override
     public void onCompletion(MediaPlayer mediaPlayer) {
         boolean isRun = CollCommonInfo.getIsRunKeepAliveService(getApplicationContext());
-
+        Log.e(TAG, "onCompletion: 是否循环播放" + isRun);
         if (isRun) {
             Log.e(TAG, "重新播放");
             mediaPlayer.start();
@@ -36,6 +36,7 @@ import com.baidu.trace.model.OnTraceListener;
 import com.baidu.trace.model.PushMessage;
 import com.baidu.trace.model.StatusCodes;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.step.StepCount;
@@ -116,7 +117,7 @@ public class CollStepService extends Service implements SensorEventListener {
     private String userId;
     private Handler handler;
     private Runnable speedRunnable;
-    private final int NOTIFICATION_ID = 100;
+    private final int NOTIFICATION_ID = 101;
     //    private static int tempStep;//计步器临时保存步数
     private static boolean pauseFlag;//是否暂停
     private static int speedCurrentStep;//用于检测速度步数
@@ -372,6 +373,7 @@ public class CollStepService extends Service implements SensorEventListener {
     @SuppressLint("WrongConstant")
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this);
         }
@@ -437,13 +439,13 @@ public class CollStepService extends Service implements SensorEventListener {
         }
-        Intent notificationIntent = new Intent(this, PedometerMainActivity.class);
+        Intent notificationIntent = new Intent(this, CollRunningMapActivity.class);
         notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID)
                 .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0))
                 .setSmallIcon(R.mipmap.ic_launcher)
 //                .setCustomContentView(remoteViews)
                 .setContentTitle(getResources().getString(R.string.app_name))
-                .setContentText("正在记录您的运动")
+                .setContentText(getResources().getString(R.string.step_service_tip))
                 .setCategory(Notification.CATEGORY_SERVICE)
                 .setSound(null)
                 .setWhen(System.currentTimeMillis())
@@ -51,7 +51,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     private Runnable runnable;
     private boolean isRegisterReceiver = false;
     private boolean isStartForeground = false;
-
+    private final int NOTIFICATION_ID = 1;
     public KeepLiveService() {
     }
@@ -230,13 +230,13 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
                 .setSmallIcon(R.mipmap.ic_launcher)
 //                .setCustomContentView(remoteViews)
                 .setContentTitle(getResources().getString(R.string.app_name))
-                .setContentText("正在记录您的运动")
+                .setContentText(getResources().getString(R.string.keep_service_tip))
                 .setCategory(Notification.CATEGORY_SERVICE)
                 .setSound(null)
                 .setWhen(System.currentTimeMillis())
                 .build();
         // 0 隐藏前台服务通知
-        startForeground(100, notification);
+        startForeground(NOTIFICATION_ID, notification);
         isStartForeground=true;
     }
@@ -136,7 +136,7 @@ public class StepService extends Service implements SensorEventListener {
     private String userId;
     private Handler handler;
     private Runnable speedRunnable;
-    private final int NOTIFICATION_ID = 100;
+    private final int NOTIFICATION_ID = 102;
     //    private static int tempStep;//计步器临时保存步数
     private static boolean pauseFlag;//是否暂停
     private static int speedCurrentStep;//用于检测速度步数
@@ -619,7 +619,7 @@ public class StepService extends Service implements SensorEventListener {
                 .setSmallIcon(R.mipmap.ic_launcher)
 //                .setCustomContentView(remoteViews)
                 .setContentTitle(getResources().getString(R.string.app_name))
-                .setContentText("正在记录您的运动")
+                .setContentText(getResources().getString(R.string.step_service_tip))
                 .setCategory(Notification.CATEGORY_SERVICE)
                 .setSound(null)
                 .setWhen(System.currentTimeMillis())
@@ -94,4 +94,6 @@
     <string name="layout_coll_take_point_text">(打点)</string>
     <!--默认头像url-->
     <string name="default_face_url">http://wjj.ys1.cnliveimg.com/769/img/2018/0416/head_c.png</string>
+    <string name="step_service_tip">正在记录您的运动</string>
+    <string name="keep_service_tip">正在运行,请不要停止,否则无法记录您的轨迹</string>
 </resources>