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

韩亚云
2 parents e81d35ec f4b01de7
Showing 7 changed files with 62 additions and 8 deletions
lib_network/src/main/java/com/cnlive/strike/data/network/api/ApiRequest.java
lib_network/src/main/java/com/cnlive/strike/data/network/model/runAbout/RunRaceDetailInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningFinishFragment.java
moudle_pedometer/src/main/res/layout/fragment_finish_run_map.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_street_introduce.xml
@@ -74,7 +74,8 @@ public class ApiRequest&lt;Observable extends io.reactivex.Observable&lt;Result&lt;BaseDa
     public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
     ApiRequest<Observable, BaseData> observable(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
-        return observable(clazz, false, api, null);
+        //添加签名校验-杨帅
+        return observable(clazz, false, api, new SignEncryptInterceptor());
     }
     public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
@@ -133,13 +134,14 @@ public class ApiRequest&lt;Observable extends io.reactivex.Observable&lt;Result&lt;BaseDa
         return service(clazz, api, new DefaultEncryptInterceptor());
     }
-     public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
+    public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
     ApiRequest<Observable, BaseData> service(Class<Service> clazz, ApiBuild.Api<Service, Observable, BaseData> api) {
         return service(clazz, api, new SignEncryptInterceptor());
     }
+
     public static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> serviceNewVersion(Class<Service> clazz,long connectTimeout ,long readTimeout,ApiBuild.Api<Service, Observable, BaseData> api) {
-        return serviceNewVersion(clazz,false, api, connectTimeout,readTimeout,new SignEncryptInterceptor());
+    ApiRequest<Observable, BaseData> serviceNewVersion(Class<Service> clazz, long connectTimeout, long readTimeout, ApiBuild.Api<Service, Observable, BaseData> api) {
+        return serviceNewVersion(clazz, false, api, connectTimeout, readTimeout, new SignEncryptInterceptor());
     }
@@ -188,7 +190,7 @@ public class ApiRequest&lt;Observable extends io.reactivex.Observable&lt;Result&lt;BaseDa
     private static <Service, Observable extends io.reactivex.Observable<Result<BaseData>>, BaseData extends BaseInfo>
-    ApiRequest<Observable, BaseData> serviceNewVersion(Class<Service> clazz, boolean decode, ApiBuild.Api<Service, Observable, BaseData> api,long connectTimeout ,long readTimeout, Interceptor... interceptor) {
+    ApiRequest<Observable, BaseData> serviceNewVersion(Class<Service> clazz, boolean decode, ApiBuild.Api<Service, Observable, BaseData> api, long connectTimeout, long readTimeout, Interceptor... interceptor) {
         ApiRequest<Observable, BaseData> request = new ApiRequest<>();
@@ -9,18 +9,22 @@ import java.util.List;
  */
 public class RunRaceDetailInfo {
+
     /**
      * address : 澳大利亚黄金海岸
+     * description : 2018国际网络徒步大赛黄金海岸站
      * employTime : 00:0:30
      * endLocation : 首都师范大学操场西门
      * end_time : 1571140800000
+     * eventType : 徒步
      * faceUrl : ["http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557034319038_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2018/0902/1535858459612_small.jpg"]
      * finishFaceUrl : ["http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg"]
+     * finishNum : 33
      * firstEmployTime : 33
      * firstFaceUrl : http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg
      * firstName : 峨眉派掌门候选人
      * id : 116
-     * latLongitude : ["39.74788,116.14294","39.74888,116.14394"]
+     * latLongitude : [{"latitude":39.933942415657,"latitudeE6":3.9933942415657E7,"longitude":116.30897883196,"longitudeE6":1.1630897883196001E8},{"latitude":39.933967093082,"latitudeE6":3.9933967093082E7,"longitude":116.30890884739,"longitudeE6":1.1630890884739E8},{"latitude":39.93396191311,"latitudeE6":3.9933961913109995E7,"longitude":116.30868153328,"longitudeE6":1.1630868153328E8},{"latitude":39.934018604395,"latitudeE6":3.9934018604395E7,"longitude":116.30864816843,"longitudeE6":1.1630864816843E8},{"latitude":39.934091845914,"latitudeE6":3.9934091845914E7,"longitude":116.30864003053,"longitudeE6":1.1630864003053E8},{"latitude":39.934360142831,"latitudeE6":3.9934360142831E7,"longitude":116.30875016067,"longitudeE6":1.1630875016067E8},{"latitude":39.934744000269,"latitudeE6":3.9934744000268996E7,"longitude":116.30886056182,"longitudeE6":1.1630886056182E8},{"latitude":39.934760553353,"latitudeE6":3.9934760553353004E7,"longitude":116.30891047327,"longitudeE6":1.1630891047327E8},{"latitude":39.934696015943,"latitudeE6":3.9934696015943E7,"longitude":116.30912422473,"longitudeE6":1.1630912422473E8},{"latitude":39.934698216461,"latitudeE6":3.9934698216461E7,"longitude":116.30938815875,"longitudeE6":1.1630938815875E8},{"latitude":39.934731879794,"latitudeE6":3.9934731879794E7,"longitude":116.30961357404,"longitudeE6":1.1630961357404E8},{"latitude":39.934696892741,"latitudeE6":3.9934696892741E7,"longitude":116.30967053826,"longitudeE6":1.1630967053826E8},{"latitude":39.934370279617,"latitudeE6":3.9934370279617E7,"longitude":116.30962008478,"longitudeE6":1.1630962008478E8},{"latitude":39.934132111504,"latitudeE6":3.9934132111503996E7,"longitude":116.309668369,"longitudeE6":1.1630966836899999E8},{"latitude":39.933978571682,"latitudeE6":3.9933978571682E7,"longitude":116.30965182248,"longitudeE6":1.1630965182248001E8},{"latitude":39.933964707162,"latitudeE6":3.9933964707162E7,"longitude":116.3093930426,"longitudeE6":1.1630939304259999E8},{"latitude":39.933996146467,"latitudeE6":3.9933996146467E7,"longitude":116.30915080933,"longitudeE6":1.1630915080933E8}]
      * mileage : 全长4.42公里
      * pace : 22.33
      * roadmap : http://yweb0.cnliveimg.com/images/headImg/2019/051
@@ -35,9 +39,12 @@ public class RunRaceDetailInfo {
      */
     private String address;
+    private String description;
     private String employTime;
     private String endLocation;
     private long end_time;
+    private String eventType;
+    private String finishNum;
     private String firstEmployTime;
     private String firstFaceUrl;
     private String firstName;
@@ -65,6 +72,14 @@ public class RunRaceDetailInfo {
         this.address = address;
     }
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public String getEmployTime() {
         return employTime;
     }
@@ -89,6 +104,22 @@ public class RunRaceDetailInfo {
         this.end_time = end_time;
     }
+    public String getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+
+    public String getFinishNum() {
+        return finishNum;
+    }
+
+    public void setFinishNum(String finishNum) {
+        this.finishNum = finishNum;
+    }
+
     public String getFirstEmployTime() {
         return firstEmployTime;
     }
@@ -110,7 +110,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private String startPoint = "首都师范大学南门";
     private String endPoint = "首都师范大学篮球场";
-    private String test = "[{\"latitude\":39.933889208848,\"latitudeE6\":3.9933889208848E7,\"longitude\":116.30900265517,\"longitudeE6\":1.1630900265517001E8},{\"latitude\":39.933868507347,\"latitudeE6\":3.9933868507347E7,\"longitude\":116.30865416508,\"longitudeE6\":1.1630865416508E8},{\"latitude\":39.934756505077,\"latitudeE6\":3.9934756505077E7,\"longitude\":116.30860516469,\"longitudeE6\":1.1630860516468999E8},{\"latitude\":39.934781620502,\"latitudeE6\":3.9934781620502E7,\"longitude\":116.30961013007,\"longitudeE6\":1.1630961013007E8},{\"latitude\":39.934881620374,\"latitudeE6\":3.9934881620374E7,\"longitude\":116.30960513008,\"longitudeE6\":1.1630960513008E8},{\"latitude\":39.934077623132,\"latitudeE6\":3.9934077623132E7,\"longitude\":116.30965812942,\"longitudeE6\":1.1630965812942E8},{\"latitude\":39.933972618463,\"latitudeE6\":3.9933972618463E7,\"longitude\":116.30962113087,\"longitudeE6\":1.1630962113087E8},{\"latitude\":39.933932608856,\"latitudeE6\":3.9933932608856E7,\"longitude\":116.30953913383,\"longitudeE6\":1.1630953913383E8}]";
+//    private String test = "[{\"latitude\":39.933889208848,\"latitudeE6\":3.9933889208848E7,\"longitude\":116.30900265517,\"longitudeE6\":1.1630900265517001E8},{\"latitude\":39.933868507347,\"latitudeE6\":3.9933868507347E7,\"longitude\":116.30865416508,\"longitudeE6\":1.1630865416508E8},{\"latitude\":39.934756505077,\"latitudeE6\":3.9934756505077E7,\"longitude\":116.30860516469,\"longitudeE6\":1.1630860516468999E8},{\"latitude\":39.934781620502,\"latitudeE6\":3.9934781620502E7,\"longitude\":116.30961013007,\"longitudeE6\":1.1630961013007E8},{\"latitude\":39.934881620374,\"latitudeE6\":3.9934881620374E7,\"longitude\":116.30960513008,\"longitudeE6\":1.1630960513008E8},{\"latitude\":39.934077623132,\"latitudeE6\":3.9934077623132E7,\"longitude\":116.30965812942,\"longitudeE6\":1.1630965812942E8},{\"latitude\":39.933972618463,\"latitudeE6\":3.9933972618463E7,\"longitude\":116.30962113087,\"longitudeE6\":1.1630962113087E8},{\"latitude\":39.933932608856,\"latitudeE6\":3.9933932608856E7,\"longitude\":116.30953913383,\"longitudeE6\":1.1630953913383E8}]";
     private LinkedList<LatLng> importLatLngs;//关键点
     private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
     private List<LatLng> trackPoints;
@@ -235,6 +235,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"))) {
             fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"));
         }
+        //设置活动类型
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())){
+            fragment.binding.includeStreet.tvEventType.setText(runRaceDetailInfo.getEventType());
+        }
         //设置参加人数
         fragment.binding.includeStreet.tvSignPerson.setText(runRaceDetailInfo.getSignupNum() + "");
         //设置报名完成的头像
@@ -289,6 +293,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.includeRank.llRankRoot.setVisibility(View.GONE);
         }
