1 修复BUG

杨帅
1 parent 7344d6b7
Showing 23 changed files with 141 additions and 84 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
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/RaceNameListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollPedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunningMapActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollTraceListDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceNameListActivity.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/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ALLScoreDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/OnGoingActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
@@ -5,6 +5,13 @@ import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.search.geocode.GeoCodeResult;
+import com.baidu.mapapi.search.geocode.GeoCoder;
+import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
+import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption;
+import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
@@ -44,19 +51,25 @@ public class MainActivity extends AppCompatActivity {
             }
         });
-//        RunLineActivity.newInstance(this,null,null,null);
-//        Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
-//        startActivity(intent);
-//        ARouter.getInstance()
-////                .build("/moudle_pedometer/InterestActivity")
-//                .build("/moudle_pedometer/CollRunRaceDetailActivity")
-//                .navigation(this);
-//        finish();
-//        BottomSheetDialog bottomSheetDialog=new BottomSheetDialog(this);
-//        View view=getLayoutInflater().inflate(R.layout.dialog_start_tip_bottomsheet,null);
-//        bottomSheetDialog.setContentView(view);
-//        bottomSheetDialog.show();
-//        bottomSheetDialog.setCancelable(false);
+//        GeoCoder mSearch = null; // 搜索模块，也可去掉地图模块独立使用
+//        mSearch = GeoCoder.newInstance();
+//        mSearch.setOnGetGeoCodeResultListener(new OnGetGeoCoderResultListener() {
+//            @Override
+//            public void onGetGeoCodeResult(GeoCodeResult geoCodeResult) {
+//                AlertUtil.showDeftToast(getApplicationContext(),geoCodeResult.getAddress());
+//            }
+//
+//            @Override
+//            public void onGetReverseGeoCodeResult(ReverseGeoCodeResult reverseGeoCodeResult) {
+//                AlertUtil.showDeftToast(getApplicationContext(),reverseGeoCodeResult.getAddress());
+//
+//            }
+//        });
+//        mSearch.reverseGeoCode(new ReverseGeoCodeOption()
+//                .location(new LatLng(39.933946, 116.309374))
+//                .pageSize(1)
+//                .pageNum(100)
+//                .radius(10));
     }
 }
@@ -669,7 +669,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             if (isFirstLoc) {
                 isFirstLoc = false;
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(), "当前定位误差为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
             } else {
                 //过滤定位精度
@@ -171,6 +171,11 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
         fragment.binding.rlScrollViewStartBtn.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
+                if (null != fragment.binding.rlScrollViewStartBtn.getTag()) {
+                    if ("1".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
+                        return false;
+                    }
+                }
                 if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
                     //判断是否成功查询到轨迹点
                     if (null == queryResultPoints) {
@@ -214,7 +219,9 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                         });
                         selectDialog.setCanceledOnTouchOutside(false);
                         selectDialog.setCancelable(false);
-                        selectDialog.show();
+                        if (!selectDialog.isShowing()) {
+                            selectDialog.show();
+                        }
                     }
                 }
                 return false;
