更新后新增排程提交

app/src/main/java/com/ckkj/water/plan/WaterConfigFragment_copy.java

@@ -46,6 +46,8 @@ import java.util.Locale;
 
 public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLayoutCopyBinding, WaterPlanPresenter>
         implements WaterPlanContract.WaterPlanView {
+    //整个页面的
+    private WaterPlanWeekEntity mLocalEntity;
     private List<WaterPlanWeekEntity.DetailsBean> weekList = new ArrayList<>();
     private List<WaterPlanWeekEntity.TimeDataBean> timeList = new ArrayList<>();
     private WaterPlanWeekAdapter_copy mWeekAdapter;
@@ -70,11 +72,16 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
             timeDataList.add(timeData);
             bean.setTimeData(timeDataList);
             bean.setWeekday(i + 1);
-            bean.setStatus("0");
+            bean.setStatus("1");
             bean.setWeekName(ZYTimeUtils.getWeekName(i));
+            bean.setTriggerType("0");
             list.add(bean);
         }
         weekList = list;
+        //这里先处理新增，后面再处理编辑
+        mLocalEntity = new WaterPlanWeekEntity();
+        mLocalEntity.setStatus("1");
+        mLocalEntity.setDetails(weekList);
         //顶部周一、周二。。。。。
         mWeekAdapter = new WaterPlanWeekAdapter_copy(mContext, R.layout.plan_period_item,list);
         viewBinding.rvWeek.setAdapter(mWeekAdapter);
@@ -91,7 +98,8 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
     private void initListener() {
         setClick(viewBinding.tvCommit);
         setClick(viewBinding.imgAdd);
-
+        setClick(viewBinding.switchButton);
+        //头部 周一~周日
         mWeekAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
@@ -100,7 +108,7 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
                 mTimeAdapter.setNewData(timeList);
             }
         });
-
+        //周期对应的 时间配置
         mTimeAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
@@ -115,6 +123,23 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
                 }
             }
         });
+        //输入框监听
+        viewBinding.editPlanName.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                String planName = "";
+                if(!TextUtils.isEmpty(s.toString())){
+                    planName = s.toString();
+                }
+                mLocalEntity.setName(planName);
+            }
+        });
     }
 
 
@@ -123,16 +148,26 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
     }
 
     public void onClick(View v){
+        int selPos = mWeekAdapter.getmPos();
         switch (v.getId()){
 
             case R.id.img_add:
                 isConfigSubmitted = false;
-                int selPos = mWeekAdapter.getmPos();
                 WaterPlanWeekEntity.TimeDataBean timeDataAdd = new WaterPlanWeekEntity.TimeDataBean();
                 weekList.get(selPos).getTimeData().add(timeDataAdd);
                 mTimeAdapter.notifyItemInserted(weekList.get(selPos).getTimeData().size() - 1);
                 break;
 
+            case R.id.switch_button:
+                if(weekList.get(selPos).getStatus().equals("0")){
+                    weekList.get(selPos).setStatus("1");
+                    viewBinding.switchButton.setChecked(true);
+                }else{
+                    weekList.get(selPos).setStatus("0");
+                    viewBinding.switchButton.setChecked(false);
+                }
+                break;
+
             case R.id.tv_commit:
                 if(TextUtils.isEmpty(viewBinding.editPlanName.getText().toString())){
                     ToastUtil.showShort(mContext,getString(R.string.plan_name_text_empty_hint));
@@ -162,8 +197,10 @@ public class WaterConfigFragment_copy extends BaseFragment<WaterConfigFragmentLa
                     ToastUtil.showShort(mContext, conflictMsg);
                     return;
                 }
-
+                if(mLocalEntity != null){
-                isConfigSubmitted = true;
+                    mPresenter.saveConfig(mLocalEntity);
+                }
+//                isConfigSubmitted = true;
                 break;
         }
     }

app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanPresenter.java

@@ -59,10 +59,16 @@ public class WaterPlanPresenter extends BasePresenter<WaterPlanContract.WaterPla
             for(WaterPlanWeekEntity.DetailsBean detailsBean : entity.getDetails()){
                 JSONObject jsonDetails = new JSONObject();
                 jsonDetails.put("weekday", detailsBean.getWeekday());
-                jsonDetails.put("startTime", detailsBean.getStartTime());
-                jsonDetails.put("durationMin", detailsBean.getDurationMin());
                 jsonDetails.put("triggerType", detailsBean.getTriggerType());
                 jsonDetails.put("status", detailsBean.getStatus());
+                JSONArray timeArray = new JSONArray();
+                for(WaterPlanWeekEntity.TimeDataBean timeDataBean : detailsBean.getTimeData()){
+                    JSONObject jsonTime = new JSONObject();
+                    jsonTime.put("startTime", timeDataBean.getStartTime());
+                    jsonTime.put("durationMin", timeDataBean.getDurationMin());
+                    timeArray.put(jsonTime);
+                }
+                jsonDetails.put("timeData", timeArray);
                 array.put(jsonDetails);
             }
             json.put("details", array);