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

# Conflicts: # config.gradle

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer
# Conflicts: # config.gradle
韩亚云
2 parents 723140fe 40e6c5a3
Showing 6 changed files with 44 additions and 25 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RegistrationInfoActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
@@ -20,23 +20,23 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
+        String uid = "358916";
         findViewById(R.id.recordd).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RunLineActivity.newInstance(MainActivity.this,"358916",null,null,null);
+                RunLineActivity.newInstance(MainActivity.this, uid, null, null, null);
             }
         });
         findViewById(R.id.tooll).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RaceListActivity.newInstance(MainActivity.this,"358916",null,null);
+                RaceListActivity.newInstance(MainActivity.this, uid, null, null);
             }
         });
         findViewById(R.id.tool2).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                SelfRecordActivity.newInstance(MainActivity.this, "358916",null,null,null);
+                SelfRecordActivity.newInstance(MainActivity.this, uid, null, null, null);
             }
         });
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.4.5",
+            version: "0.4.6",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -79,12 +79,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     private MarkerOptions currentMark;
     private MarkerOptions endMark;
     private MarkerOptions startMark;
-
     private LatLng firstLatLng;
     private Double lastX = 0.0;
     private int mCurrentDirection = 0;
-    //    private double mCurrentLat = 0.0;
-//    private double mCurrentLon = 0.0;
     private float mCurrentAccracy;
     // 定位相关
     private LocationClient mLocClient;
@@ -282,7 +279,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"));
         }
         //设置活动类型
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())){
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())) {
             fragment.binding.includeStreet.tvEventType.setText(runRaceDetailInfo.getEventType());
         }
@@ -293,7 +290,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         }
         //设置路线介绍
-        if(!TextUtils.isEmpty(runRaceDetailInfo.getDescription())){
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
             fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
         }
@@ -592,6 +589,9 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     @Override
     public void onSensorChanged(SensorEvent sensorEvent) {
+        if (null == getContext()) {
+            return;
+        }
         double x = sensorEvent.values[SensorManager.DATA_X];
         if (Math.abs(x - lastX) > 1.0) {
             mCurrentDirection = (int) x;
@@ -620,26 +620,31 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
     public List<BitmapDescriptor> getCustomTextureList() {
         ArrayList<BitmapDescriptor> list = new ArrayList<BitmapDescriptor>();
         list.add(BitmapDescriptorFactory.fromAsset("Icon_road_blue_arrow.png"));
-//        list.add(BitmapDescriptorFactory.fromAsset("Icon_road_green_arrow.png"));
-//        list.add(BitmapDescriptorFactory.fromAsset("Icon_road_yellow_arrow.png"));
-//        list.add(BitmapDescriptorFactory.fromAsset("Icon_road_red_arrow.png"));
-//        list.add(BitmapDescriptorFactory.fromAsset("Icon_road_nofocus.png"));
         return list;
     }
     public void onResume() {
+        if (null == getContext()) {
+            return;
+        }
         if (mMapView != null) {
             mMapView.onResume();
         }
     }
     public void onPause() {
+        if (null == getContext()) {
+            return;
+        }
         if (mMapView != null) {
             mMapView.onPause();
         }
     }
     public void onDestroy() {
+        if (null == getContext()) {
+            return;
+        }
         if (mMapView != null) {
             mMapView.onDestroy();
             mMapView = null;
@@ -658,7 +663,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         @Override
         public void onReceiveLocation(BDLocation location) {
             // map view 销毁后不在处理新接收的位置
-            if (location == null || mMapView == null) {
+            if (location == null || mMapView == null || null == getContext()) {
                 return;
             }
             if (isFirstLoc) {
@@ -686,7 +691,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
                     location.getLongitude());
             baiduMap.setMyLocationData(followMyLocation);
-            if ((null == queryResultPoints||queryResultPoints.size()<1) && null != firstLatLng) {
+            if ((null == queryResultPoints || queryResultPoints.size() < 1) && null != firstLatLng) {
                 builder.target(firstLatLng).zoom(DEFULT_ZOOM);
                 baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
             }
@@ -150,7 +150,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                             MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
 //                        //自动计算地图缩放
                             //设置地图自动缩放
-                            initZoom = MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
+                            initZoom = MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, DEFAULT_MAP_AUTO_ZOOM);
                         }
                     }
@@ -514,7 +514,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             public void onClick(View view) {
                 //立即报名
                 if ("0".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
-                    RegistrationInfoActivity.newInstance(fragment.getActivity());
+                    if (null != runRaceDetailInfo) {
+                        RegistrationInfoActivity.newInstance(fragment.getActivity(), runRaceDetailInfo.getFenceId());
+                    }
                 }
                 //现在开始
                 else if ("1".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
@@ -11,13 +11,14 @@ import com.cnlive.moudle.pedometer.ui.fragment.RegistrationInfoFragment;
 import com.example.moudle_pedometer.R;
 /**
- *填写报名信息
+ * 填写报名信息
  * Created by hanyayun 019/05/29.
  */
 public class RegistrationInfoActivity extends AppCompatActivity {
-    public static void newInstance(Activity context){
-        Intent intent = new Intent(context,RegistrationInfoActivity.class);
+    public static void newInstance(Activity context, String fenceId) {
+        Intent intent = new Intent(context, RegistrationInfoActivity.class);
+        intent.putExtra("fenceId", fenceId);
         context.startActivity(intent);
     }
@@ -27,6 +28,7 @@ public class RegistrationInfoActivity extends AppCompatActivity {
         StatusBarUtil.setStatusBarWrite(this);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
         setContentView(R.layout.activity_registration_info);
-        getSupportFragmentManager().beginTransaction().replace(R.id.container, RegistrationInfoFragment.newInstance()).commit();
+        String fenceId = getIntent().getExtras().getString("fenceId");
+        getSupportFragmentManager().beginTransaction().replace(R.id.container, RegistrationInfoFragment.newInstance(fenceId)).commit();
     }
 }
@@ -4,6 +4,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.View;
 import com.baidu.trace.LBSTraceClient;
@@ -42,9 +43,13 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
     public TimePickerDialog pickerDialog;
+    public String fenceId;
-    public static RegistrationInfoFragment newInstance() {
+    public static RegistrationInfoFragment newInstance(String fenceId) {
         RegistrationInfoFragment fragment = new RegistrationInfoFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("fenceId", fenceId);
+        fragment.setArguments(bundle);
         return fragment;
     }
@@ -56,11 +61,16 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        if (null != getArguments()) {
+            fenceId = getArguments().getString("fenceId");
+        }
         if (getMvpView() != null) getMvpView().initView();
     }
     public void commitInfo() {
-        addMonitorToFence(1);
+        if (!TextUtils.isEmpty(fenceId)) {
+            addMonitorToFence((int) (Double.parseDouble(fenceId)));
+        }
     }
     /**
@@ -156,7 +166,7 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
                 if (0 == state || 3005 == state) {
                     //将设备添加到围栏中
                     mClient.addFenceMonitoredPerson(addMonitoredPersonRequest, onFenceListener);
-                }else {
+                } else {
                     AlertUtil.showDeftToast(getContext(), msg);
                 }
             }