@@ -298,18 +305,14 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
      * 屏蔽上传轨迹按钮
      */
     public void limitUploadBtnTouch() {
-        fragment.binding.rlScrollViewStartBtn.setFocusable(false);
-        fragment.binding.rlScrollViewStartBtn.setClickable(false);
-        fragment.binding.rlScrollViewStartBtn.setFocusableInTouchMode(false);
+        fragment.binding.rlScrollViewStartBtn.setTag("1");
     }
     /**
      * 允许上传轨迹按钮
      */
     public void allowUploadBtnTouch() {
-        fragment.binding.rlScrollViewStartBtn.setFocusable(true);
-        fragment.binding.rlScrollViewStartBtn.setClickable(true);
-        fragment.binding.rlScrollViewStartBtn.setFocusableInTouchMode(true);
+        fragment.binding.rlScrollViewStartBtn.setTag("0");
     }
     private void queryWalkTrace(long startTime, long endTime) {
@@ -348,6 +351,7 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
     }
     private void getBaiDuSnap() {
+        limitUploadBtnTouch();
         baiduMap.snapshot(new BaiduMap.SnapshotReadyCallback() {
             @Override
             public void onSnapshotReady(Bitmap bitmap) {
@@ -619,8 +619,10 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     currentLine = MyMapUtil.drawMapLine(getContext(), baiduMap, currentWalkPoints, R.color.green_round);
                 }
             }
-            if (null != location.getPoiList() && null != location.getPoiList().get(0)) {
-                currentAddress = location.getPoiList().get(0).getName();
+            if (location.hasAddr()) {
+                if (!TextUtils.isEmpty(location.getAddress().address)) {
+                    currentAddress = location.getAddress().address;
+                }
             }
             if (TextUtils.isEmpty(currentAddress)) {
                 if (null != location.getAddress()) {
@@ -278,7 +278,7 @@ public class CollTraceListDetailFragmentView implements MvpView, OnFenceListener
                             //获取打点不为空
-                            if (null != finalResultCollectPoints && finalResultCollectPoints.size() > 1) {
+                            if (null != finalResultCollectPoints && finalResultCollectPoints.size() > 0) {
                                 //开始在地图上绘制打点信息
                                 for (int i = 0; i < finalResultCollectPoints.size(); i++) {
                                     LatLng latLng = new LatLng(finalResultCollectPoints.get(i).getLatitude(), finalResultCollectPoints.get(i).getLongitude());
@@ -106,7 +106,7 @@ public class RaceNameListView implements MvpView, OnFenceListener {
     public void delectShoeLine(int position) {
         list.remove(position);
-        if(list.size() == 0){
+        if (list.size() == 0) {
             showEmpty();
         }
         adapter.notifyDataSetChanged();
@@ -163,13 +163,13 @@ public class RaceNameListView implements MvpView, OnFenceListener {
                                 //先校验
                                 fragment.getPresenter().checkShoeLine(fragment.getActivity(), eventShoeLinesBean.getId(), eventShoeLinesBean.getEventId(), new RaceNameListPresenter.CallBack() {
                                     @Override
-                                    public void onSuccess(String fenceId, String entityName,String isDelete) {
+                                    public void onSuccess(String fenceId, String entityName, String isDelete) {
                                         if (null == fragment.getActivity()) {
                                             return;
                                         }
-                                        if(isDelete != null && isDelete.equals("1")){
+                                        if (isDelete != null && isDelete.equals("1")) {
                                             delectShoeLine(position);
-                                            AlertUtil.showLongToast(fragment.getActivity(),"该轨迹已被删除，不能进行绑定",2000);
+                                            AlertUtil.showLongToast(fragment.getActivity(), "该轨迹已被删除，不能进行绑定", 2000);
                                             return;
                                         }
                                         //判断是否为空
@@ -333,11 +333,14 @@ public class RaceNameListView implements MvpView, OnFenceListener {
         if (5102 == createFenceResponse.getStatus()) {
             QMUITipDialogUtil.dismessDialog();
             QMUITipDialogUtil.failedDialog(fragment.getActivity(), createFenceResponse.getMessage(), 1);
-        } else {
+        } else if (0 == createFenceResponse.getStatus()) {
             if (null != currentSelBean && -1 != currentSelPos) {
                 QMUITipDialogUtil.dismessDialog();
                 fragment.addShoeLine(currentSelBean, createFenceResponse.getFenceId() + "", currentSelPos);
             }
+        }else {
+            QMUITipDialogUtil.dismessDialog();
+            QMUITipDialogUtil.failedDialog(fragment.getActivity(), createFenceResponse.getMessage(), 1);
         }
     }
@@ -407,7 +407,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
             }
             if (isFirstLoc) {
                 isFirstLoc = false;
-                Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getContext(), "当前定位误差为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
             }
 //                if (location.getRadius() > Constant.LOCA_ACCURACY) {
@@ -424,8 +424,10 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                     // 此处设置开发者获取到的方向信息，顺时针0-360
                     .direction(location.getDirection()).latitude(location.getLatitude())
                     .longitude(location.getLongitude()).build();
-            if (null != location.getPoiList() && null != location.getPoiList().get(0)) {
-                currentAddress = location.getPoiList().get(0).getName();
+            if (location.hasAddr()) {
+                if (!TextUtils.isEmpty(location.getAddress().address)) {
+                    currentAddress = location.getAddress().address;
+                }
             }
             if (isShowFollowAddress && selectDialog != null && !selectDialog.isShowing()) {
                 if (!TextUtils.isEmpty(currentAddress)) {
@@ -144,6 +144,8 @@ public class CollStepService extends Service implements SensorEventListener {
      */
     public static Trace mTrace = null;
+    private boolean isStartForeground = false;
+
     public CollStepService() {
     }
@@ -229,7 +231,7 @@ public class CollStepService extends Service implements SensorEventListener {
                     if (mClient != null) {
                         retryIndex = 0;
                         mClient.startGather(traceListener);
-                        Log.e(TAG, "开启轨迹服务" );
+                        Log.e(TAG, "开启轨迹服务");
 //                        Toast.makeText(getApplicationContext(), "开启轨迹服务", Toast.LENGTH_LONG).show();
                         boolean isFirstSendNotification = CollCommonInfo.getIsFirstStepSendTraceTip(getApplicationContext());
                         if (isFirstSendNotification) {
@@ -274,7 +276,7 @@ public class CollStepService extends Service implements SensorEventListener {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.CACHE_TRACK_NOT_UPLOAD == errorNo) {
                     if (mClient != null) {
                         mClient.stopTrace(mTrace, traceListener);
-                        Log.e(TAG, "停止轨迹服务" );
+                        Log.e(TAG, "停止轨迹服务");
 //                        Toast.makeText(getApplicationContext(), "停止轨迹服务", Toast.LENGTH_LONG).show();
                     }
                 }
@@ -295,7 +297,7 @@ public class CollStepService extends Service implements SensorEventListener {
                 Log.e(TAG, "onStartGatherCallback: " + message + "," + errorNo);
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STARTED == errorNo) {
                     retryIndex = 0;
-                    Log.e(TAG, "开始采集" );
+                    Log.e(TAG, "开始采集");
 //                    Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
                 } else {
                     //重新开启采集
@@ -323,7 +325,7 @@ public class CollStepService extends Service implements SensorEventListener {
             @Override
             public void onStopGatherCallback(int errorNo, String message) {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STOPPED == errorNo) {
-                    Log.e(TAG, "停止采集" );
+                    Log.e(TAG, "停止采集");
 //                    Toast.makeText(getApplicationContext(), "停止采集", Toast.LENGTH_LONG).show();
                     if (mClient != null) {
                         mClient.stopTrace(mTrace, traceListener);
@@ -448,6 +450,7 @@ public class CollStepService extends Service implements SensorEventListener {
                 .build();
 //        remoteViews.setChronometer(R.id.ch, aa, null, true);
         startForeground(NOTIFICATION_ID, notification);
+        isStartForeground = true;
     }
@@ -462,8 +465,10 @@ public class CollStepService extends Service implements SensorEventListener {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        //取消前台进程
-        stopForeground(true);
+        if (isStartForeground) {
+            //取消前台进程
+            stopForeground(true);
+        }
         if (mBatInfoReceiver != null) {
             unregisterReceiver(mBatInfoReceiver);
         }
@@ -51,8 +51,9 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
         super.onCreate(savedInstanceState);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
 //        setContentView(R.layout.activity_pedometer_main);
-        runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-
+        if (null != getIntent().getExtras()) {
+            runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
+        }
     }
@@ -21,9 +21,11 @@ public class CollRunningMapActivity extends QMUIFragmentActivity {
         super.onCreate(savedInstanceState);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
-        RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-        if (runRaceDetailInfo != null) {
-            addFragment(runRaceDetailInfo);
+        if (null != getIntent().getExtras()) {
+            RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
+            if (runRaceDetailInfo != null) {
+                addFragment(runRaceDetailInfo);
+            }
         }
     }
@@ -26,11 +26,13 @@ public class CollTraceListDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getIntent().getExtras().get("eventShoeLinesBean");
-        String fenceEntityName = getIntent().getExtras().getString("fenceEntityName");
-        String position= getIntent().getExtras().getString("position");
-        if (null != eventShoeLinesBean) {
-            addFragment(CollTraceListDetailFragment.newInstance(eventShoeLinesBean,position));
+        if (null != getIntent().getExtras()) {
+            eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getIntent().getExtras().get("eventShoeLinesBean");
+            String fenceEntityName = getIntent().getExtras().getString("fenceEntityName");
+            String position = getIntent().getExtras().getString("position");
+            if (null != eventShoeLinesBean) {
+                addFragment(CollTraceListDetailFragment.newInstance(eventShoeLinesBean, position));
+            }
         }
     }
@@ -31,9 +31,11 @@ public class RaceNameListActivity extends AppCompatActivity {
         StatusBarUtil.setStatusBarWrite(this);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.white), 0);
         setContentView(R.layout.activity_race_name_list);
-        RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-        if (null != runRaceDetailInfo) {
-            getSupportFragmentManager().beginTransaction().replace(R.id.race_container, RaceNameListFragment.newInstance(getIntent().getStringExtra("eventId"), runRaceDetailInfo)).commit();
+        if (null != getIntent().getExtras()) {
+            RunRaceDetailInfo runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
+            if (null != runRaceDetailInfo) {
+                getSupportFragmentManager().beginTransaction().replace(R.id.race_container, RaceNameListFragment.newInstance(getIntent().getStringExtra("eventId"), runRaceDetailInfo)).commit();
+            }
         }
     }
 }
@@ -27,7 +27,7 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
     private PermissionsUtils mPermissionsUtils;//权限申请
     private RunRaceDetailInfo runRaceDetailInfo;
-    public static void newInstance(Context context, String eventId,RunRaceDetailInfo runRaceDetailInfo) {
+    public static void newInstance(Context context, String eventId, RunRaceDetailInfo runRaceDetailInfo) {
         CollCommonInfo.setStreetId(context, eventId);
         Intent intent = new Intent(context, StartCollectTraceActivity.class);
         intent.putExtra("eventId", eventId);
@@ -46,8 +46,9 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
         mPermissionsUtils = new PermissionsUtils();
         StatusBarUtil.setStatusBarWrite(this);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.white), 0);
-        runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
-
+        if (null != getIntent().getExtras()) {
+            runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().getSerializable("runRaceDetailInfo");
+        }
     }
@@ -1146,7 +1146,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             if (isFirstLoc) {
                 isFirstLoc = false;
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(), "当前定位误差为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
             } else {
@@ -318,7 +318,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
             if (isFirstLoc) {
                 isFirstLoc = false;
                 if (location.getRadius() > Constant.LOCA_ACCURACY) {
-                    Toast.makeText(getContext(), "当前定位精度为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(), "当前定位误差为:" + location.getRadius() + "米,请您移动至空旷地带!", Toast.LENGTH_SHORT).show();
                 }
@@ -50,6 +50,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     private Handler handler;
     private Runnable runnable;
     private boolean isRegisterReceiver = false;
+    private boolean isStartForeground = false;
     public KeepLiveService() {
     }
@@ -86,7 +87,9 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
                         Log.e(TAG, "run: ");
                     }
                     stopPlaySong();
-                    stopForeground(true);
+                    if (isStartForeground) {
+                        stopForeground(true);
+                    }
                 }
             }
@@ -234,6 +237,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
                 .build();
         // 0 隐藏前台服务通知
         startForeground(100, notification);
+        isStartForeground=true;
     }
     @Override
@@ -24,9 +24,11 @@ public class ALLScoreDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        RunningFinishBean runningFinishBean = (RunningFinishBean) getIntent().getExtras().getSerializable("runningFinishBean");
-        if (runningFinishBean != null) {
-            addFragment(ALLScoreDetailFragment.newInstance(runningFinishBean));
+        if (null != getIntent().getExtras()) {
+            RunningFinishBean runningFinishBean = (RunningFinishBean) getIntent().getExtras().getSerializable("runningFinishBean");
+            if (runningFinishBean != null) {
+                addFragment(ALLScoreDetailFragment.newInstance(runningFinishBean));
+            }
         }
     }
@@ -22,9 +22,11 @@ public class OnGoingActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        String eventId = getIntent().getExtras().getString("eventId");
-        if (null != eventId) {
-            addFragment(OnGoingFragment.newInstance(eventId));
+        if (null != getIntent().getExtras()) {
+            String eventId = getIntent().getExtras().getString("eventId");
+            if (null != eventId) {
+                addFragment(OnGoingFragment.newInstance(eventId));
+            }
         }
     }
@@ -47,11 +47,13 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (null != getIntent().getExtras().get("runRaceDetailInfo")) {
-            runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().get("runRaceDetailInfo");
-            if (getCurrentFragment() == null) {
-                if (runRaceDetailInfo != null) {
-                    addFragment(runRaceDetailInfo);
+        if (null != getIntent().getExtras()) {
+            if (null != getIntent().getExtras().get("runRaceDetailInfo")) {
+                runRaceDetailInfo = (RunRaceDetailInfo) getIntent().getExtras().get("runRaceDetailInfo");
+                if (getCurrentFragment() == null) {
+                    if (runRaceDetailInfo != null) {
+                        addFragment(runRaceDetailInfo);
+                    }
                 }
             }
         }
@@ -75,14 +75,16 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (getIntent().getStringExtra("eventId") != null) {
-            eventId = getIntent().getStringExtra("eventId");
-        }
-        if (getIntent().getStringExtra("userId") != null) {
-            CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
-            CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
-            CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
-            CommonInfo.setUserPhone(this, getIntent().getStringExtra("userPhone"));
+        if (null != getIntent().getExtras()) {
+            if (getIntent().getStringExtra("eventId") != null) {
+                eventId = getIntent().getStringExtra("eventId");
+            }
+            if (getIntent().getStringExtra("userId") != null) {
+                CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
+                CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
+                CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
+                CommonInfo.setUserPhone(this, getIntent().getStringExtra("userPhone"));
+            }
         }
         initPermissionDefineTip();
         //判断用户是否结束运动
@@ -32,8 +32,10 @@ public class RunningFinishActivity extends QMUIFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
-        if (getIntent().getSerializableExtra("runningFinishBean") != null) {
-            addFragment((RunningFinishBean) getIntent().getSerializableExtra("runningFinishBean"));
+        if (null != getIntent().getExtras()) {
+            if (getIntent().getSerializableExtra("runningFinishBean") != null) {
+                addFragment((RunningFinishBean) getIntent().getSerializableExtra("runningFinishBean"));
+            }
         }
@@ -27,9 +27,11 @@ public class RunningMapActivity extends QMUIFragmentActivity {
         super.onCreate(savedInstanceState);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
-        RunningMapBean chronometerBean = (RunningMapBean) getIntent().getExtras().getSerializable("runningMapBean");
-        if (chronometerBean != null) {
-            addFragment(chronometerBean);
+        if (null != getIntent().getExtras()) {
+            RunningMapBean chronometerBean = (RunningMapBean) getIntent().getExtras().getSerializable("runningMapBean");
+            if (chronometerBean != null) {
+                addFragment(chronometerBean);
+            }
         }
     }
@@ -21,17 +21,21 @@ public class UploadFailDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        FailedEntity failedEntity = (FailedEntity) getIntent().getExtras().getSerializable("failedEntity");
-        if (failedEntity != null) {
-            addFragment(UploadFailDetailFragment.newInstance(failedEntity));
+        if (null != getIntent().getExtras()) {
+            FailedEntity failedEntity = (FailedEntity) getIntent().getExtras().getSerializable("failedEntity");
+            if (failedEntity != null) {
+                addFragment(UploadFailDetailFragment.newInstance(failedEntity));
+            }
         }
     }
+
     private void addFragment(QMUIFragment fragment) {
         getSupportFragmentManager().beginTransaction()
                 .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
                 .addToBackStack(fragment.getClass().getSimpleName())
                 .commit();
     }
+
     public static void startActivity(Activity activity, FailedEntity failedEntity) {
         Intent intent = new Intent(activity, UploadFailDetailActivity.class);
         intent.putExtra("failedEntity", (Serializable) failedEntity);