+        //设置路线描述
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())){
+            fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
+        }
         //设置路线介绍的图片
         if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
             //设置路线图
@@ -5,9 +5,11 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunningFinishFragmetPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
@@ -43,6 +45,7 @@ public class RunningFinishFragment extends QMUIFragment&lt;RunningFinishFragmentVie
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        StepUtil.clearRunData(getActivity(), CommonInfo.getUserId(getActivity()));
         if (getArguments() != null) {
             runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
             if (runningFinishBean != null) {
@@ -24,6 +24,14 @@
                 android:id="@+id/mapView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
+            <!--地图上面加一层类似于全透明黑色蒙版-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#0D000000"
+                android:clickable="false"
+                android:focusable="false"
+                android:focusableInTouchMode="false"></LinearLayout>
             <FrameLayout
                 android:id="@+id/fl_back"
@@ -344,10 +344,11 @@
                     android:layout_marginTop="10dp">
                     <TextView
+                        android:id="@+id/tv_event_type"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="25dp"
-                        android:text="徒步"
+                        android:text="--"
                         android:textColor="@color/text_black"
                         android:textSize="15sp"
                         android:textStyle="bold" />
@@ -19,6 +19,7 @@
             android:textStyle="bold" />
         <TextView
+            android:id="@+id/tv_street_introduce"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"