diff --git a/app/build.gradle b/app/build.gradle index ca9eab5..2b6e9fc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -160,7 +160,7 @@ dependencies { implementation 'top.zibin:Luban:1.1.8' //带有侧滑功能的recyclerview implementation 'com.yanzhenjie.recyclerview:x:1.3.2' - implementation 'com.github.luqiming666:SwipeRecyclerView:1.4.8' +// implementation 'com.github.luqiming666:SwipeRecyclerView:1.4.8' //Activity与Fragmen实现沉浸式状态栏 implementation 'com.github.tangguna:immersion:1.0.1' //viewpager2 diff --git a/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java b/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java index 9837a0a..fdd0015 100644 --- a/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java +++ b/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java @@ -71,7 +71,7 @@ public class AddWaterPlanActivity extends BaseActivity { - WaterConfigFragment configFragment = (WaterConfigFragment) mFragmentList.get(0); - configFragment.setEditEntity(mEditEntity); - }); - } +// if (mIsEditMode && mEditEntity != null) { +// viewBinding.viewpage.post(() -> { +// WaterConfigFragment configFragment = (WaterConfigFragment) mFragmentList.get(0); +// configFragment.setEditEntity(mEditEntity); +// }); +// } } private void initListener() { @@ -115,49 +115,52 @@ public class AddWaterPlanActivity extends BaseActivity list = new ArrayList<>(); for(int i = 0; i < 7; i++){ WaterPlanWeekEntity.DetailsBean bean = new WaterPlanWeekEntity.DetailsBean(); @@ -57,13 +66,44 @@ public class WaterConfigFragment_copy extends BaseFragment timeList = weekList.get(position).getTimeData(); + mTimeAdapter.setNewData(timeList); } }); } @@ -100,6 +142,13 @@ public class WaterConfigFragment_copy extends BaseFragment + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_plan_time_item_layout.xml b/app/src/main/res/layout/include_plan_time_item_layout.xml index 1ec8e2a..e4049e8 100644 --- a/app/src/main/res/layout/include_plan_time_item_layout.xml +++ b/app/src/main/res/layout/include_plan_time_item_layout.xml @@ -74,19 +74,16 @@ android:text="@string/plan_time" android:layout_marginVertical="@dimen/dp_13"/> - + android:hint="@string/input_water_plan_time"/> #E4FBFA #D9D9D9 #DCDFE6 + #E34D59 #707070