踩点轨迹删除

韩亚云
1 parent 40225442
Showing 12 changed files with 236 additions and 29 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/RaceNameListPresenter.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/RaceListActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceNameListActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RaceNameListAdapter.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/RaceNameListFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/ApiServiceRunLin.java
moudle_pedometer/src/main/res/layout/fragment_race_name_list.xml
moudle_pedometer/src/main/res/layout/item_race_name_list.xml
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
+import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
@@ -16,7 +17,7 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 //        RunLineActivity.newInstance(this,null,null,null);
-        Intent intent = new Intent(this, RaceNameListActivity.class);
+        Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
         startActivity(intent);
 //        ARouter.getInstance()
 ////                .build("/moudle_pedometer/InterestActivity")
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.1.9",
+            version: "0.2.1",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -22,6 +22,8 @@ import io.reactivex.disposables.Disposable;
  * Created by hanyayun 019/06/25.
  */
 public class RaceNameListPresenter extends MvpBasePresenter<RaceNameListView> {
+
+
     public void setData(Context context,String eventId, int pageNo, int pageSize){
         HashMap<String, String> map = new HashMap<>();
         map.put("eventId", eventId);
@@ -50,4 +52,68 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
             }
         }).start();
     }
+
+    /**
+     * 轨迹删除
+     * @param context
+     * @param id  轨迹id
+     */
+    public void delectShoeLine(Context context,int id,int position){
+        Map<String,String> map = new HashMap<>();
+        map.put("id",id+"");
+        Logic.create(map).action(new Logic.Action<Map<String,String>, BaseInfo>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+                return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.deleteShoeLineInfo(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo>event().setFailureCallback(new FailureCallback() {
+            @Override
+            public void onFailure(int code, String message) {
+                if (getView() != null) {
+                    getView().showToast(message);
+                    getView().hideLoading();
+                }
+            }
+        }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+            @Override
+            public void onSuccess(BaseInfo baseInfo) {
+                if (getView() != null){
+                    getView().delectShoeLine(position);
+                }
+            }
+        }).start();
+    }
+
+    /**
+     *踩点轨迹与赛事绑定
+     * @param context
+     * @param id  轨迹id
+     * @param eventId 赛事id
+     */
+    public void bindingShoeLine(Context context,int id,String eventId,int position){
+        Map<String,String> map = new HashMap<>();
+        map.put("id",id+"");
+        map.put("eventId",eventId);
+        Logic.create(map).action(new Logic.Action<Map<String,String>, BaseInfo>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+                return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.bindingShoeLineInfo(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo>event().setFailureCallback(new FailureCallback() {
+            @Override
+            public void onFailure(int code, String message) {
+                if (getView() != null) {
+                    getView().showToast(message);
+                    getView().hideLoading();
+                }
+            }
+        }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+            @Override
+            public void onSuccess(BaseInfo baseInfo) {
+                if (getView() != null){
+                    getView().bindingShoeLine(position);
+                }
+            }
+        }).start();
+    }
 }
@@ -39,12 +39,29 @@ public class RaceNameListView implements MvpView {
     public void initView(){
         fragment.binding.raceBack.setOnClickListener(v -> fragment.getActivity().finish());
 //        fragment.binding.intoPath.setOnClickListener(v -> );
-        fragment.binding.raceTittle.setText("赛事名称轨迹列表");
+        fragment.binding.raceTittle.setText("赛事轨迹列表");
         fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
         fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
         fragment.binding.raceRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
     }
+
+    public void bindingShoeLine(int position){
+        list.get(position).setIsEnable(0);
+        for(int i = 0;i <list.size();i++){
+            if(i != position && list.get(i).getIsEnable() == 0){
+                list.get(i).setIsEnable(1);
+            }
+        }
+        adapter.notifyDataSetChanged();
+    }
+
+
+    public void delectShoeLine(int position){
+        list.remove(position);
+        adapter.notifyDataSetChanged();
+    }
+
     public void onSuccess(BaseInfo<RaceNameListInfo> raceNameListInfoBaseInfo){
         hideLoading();
         if(fragment.currentPage == 1){
@@ -53,12 +70,25 @@ public class RaceNameListView implements MvpView {
             if(adapter == null){
                 adapter = new RaceNameListAdapter(list,fragment.getActivity());
                 fragment.binding.raceRecy.setAdapter(adapter);
-//                adapter.setClickListener(new RunLineAdapter.OnClickListener() {
-//                    @Override
-//                    public void onClickListener(RunLineInfo.ListBean bean, int position) {
-//                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null,null);
-//                    }
-//                });
+                adapter.setOnItemClick(new RaceNameListAdapter.OnItemClick() {
+                    @Override
+                    public void onItemClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
+
+                    }
+                });
+                adapter.setOnAddShoeLineClick(new RaceNameListAdapter.OnAddShoeLineClick() {
+                    @Override
+                    public void onAddSholeLineClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
+                        fragment.addShoeLine(eventShoeLinesBean,position);
+                    }
+                });
+
+                adapter.setOnDelectShoeLineClick(new RaceNameListAdapter.OnDelectShoeLineClick() {
+                    @Override
+                    public void onDelectShoeLineClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
+                        fragment.delectShoeLine(eventShoeLinesBean,position);
+                    }
+                });
             }else {
                 adapter.notifyDataSetChanged();
             }
 package com.cnlive.moudle.collectionTrace.ui.activity;
+import android.content.Context;
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -15,13 +17,27 @@ import com.example.moudle_pedometer.R;
  */
 public class RaceListActivity extends AppCompatActivity {
+    public static void newInstance(Context context,String userId,String userName,String userIcon){
+        Intent intent = new Intent(context,RaceListActivity.class);
+        intent.putExtra("userId",userId);
+        intent.putExtra("userName",userName);
+        intent.putExtra("userIcon",userIcon);
+        context.startActivity(intent);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarWrite(this);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.white), 0);
         setContentView(R.layout.activity_race_list);
-        CommonInfo.setUserId(this, "10513196");
+        if(getIntent().getStringExtra("userId") != null){
+            CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
+            CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
+            CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
+        }else {
+            CommonInfo.setUserId(this, "10513196");
+        }
         getSupportFragmentManager().beginTransaction().replace(R.id.race_container,new RaceListFragment()).commit();
     }
 }
 package com.cnlive.moudle.collectionTrace.ui.activity;
