轨迹绑定接口修改2

韩亚云
2 parents f2384867 76a32985
Showing 10 changed files with 91 additions and 24 deletions
.idea/gradle.xml
moudle_pedometer/src/main/AndroidManifest.xml
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/ui/activity/CollTraceListDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RunListAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollTraceListDetailFragment.java
moudle_pedometer/src/main/res/layout/layout_coll_finish_user_info.xml
@@ -3,9 +3,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -61,8 +61,7 @@
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity" />
-        <activity
-            android:name="com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity"/>
+        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity" />
         <service
             android:name="com.cnlive.moudle.pedometer.service.StepService"
@@ -117,16 +116,16 @@
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity"
-            android:launchMode="singleTask"/> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
+            android:launchMode="singleTask" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity"
             android:launchMode="singleTask" />
@@ -138,6 +137,9 @@
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.OnGoingActivity"
             android:launchMode="singleTask" />
+
+        <!--轨迹列表详情页-->
+        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollTraceListDetailActivity" />
         <!--************************************************路径工具**********************************************-->
         <service
             android:name="com.cnlive.moudle.collectionTrace.service.CollKeepLiveService"
@@ -179,16 +181,11 @@
             </intent-filter>
         </receiver>
-        <activity
-            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity"/>
-        <activity
-            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity"/> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
-        <activity
-            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity"/>
-        <activity
-            android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity"/>
-        <activity
-            android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity"/>
+        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity" />
+        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity" /> <!-- android:theme="@style/Theme.AppCompat.Light.NoActionBar" -->
+        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity" />
+        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity" />
+        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity" />
     </application>
 </manifest>
 \ No newline at end of file
@@ -215,8 +215,8 @@ public class CollRunningFinishFragmentView implements MvpView, OnFenceListener {
                                     @Override
                                     public void run() {
                                         if (null != collectLatLngs && collectLatLngs.size() > 1) {
-//                                            getBaiDuSnap();
-                                            addFence();
+                                            getBaiDuSnap();
+//                                            addFence();
                                         }
                                     }
                                 }, 1000);
@@ -378,6 +378,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     CollStepUtil.setCollEndPointData(getContext(), CollCommonInfo.getUserId(getContext()), collectPoint);
                     //跳转界面
                     CollRunningFinishActivity.startActivity(fragment.getActivity());
+                    fragment.getActivity().finish();
                 }
             });
             endSelectDialog.setCancelable(false);
 package com.cnlive.moudle.collectionTrace.frame.view;
+import android.app.Activity;
+import android.content.Context;
 import android.os.Handler;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
@@ -12,6 +14,7 @@ import com.baidu.mapapi.map.Overlay;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.trace.LBSTraceClient;
+import com.bumptech.glide.Glide;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.collectionTrace.ui.adapter.CollFinishDetaiAdapter;
@@ -47,6 +50,9 @@ public class CollTraceListDetailFragmentView implements MvpView {
         this.fragment = fragment;
     }
