fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化浇水流程，以及中英文遗漏点

Browse Source
This commit is contained in:
fengjignqi
2026-06-26 10:12:45 +08:00
parent 5e920037f5
commit 73d5003655
19 changed files with 81 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/index_device_list_item.xml
View File

@@ -12,7 +12,7 @@
android:layout_marginHorizontal="@dimen/dp_5"
android:layout_marginVertical="@dimen/dp_6"
app:cardCornerRadius="16dp"
app:cardElevation="@dimen/dp_5">
app:cardElevation="@dimen/dp_2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/index_fragment_layout.xml
View File

@@ -96,7 +96,7 @@
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingHorizontal="@dimen/dp_15"
tools:itemCount="3"
tools:itemCount="5"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/index_device_list_item" />

2
app/src/main/res/layout/layout_no_more.xml
View File

@@ -22,7 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:text="已经到底了"
android:text="@string/no_more_data"
android:textColor="@color/color_zhu"
android:textSize="@dimen/sp_12" />

4
app/src/main/res/layout/mine_fragment_layout.xml
View File

@@ -44,7 +44,7 @@
android:textStyle="bold"
android:textSize="16sp"
android:textColor="@color/textPrimaryColor"
android:text="昵称"/>
android:text=""/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:textSize="16sp"
android:textColor="@color/textPrimaryColor"
android:text="13988886666"/>
android:text=""/>
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout/plan_bind_device_item.xml
View File

@@ -8,9 +8,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_10"
android:layout_marginVertical="@dimen/dp_5"
android:layout_marginVertical="@dimen/dp_6"
app:cardCornerRadius="10dp"
app:cardElevation="4dp">
app:cardElevation="@dimen/dp_2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
app/src/main/res/layout/plan_bound_device_item.xml
View File

@@ -8,9 +8,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_10"
android:layout_marginVertical="@dimen/dp_5"
android:layout_marginVertical="@dimen/dp_6"
app:cardCornerRadius="10dp"
app:cardElevation="4dp">
app:cardElevation="@dimen/dp_2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/plan_detail_bind_device_item.xml
View File

@@ -42,7 +42,7 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="已关联"
android:text="@string/associated"
android:textColor="@color/color_zhu"
android:textSize="14sp" />
</RelativeLayout>

4
app/src/main/res/layout/tab_history_item_layout.xml
View File

@@ -8,9 +8,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_10"
android:layout_marginVertical="@dimen/dp_5"
android:layout_marginVertical="@dimen/dp_6"
app:cardCornerRadius="10dp"
app:cardElevation="4dp">
app:cardElevation="@dimen/dp_2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
app/src/main/res/layout/water_plan_list_item.xml
View File

@@ -8,9 +8,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_10"
android:layout_marginVertical="@dimen/dp_5"
android:layout_marginVertical="@dimen/dp_6"
app:cardCornerRadius="10dp"
app:cardElevation="4dp">
app:cardElevation="@dimen/dp_2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

8
app/src/main/res/values-en/strings.xml
View File

@@ -103,6 +103,9 @@
<string name="select_watering_duration">Select watering duration</string>
<string name="start_watering">Start Watering</string>
<string name="device_status_offline">Off line</string>
<string name="closed">Closed</string>
<string name="end_watering">Stop Watering</string>
<string name="device_offline_tip">Device is offline</string>
<!-- Schedule -->
@@ -133,6 +136,8 @@
<string name="button_edit">Edit</string>
<string name="plan_detail_title">Schedule Details</string>
<string name="btn_manual_refresh">Refresh</string>
<string name="task_started">Task Started</string>
<string name="associated">Associated</string>
<!-- History -->
<string name="history_title">History</string>
@@ -256,6 +261,9 @@
<string name="device_not_connected_retry">Device is not connected, please try again</string>
<string name="scan_failed">Scan failed: %1$s</string>
<string name="confirm_unbind_device">Unbind Device</string>
<string name="confirm_delete_record">Delete Record</string>
<string name="no_more_data">No more data</string>
<!-- End -->

6
app/src/main/res/values/strings.xml
View File

@@ -89,6 +89,7 @@
<string name="device_info_firmware_version">固件版本</string>
<string name="device_status_working">工作中</string>
<string name="device_status_not_working">待机中</string>
<string name="closed">已关闭</string>
<string name="device_status_offline">离线</string>
<string name="select_watering_duration">请选择浇水时长</string>
<string name="start_watering">开启浇水</string>
@@ -126,6 +127,8 @@
<string name="button_edit">编辑</string>
<string name="plan_detail_title">排程详情</string>
<string name="btn_manual_refresh">手动刷新</string>
<string name="task_started">任务已开启</string>
<string name="associated">已关联</string>
<!--历史-->
@@ -242,6 +245,9 @@
<string name="device_not_connected_retry">设备未连接，请稍后重试</string>
<string name="scan_failed">扫描失败: %1$s</string>
<string name="confirm_unbind_device">确定解绑该设备</string>
<string name="confirm_delete_record">确定删除该记录</string>
<string name="no_more_data">已经到底了</string>
<!--结束-->