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 d40a18d..963c634 100644 --- a/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java +++ b/app/src/main/java/com/ckkj/water/plan/AddWaterPlanActivity.java @@ -1,5 +1,8 @@ package com.ckkj.water.plan; +import static android.view.View.GONE; +import static android.view.View.VISIBLE; + import android.os.Bundle; import android.view.View; @@ -67,11 +70,14 @@ public class AddWaterPlanActivity extends BaseActivity + implements WaterPlanContract.WaterPlanView{ + @Override + public void initData(Bundle state) { + + } + + @Override + public WaterPlanPresenter createPresenter() { + return new WaterPlanPresenter(new WaterPlanImpl()); + } + + @Override + public void getWaterConfigListSuccess(List list, int total) { + + } + + @Override + public void saveConfigSuccess(WaterPlanWeekEntity entity) { + + } + + @Override + public void updateConfigSuccess(WaterPlanWeekEntity entity) { + + } + + @Override + public void updatePlanStatusSuccess(BaseBean bean, String status) { + + } + + @Override + public void getPlanDetailInfo(WaterPlanWeekEntity entity) { + + } + + @Override + public void getPlanBindDeviceList(WaterDeviceEntity bean) { + + } + + @Override + public void planBindDeviceSuccess(BaseBean bean) { + + } + + @Override + public void deletePlanSuccess(BaseBean bean) { + + } + + @Override + public void onNetChange(int netModel) { + + } + + @Override + public void showError(String message) { + + } + + @Override + public void logOut(BaseBean bean) { + + } +} diff --git a/app/src/main/res/drawable/tab_selector_bg_center.xml b/app/src/main/res/drawable/tab_selector_bg_center.xml new file mode 100644 index 0000000..c0e415a --- /dev/null +++ b/app/src/main/res/drawable/tab_selector_bg_center.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ 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 6cc7402..322a1e8 100644 --- a/app/src/main/res/layout/add_water_plan_layout.xml +++ b/app/src/main/res/layout/add_water_plan_layout.xml @@ -27,6 +27,16 @@ android:textSize="14sp" android:textColor="@drawable/tab_selector_text" android:text="@string/water_device_config"/> + - + android:orientation="vertical"> + - + + + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_100" + android:visibility="gone"> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/plan_bound_device_item.xml b/app/src/main/res/layout/plan_bound_device_item.xml new file mode 100644 index 0000000..e73f9c7 --- /dev/null +++ b/app/src/main/res/layout/plan_bound_device_item.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/plan_bound_device_layout.xml b/app/src/main/res/layout/plan_bound_device_layout.xml new file mode 100644 index 0000000..97ed420 --- /dev/null +++ b/app/src/main/res/layout/plan_bound_device_layout.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 1223fd1..bba6aab 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -89,6 +89,7 @@ +新增排程 排程 浇水配置 + 已关联设备 关联设备 新增排程 Edit Plan diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0dd70a7..16f5991 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,7 +90,8 @@ +新增排程 排程 浇水配置 - 关联设备 + 已关联设备 + 可关联设备 新增排程 编辑排程 排程名称