+    public Context getContext() {
+        return fragment == null ? null : fragment.getActivity();
+    }
     public void initView(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean) {
         if (mClient == null) {
@@ -59,8 +65,20 @@ public class CollTraceListDetailFragmentView implements MvpView {
         //添加起点
         CollectPoint startPoint = null;
         List<CollectPoint> resultCollectPoints = null;
+        List<CollectPoint> allCollectPoints = null;
         if (!TextUtils.isEmpty(eventShoeLinesBean.getLatLongitude())) {
             resultCollectPoints = GsonUtil.jsonToList(eventShoeLinesBean.getLatLongitude(), CollectPoint.class);
+            allCollectPoints = GsonUtil.jsonToList(eventShoeLinesBean.getLatLongitude(), CollectPoint.class);
+
+        }
+        //设置打点liebiao
+        if (null != allCollectPoints && allCollectPoints.size() > 1) {
+            //设置适配器
+            adapter = new CollFinishDetaiAdapter(fragment.getActivity(), allCollectPoints);
+            fragment.binding.includeFinishUserInfo.rvList.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
+            fragment.binding.includeFinishUserInfo.rvList.setAdapter(adapter);
+        } else {
+            fragment.binding.includeFinishUserInfo.rvList.setVisibility(View.GONE);
         }
         //获取打点不为空
         if (null != resultCollectPoints && resultCollectPoints.size() > 1) {
@@ -68,6 +86,29 @@ public class CollTraceListDetailFragmentView implements MvpView {
             resultCollectPoints.remove(0);
             //移除终点
             resultCollectPoints.remove(resultCollectPoints.size() - 1);
+            //开始在地图上绘制打点信息
+            for (int i = 0; i < resultCollectPoints.size(); i++) {
+                LatLng latLng = new LatLng(resultCollectPoints.get(i).getLatitude(), resultCollectPoints.get(i).getLongitude());
+                MyMapUtil.setMapMarker(getContext(), baiduMap, latLng, R.drawable.icon_map_import);
+            }
+
+        }
+
+        //设置用户头像
+        if (!TextUtils.isEmpty(eventShoeLinesBean.getUserMsg().getNickName())) {
+            fragment.binding.includeFinishUserInfo.tvUserNickName.setText(eventShoeLinesBean.getUserMsg().getNickName());
+        }
+        //设置用户头像
+        if (!TextUtils.isEmpty(eventShoeLinesBean.getUserMsg().getImage())) {
+            Glide.with(getContext()).load(eventShoeLinesBean.getUserMsg().getImage()).into(fragment.binding.includeFinishUserInfo.qmIvIcon);
+        }
+        //设置用户行走公里
+        if (!TextUtils.isEmpty(eventShoeLinesBean.getMileage())) {
+            fragment.binding.includeFinishUserInfo.tvDistance.setText(eventShoeLinesBean.getMileage());
+        }
+        //设置日期
+        if (!TextUtils.isEmpty(eventShoeLinesBean.getEndTime())) {
+            fragment.binding.includeFinishUserInfo.tvDate.setText(TimeUtil.getStampToTime(Long.parseLong(eventShoeLinesBean.getEndTime()) * 1000, "yyyy-MM-dd HH:mm"));
         }
 //        //查询用户历史轨迹
@@ -22,6 +22,7 @@ import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollTraceListDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.collectionTrace.ui.adapter.RaceNameListAdapter;
 import com.cnlive.moudle.collectionTrace.ui.fragment.RaceNameListFragment;
@@ -110,7 +111,7 @@ public class RaceNameListView implements MvpView, OnFenceListener {
                 adapter.setOnItemClick(new RaceNameListAdapter.OnItemClick() {
                     @Override
                     public void onItemClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
-
+                        CollTraceListDetailActivity.startActivity(fragment.getActivity(), eventShoeLinesBean);
                     }
                 });
                 adapter.setOnAddShoeLineClick(new RaceNameListAdapter.OnAddShoeLineClick() {
 package com.cnlive.moudle.collectionTrace.ui.activity;
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
+import com.cnlive.moudle.collectionTrace.ui.fragment.CollTraceListDetailFragment;
 import com.example.moudle_pedometer.R;
 /**
@@ -23,5 +27,21 @@ public class CollTraceListDetailActivity extends QMUIFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getIntent().getExtras().get("eventShoeLinesBean");
+        if (null != eventShoeLinesBean) {
+            addFragment(CollTraceListDetailFragment.newInstance(eventShoeLinesBean));
+        }
+    }
+
+    private void addFragment(QMUIFragment fragment) {
+        getSupportFragmentManager().beginTransaction()
+                .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
+                .addToBackStack(fragment.getClass().getSimpleName())
+                .commit();
+    }
+
+    public static void startActivity(Activity activity, RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean) {
+        Intent intent = new Intent(activity, CollTraceListDetailActivity.class);
+        intent.putExtra("eventShoeLinesBean", eventShoeLinesBean);
+        activity.startActivity(intent);
     }
 }
@@ -59,7 +59,7 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
             public void onClick(View view) {
                 RunRaceDetailInfo runRaceDetailInfo = new RunRaceDetailInfo();
                 runRaceDetailInfo.setTitle(list.get(i).getTitle());
-                RaceNameListActivity.newInstance(context, list.get(i).getId() + "",runRaceDetailInfo);
+                RaceNameListActivity.newInstance(context, list.get(i).getId() + "", runRaceDetailInfo);
             }
         });
@@ -91,4 +91,8 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
             item_ly = itemView.findViewById(R.id.item_ly);
         }
     }
+
+    public interface OnItemClickListener {
+        void onClickItem(RunLineInfo.ListBean bean, int position);
+    }
 }
@@ -5,6 +5,7 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.frame.presenter.CollTraceListDetailFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.CollTraceListDetailFragmentView;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
@@ -45,10 +46,14 @@ public class CollTraceListDetailFragment extends QMUIFragment&lt;CollTraceListDetai
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0);
+
         if (null != getArguments()) {
             eventShoeLinesBean = (RaceNameListInfo.EventShoeLinesBean) getArguments().get("eventShoeLinesBean");
             if (null != eventShoeLinesBean) {
-
+                if (null != getMvpView()) {
+                    getMvpView().initView(eventShoeLinesBean);
+                }
             }
         }
     }
@@ -93,6 +93,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/white"
                 android:layout_marginTop="-3dp"
                 android:gravity="center_vertical">