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 cbfef7f..e31ae36 100644 --- a/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java +++ b/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java @@ -4,6 +4,7 @@ import static android.view.View.GONE; import static android.view.View.VISIBLE; import android.os.Bundle; +import android.text.TextUtils; import android.view.View; import androidx.fragment.app.Fragment; @@ -158,6 +159,17 @@ public class AddWaterPlanActivity extends BaseActivity timeDataList = dayBean.getTimeData(); + if (timeDataList != null && !timeDataList.isEmpty()) { + for (WaterPlanWeekEntity.TimeDataBean timeData : timeDataList) { + if (!TextUtils.isEmpty(timeData.getStartTime()) && timeData.getDurationMin() > 0) { + return true; + } + } + } + } + return false; + } + /** * 校验并保存配置(供外部调用) * @return true表示校验通过并已提交保存,false表示校验失败 diff --git a/app/src/main/res/drawable/shape_add_water_tab_bg.xml b/app/src/main/res/drawable/shape_add_water_tab_bg.xml new file mode 100644 index 0000000..823eb2a --- /dev/null +++ b/app/src/main/res/drawable/shape_add_water_tab_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_selector_bg.xml b/app/src/main/res/drawable/tab_selector_bg.xml index d946c3b..cb8aaf9 100644 --- a/app/src/main/res/drawable/tab_selector_bg.xml +++ b/app/src/main/res/drawable/tab_selector_bg.xml @@ -6,11 +6,5 @@ - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_selector_bg2.xml b/app/src/main/res/drawable/tab_selector_bg2.xml index 7cd4287..572e58a 100644 --- a/app/src/main/res/drawable/tab_selector_bg2.xml +++ b/app/src/main/res/drawable/tab_selector_bg2.xml @@ -6,11 +6,4 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/add_water_plan_layout.xml b/app/src/main/res/layout/add_water_plan_layout.xml index 322a1e8..fa46461 100644 --- a/app/src/main/res/layout/add_water_plan_layout.xml +++ b/app/src/main/res/layout/add_water_plan_layout.xml @@ -16,7 +16,8 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_40" android:orientation="horizontal" - android:layout_marginHorizontal="@dimen/dp_20"> + android:layout_marginHorizontal="@dimen/dp_20" + android:background="@drawable/shape_add_water_tab_bg">