+import android.content.Context;
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -8,18 +10,25 @@ import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.ui.fragment.RaceNameListFragment;
 import com.example.moudle_pedometer.R;
+
 /**
  * 赛事名称轨迹列表
  * Created by hanyayun 019/06/25.
  */
 public class RaceNameListActivity extends AppCompatActivity {
+    public static void newInstance(Context context,String eventId){
+        Intent intent = new Intent(context,RaceNameListActivity.class);
+        intent.putExtra("eventId",eventId);
+        context.startActivity(intent);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarWrite(this);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.white), 0);
         setContentView(R.layout.activity_race_name_list);
-        getSupportFragmentManager().beginTransaction().replace(R.id.race_container,new RaceNameListFragment()).commit();
+        getSupportFragmentManager().beginTransaction().replace(R.id.race_container,RaceNameListFragment.newInstance(getIntent().getStringExtra("eventId"))).commit();
     }
 }
@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.bumptech.glide.Glide;
@@ -24,6 +25,21 @@ public class RaceNameListAdapter extends RecyclerView.Adapter&lt;RaceNameListAdapte
     private List<RaceNameListInfo.EventShoeLinesBean> list = new ArrayList<>();
     private Activity context;
+    private OnItemClick onItemClick;
+    private OnAddShoeLineClick onAddShoeLineClick;
+    private OnDelectShoeLineClick onDelectShoeLineClick;
+
+    public void setOnItemClick(OnItemClick onItemClick) {
+        this.onItemClick = onItemClick;
+    }
+
+    public void setOnAddShoeLineClick(OnAddShoeLineClick onAddShoeLineClick) {
+        this.onAddShoeLineClick = onAddShoeLineClick;
+    }
+
+    public void setOnDelectShoeLineClick(OnDelectShoeLineClick onDelectShoeLineClick) {
+        this.onDelectShoeLineClick = onDelectShoeLineClick;
+    }
     public RaceNameListAdapter(List<RaceNameListInfo.EventShoeLinesBean> list, Activity context) {
         this.list = list;
@@ -45,16 +61,37 @@ public class RaceNameListAdapter extends RecyclerView.Adapter&lt;RaceNameListAdapte
         myViewHolder.kilometer_num.setText(list.get(i).getMileage());
         myViewHolder.tv_start_addr.setText(list.get(i).getStartLocation());
         myViewHolder.tv_end_addr.setText(list.get(i).getEndLocation());
-//        myViewHolder.delect_path.setOnClickListener(v -> );
+        myViewHolder.shoe_ly.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(onItemClick != null)onItemClick.onItemClickListener(list.get(i),i);
+            }
+        });
+
         if(list.get(i).getIsEnable() == 0){
             myViewHolder.has_path.setText("已绑定轨迹");
             myViewHolder.has_path.setTextColor(context.getResources().getColor(R.color.text_gray99));
             myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.gray_raduis_bg));
