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

调整App内获取授权的位置

Browse Source
This commit is contained in:
fengjignqi
2026-06-16 14:49:32 +08:00
parent 45dfc2d793
commit 92ca8067d2
11 changed files with 107 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/res/layout/login_layout.xml
View File

@@ -15,6 +15,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/btn_133"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="133"/>
<Button
android:id="@+id/btn_151"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="151"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -70,7 +70,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_35"
android:layout_marginRight="@dimen/dp_35"
android:layout_marginTop="20dp"
@@ -81,6 +81,7 @@
android:layout_height="@dimen/dp_40"
android:layout_weight="1"
android:background="@drawable/shape_login_radius8_huise_bg"
android:layout_marginRight="@dimen/dp_25"
android:gravity="center"
android:textColor="@color/color_gray_tab"
android:text="取消"/>
@@ -92,7 +93,6 @@
android:background="@drawable/shape_login_radius8_jb_bg"
android:gravity="center"
android:textColor="@color/color_white"
android:layout_marginLeft="@dimen/dp_13"
android:text="确定"/>
</LinearLayout>
</LinearLayout>

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

@@ -66,6 +66,8 @@
<string name="keep_device_bt_tips">Keep Bluetooth enabled and stay close to the device</string>
<string name="keep_device_bt_tips2">Sending information to device</string>
<string name="keep_device_bt_tips3">Connecting device to network</string>
<string name="reset_device_provision">Please manually reset the device and put it into pairing mode before continuing.</string>
<string name="device_binding_conflict_message">This device is already linked to another account. Please unbind it from that account or reset the device and set it up again.</string>
<string name="button_finish">Finish</string>
<string name="button_reset">Reset</string>

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

@@ -92,6 +92,8 @@
<string name="device_status_offline">离线</string>
<string name="select_watering_duration">请选择浇水时长</string>
<string name="start_watering">开始浇水</string>
<string name="reset_device_provision">该操作需要手动将设备重置到配网模式</string>
<string name="device_binding_conflict_message">该设备已被其他用户绑定，您可以登录该账号尝试解绑，或重置设备进入配网模式</string>
<!--排程-->