+            myViewHolder.delect_path.setTextColor(context.getResources().getColor(R.color.text_gray99));
+            myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.gray_raduis_bg));
         }else {
             myViewHolder.has_path.setText("绑定轨迹");
             myViewHolder.has_path.setTextColor(context.getResources().getColor(R.color.green_tx));
             myViewHolder.has_path.setBackground(context.getResources().getDrawable(R.drawable.green_raduis_bg));
-            //        myViewHolder.has_path.setOnClickListener(v -> );
+            myViewHolder.delect_path.setTextColor(context.getResources().getColor(R.color.green_tx));
+            myViewHolder.delect_path.setBackground(context.getResources().getDrawable(R.drawable.green_raduis_bg));
+            myViewHolder.has_path.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if(onAddShoeLineClick != null)onAddShoeLineClick.onAddSholeLineClickListener(list.get(i),i);
+                }
+            });
+            myViewHolder.delect_path.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if(onDelectShoeLineClick != null)onDelectShoeLineClick.onDelectShoeLineClickListener(list.get(i),i);
+                }
+            });
         }
     }
@@ -65,6 +102,7 @@ public class RaceNameListAdapter extends RecyclerView.Adapter&lt;RaceNameListAdapte
     class MyViewHolder extends RecyclerView.ViewHolder {
+        LinearLayout shoe_ly;
         TextView record_time_day;
         TextView record_time;
         ImageView item_img;
@@ -76,6 +114,7 @@ public class RaceNameListAdapter extends RecyclerView.Adapter&lt;RaceNameListAdapte
         public MyViewHolder(@NonNull View itemView) {
             super(itemView);
+            shoe_ly = itemView.findViewById(R.id.shoe_ly);
             record_time_day = itemView.findViewById(R.id.record_time_day);
             record_time = itemView.findViewById(R.id.record_time);
             item_img = itemView.findViewById(R.id.item_img);
@@ -86,4 +125,17 @@ public class RaceNameListAdapter extends RecyclerView.Adapter&lt;RaceNameListAdapte
             delect_path = itemView.findViewById(R.id.delect_path);
         }
     }
+
+    public interface OnItemClick{
+        void onItemClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean,int position);
+    }
+
+    public interface OnAddShoeLineClick{
+        void onAddSholeLineClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean,int position);
+    }
+
+    public interface OnDelectShoeLineClick{
+        void onDelectShoeLineClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean,int position);
+    }
 }
+
@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
@@ -42,7 +43,7 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
         myViewHolder.line_address.setText(list.get(i).getAddress() + "  " + list.get(i).getMileage());
         //添加轨迹
 //        myViewHolder.add_path.setOnClickListener(v -> );
-//        myViewHolder.path_list.setOnClickListener(v -> );
+        myViewHolder.path_list.setOnClickListener(v -> RaceNameListActivity.newInstance(context,list.get(i).getId()+""));
     }
     @Override
@@ -8,7 +8,7 @@ import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.RaceNameListView;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRaceNameListBinding;
@@ -19,6 +19,15 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
     public int currentPage = 1;
     public int pageSize = 10;
+    private String eventId;
+
+    public static RaceNameListFragment newInstance(String eventId){
+        RaceNameListFragment fragment = new RaceNameListFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("eventId",eventId);
+        fragment.setArguments(bundle);
+        return fragment;
+    }
     public RaceNameListFragment() {
         // Required empty public constructor
     }
@@ -28,14 +37,15 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         if(getMvpView() != null) getMvpView().initView();
-        getPresenter().setData(getActivity(),"116",currentPage,pageSize);
+        eventId = getArguments().getString("eventId");
+        getPresenter().setData(getActivity(),"117",currentPage,pageSize);
         binding.refreshLayout.setOnRefreshListener(v ->{
             currentPage = 1;
-            getPresenter().setData(getActivity(),"116",currentPage,pageSize);
+            getPresenter().setData(getActivity(),"117",currentPage,pageSize);
         });
         binding.refreshLayout.setOnLoadMoreListener(v ->{
             currentPage++;
-            getPresenter().setData(getActivity(),"116",currentPage,pageSize);
+            getPresenter().setData(getActivity(),"117",currentPage,pageSize);
         });
     }
@@ -44,4 +54,12 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
         return R.layout.fragment_race_name_list;
     }
+
+    public void addShoeLine(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean,int position){
+        getPresenter().bindingShoeLine(getActivity(),eventShoeLinesBean.getId(),eventShoeLinesBean.getEventId(),position);
+    }
+
+    public void delectShoeLine(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean,int position){
+        getPresenter().delectShoeLine(getActivity(),eventShoeLinesBean.getId(),position);
+    }
 }
@@ -71,5 +71,18 @@ public interface ApiServiceRunLin {
      */
     @POST("Daren/event/getShoeLineList.action")
     Observable<Result<BaseInfo<RaceNameListInfo>>> getRaceNameListInfo(@QueryMap() Map<String, String> maps);
+
+    /**
+     * 踩点轨迹删除
+     */
+    @POST("Daren/event/deleteShoeLine.action")
+    Observable<Result<BaseInfo>> deleteShoeLineInfo(@QueryMap() Map<String, String> maps);
+
+    /**
+     * 踩点轨迹绑定
+     */
+    @POST("Daren/event/bindingShoeLine.action")
+    Observable<Result<BaseInfo>> bindingShoeLineInfo(@QueryMap() Map<String, String> maps);
+
 }
@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:textSize="18sp"
+                android:textSize="16sp"
                 android:textColor="#333333"
                 />
@@ -34,7 +34,7 @@
                 android:id="@+id/into_path"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="14sp"
+                android:textSize="13sp"
                 android:textColor="#333333"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
@@ -4,6 +4,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
     android:orientation="vertical"
+    android:id="@+id/shoe_ly"
     android:background="@color/white"
     android:padding="10dp">
@@ -63,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:text="4.42 公里"
                 android:textColor="#333333"
-                android:textSize="18sp" />
+                android:textSize="16sp" />
             <LinearLayout
                 android:layout_width="match_parent"
@@ -82,7 +83,7 @@
                     android:layout_marginLeft="5dp"
                     android:text="@string/layout_street_start_point"
                     android:textColor="@color/bottom_sheet_dialog_race_location_text"
-                    android:textSize="13sp" />
+                    android:textSize="12sp" />
                 <TextView
                     android:id="@+id/tv_start_addr"
@@ -91,7 +92,7 @@
                     android:layout_marginLeft="10dp"
                     android:text="首都师范大学操场东门"
                     android:textColor="@color/text_black"
-                    android:textSize="13sp" />
+                    android:textSize="12sp" />
             </LinearLayout>
             <LinearLayout
@@ -111,7 +112,7 @@
                     android:layout_marginLeft="5dp"
                     android:text="@string/layout_street_end_point"
                     android:textColor="@color/bottom_sheet_dialog_race_location_text"
-                    android:textSize="13sp" />
+                    android:textSize="12sp" />
                 <TextView
                     android:id="@+id/tv_end_addr"
@@ -120,7 +121,7 @@
                     android:layout_marginLeft="10dp"
                     android:text="首都师范大学操场西门"
                     android:textColor="@color/text_black"
-                    android:textSize="13sp" />
+                    android:textSize="12sp" />
             </LinearLayout>
             <LinearLayout
@@ -135,9 +136,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/green_raduis_bg"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="11dp"
                     android:paddingTop="7dp"
-                    android:paddingRight="10dp"
+                    android:paddingRight="11dp"
                     android:paddingBottom="7dp"
                     android:text="@string/addpath"
                     android:textColor="@color/green_tx"
@@ -149,9 +150,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15dp"
                     android:background="@drawable/green_raduis_bg"
-                    android:paddingLeft="9dp"
+                    android:paddingLeft="10dp"
                     android:paddingTop="7dp"
-                    android:paddingRight="9dp"
+                    android:paddingRight="10dp"
                     android:paddingBottom="7dp"
                     android:text="@string/delect"
                     android:textColor="#36C28D"