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-07-06 10:35:56 +08:00
parent d8d546c90a
commit fa44e0edbd
35 changed files with 643 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
android:background="@color/white">
<include
android:id="@+id/include_title"
layout="@layout/include_activity_back_layout"/>
layout="@layout/include_activity_back_whitebg_layout"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"

97
app/src/main/res/layout/activity_settings_layout.xml
View File

@@ -2,66 +2,31 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/mainBackgroundColor">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
android:background="@color/mainBackgroundColor">
<include
android:id="@+id/include_title"
layout="@layout/include_activity_back_layout"/>
layout="@layout/include_activity_back_whitebg_layout"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_change_phone"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/color_333333"
android:text="我的账号"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"/>
<TextView
android:id="@+id/tv_user_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="13sp"
android:textColor="@color/color_666666"
android:text=""
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_10"
android:layout_toLeftOf="@+id/img_point_right1"/>
<ImageView
android:id="@+id/img_point_right1"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:src="@mipmap/img_point_right_gray"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"/>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/color_gray2"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_check_version"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_height="@dimen/dp_52"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/color_333333"
android:textColor="@color/textPrimaryColor"
android:text="检查更新"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"/>
@@ -71,7 +36,7 @@
android:layout_height="wrap_content"
android:textSize="12sp"
android:textColor="@color/color_ff999999"
android:text="version 1.2.3"
android:text=""
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_12"
android:layout_toLeftOf="@+id/img_point_right2"/>
@@ -92,14 +57,14 @@
<RelativeLayout
android:id="@+id/rl_set_cache"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_height="@dimen/dp_52"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/color_333333"
android:textColor="@color/textPrimaryColor"
android:text="清除缓存"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"/>
@@ -126,44 +91,18 @@
android:background="@color/color_gray2"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_commit_service"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/color_333333"
android:text="问题反馈"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"/>
<ImageView
android:id="@+id/img_point_right7"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_15"
android:src="@mipmap/img_point_right_gray"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"/>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/color_gray2"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_user_agreement"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_height="@dimen/dp_52"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/color_333333"
android:textColor="@color/textPrimaryColor"
android:text="用户协议"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"/>
@@ -184,14 +123,14 @@
<RelativeLayout
android:id="@+id/rl_user_privacy"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_height="@dimen/dp_52"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/color_333333"
android:textColor="@color/textPrimaryColor"
android:text="隐私政策"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"/>
@@ -212,14 +151,14 @@
<RelativeLayout
android:id="@+id/rl_log_off"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_height="@dimen/dp_52"
android:layout_marginLeft="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_12">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/color_333333"
android:textColor="@color/textPrimaryColor"
android:text="注销账号"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"/>
@@ -245,7 +184,7 @@
android:layout_marginTop="@dimen/dp_10"
android:textSize="12sp"
android:textColor="@color/color_666666"
android:text="如有问题，请联系我们: kunyanzhiyao@outlook.com"
android:text="如有问题，请联系我们: sales@watex.com.cn"
android:layout_centerVertical="true"/>

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

@@ -56,7 +56,7 @@
android:paddingHorizontal="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_5"
tools:listitem="@layout/scan_ble_device_item"
app:spanCount="4"
app:spanCount="2"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
android:visibility="gone"/>

389
app/src/main/res/layout/device_control_layout.xml
View File

@@ -16,211 +16,222 @@
android:id="@+id/included_title"
layout="@layout/include_activity_back_whitebg_layout" />
</RelativeLayout>
<TextView
android:id="@+id/tv_device_status"
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="48sp"
android:textStyle="bold"
android:text="工作中"
android:textColor="@color/color_zhu"/>
<TextView
android:id="@+id/tv_device_update_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:gravity="center"
android:textSize="14sp"
android:text="更新时间:5-1 08:30"
android:textColor="@color/color_666666"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_26">
<LinearLayout
android:id="@+id/linear_bt"
android:layout_width="@dimen/dp_67"
android:layout_height="@dimen/dp_67"
android:gravity="center"
android:background="@drawable/shape_device_ctrl_green_cor12">
<ImageView
android:id="@+id/img_ble"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/icon_ctrl_bt_white"/>
</LinearLayout>
<LinearLayout
android:id="@+id/linear_wifi"
android:layout_width="@dimen/dp_67"
android:layout_height="@dimen/dp_67"
android:layout_marginLeft="@dimen/dp_22"
android:gravity="center"
android:background="@drawable/shape_device_ctrl_green_cor12">
<ImageView
android:id="@+id/img_wifi_logo"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/icon_ctrl_wifi_white"/>
</LinearLayout>
<FrameLayout
android:id="@+id/linear_bat"
android:layout_width="@dimen/dp_67"
android:layout_height="@dimen/dp_67"
android:layout_marginLeft="@dimen/dp_22"
android:background="@drawable/shape_device_ctrl_white_cor12">
<View
android:id="@+id/view_center"
android:layout_width="@dimen/dp_0_5"
android:layout_height="match_parent"
android:layout_gravity="center"/>
<ImageView
android:id="@+id/img_bat_status"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_gravity="center"
android:src="@mipmap/icon_ctrl_batt_red"/>
</FrameLayout>
</LinearLayout>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="16dp"
app:cardElevation="4dp"
android:layout_marginHorizontal="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20">
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
android:paddingVertical="@dimen/dp_15">
<LinearLayout
android:gravity="center_horizontal">
<TextView
android:id="@+id/tv_device_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="48sp"
android:textStyle="bold"
android:text="工作中"
android:textColor="@color/color_zhu"/>
<TextView
android:id="@+id/tv_device_update_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:gravity="center"
android:textSize="14sp"
android:text="更新时间:5-1 08:30"
android:textColor="@color/color_666666"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_work_progress_title"
android:layout_marginLeft="@dimen/dp_30"/>
android:layout_marginTop="@dimen/dp_26">
<LinearLayout
android:id="@+id/linear_bt"
android:layout_width="@dimen/dp_67"
android:layout_height="@dimen/dp_67"
android:gravity="center"
android:background="@drawable/shape_device_ctrl_green_cor12">
<ImageView
android:id="@+id/img_ble"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/icon_ctrl_bt_white"/>
</LinearLayout>
<LinearLayout
android:id="@+id/linear_wifi"
android:layout_width="@dimen/dp_67"
android:layout_height="@dimen/dp_67"
android:layout_marginLeft="@dimen/dp_22"
android:gravity="center"
android:background="@drawable/shape_device_ctrl_green_cor12">
<ImageView
android:id="@+id/img_wifi_logo"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/icon_ctrl_wifi_white"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textColor="@color/color_666666"
android:text="@string/device_work_progress_tips"
android:layout_marginLeft="@dimen/dp_5"/>
<FrameLayout
android:id="@+id/linear_bat"
android:layout_width="@dimen/dp_67"
android:layout_height="@dimen/dp_67"
android:layout_marginLeft="@dimen/dp_22"
android:background="@drawable/shape_device_ctrl_white_cor12">
<View
android:id="@+id/view_center"
android:layout_width="@dimen/dp_0_5"
android:layout_height="match_parent"
android:layout_gravity="center"/>
<ImageView
android:id="@+id/img_bat_status"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_gravity="center"
android:src="@mipmap/icon_ctrl_batt_red"/>
</FrameLayout>
</LinearLayout>
<!--自定义progress-->
<ProgressBar
android:id="@+id/progress_work"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
android:layout_marginHorizontal="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_25"
android:max="100"
android:progress="60"
android:progressDrawable="@drawable/device_progress_bg"
android:progressTint="@null"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="16dp"
app:cardElevation="4dp"
android:layout_marginHorizontal="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
android:paddingVertical="@dimen/dp_15">
<RelativeLayout
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/dp_30">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_work_times_title"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textSize="12sp"
android:textColor="@color/color_666666"
android:text="30min"
android:layout_marginLeft="@dimen/dp_5"/>
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_time_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingHorizontal="@dimen/dp_5"
tools:listitem="@layout/device_work_time_item"
app:spanCount="4"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:paddingVertical="@dimen/dp_6"
android:orientation="horizontal"
android:background="@drawable/shape_f9f9f9_corner_5"
android:layout_marginHorizontal="@dimen/dp_10">
<TextView
android:id="@+id/tv_work_duartion"
app:cardCornerRadius="16dp"
app:cardElevation="4dp"
android:layout_marginHorizontal="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_5"
android:layout_weight="3"
android:background="@null"
android:textSize="14sp"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/device_custom_work_time"/>
<TextView
android:layout_width="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
android:paddingVertical="@dimen/dp_15">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_work_progress_title"
android:layout_marginLeft="@dimen/dp_30"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textColor="@color/color_666666"
android:text="@string/device_work_progress_tips"
android:layout_marginLeft="@dimen/dp_5"/>
</LinearLayout>
<!--自定义progress-->
<ProgressBar
android:id="@+id/progress_work"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
android:layout_marginHorizontal="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_25"
android:max="100"
android:progress="60"
android:progressDrawable="@drawable/device_progress_bg"
android:progressTint="@null"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="16dp"
app:cardElevation="4dp"
android:layout_marginHorizontal="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_5"
android:textSize="12sp"
android:textColor="@color/color_666666"
android:text="min"/>
</LinearLayout>
android:orientation="vertical"
android:gravity="center_vertical"
android:paddingVertical="@dimen/dp_15">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/dp_30">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/textPrimaryColor"
android:text="@string/device_work_times_title"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textSize="12sp"
android:textColor="@color/color_666666"
android:text="30min"
android:layout_marginLeft="@dimen/dp_5"/>
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_time_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingHorizontal="@dimen/dp_5"
tools:listitem="@layout/device_work_time_item"
app:spanCount="4"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:paddingVertical="@dimen/dp_6"
android:orientation="horizontal"
android:background="@drawable/shape_f9f9f9_corner_5"
android:layout_marginHorizontal="@dimen/dp_10">
<TextView
android:id="@+id/tv_work_duartion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_5"
android:layout_weight="3"
android:background="@null"
android:textSize="14sp"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/device_custom_work_time"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_5"
android:textSize="12sp"
android:textColor="@color/color_666666"
android:text="min"/>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/tv_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/white"
android:text="@string/device_control_start"
android:background="@drawable/shape_green_button_bg"
android:paddingVertical="@dimen/dp_10"
android:layout_marginHorizontal="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center"/>
</LinearLayout>
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/tv_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/white"
android:text="@string/device_control_start"
android:background="@drawable/shape_green_button_bg"
android:paddingVertical="@dimen/dp_10"
android:layout_marginHorizontal="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center"/>
</ScrollView>
</LinearLayout>

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

@@ -13,8 +13,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@mipmap/icon_launch_icon"
android:layout_marginTop="80dp"/>
android:src="@mipmap/img_login_app_logo"
android:layout_marginTop="128dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="151"
android:visibility="visible"/>
android:visibility="gone"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -167,7 +167,7 @@
<EditText
android:id="@+id/et_input_psd"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="8"
android:layout_marginLeft="5dp"
android:background="@null"
@@ -180,7 +180,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_weight="0.5"
android:src="@mipmap/icon_psd_show"/>
android:src="@mipmap/icon_psd_hide"/>
</LinearLayout>
<TextView
android:id="@+id/tv_login"

20
app/src/main/res/layout/register_layout.xml
View File

@@ -103,14 +103,22 @@
android:src="@mipmap/icon_psd"/>
<EditText
android:id="@+id/et_input_psd"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="9"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:inputType="textPassword"
android:textSize="14sp"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_psd"/>
<ImageView
android:id="@+id/img_psd_show_hide"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_weight="0.5"
android:src="@mipmap/icon_psd_hide"/>
</LinearLayout>
<LinearLayout
@@ -129,14 +137,22 @@
android:src="@mipmap/icon_psd"/>
<EditText
android:id="@+id/et_input_psd_agin"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="9"
android:layout_marginLeft="@dimen/dp_5"
android:inputType="textPassword"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/text_hint_theme_color"
android:textColorHint="@color/text_hint_theme_color"
android:hint="@string/hint_input_psd_agin"/>
<ImageView
android:id="@+id/img_psd_show_hide_agin"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_weight="0.5"
android:src="@mipmap/icon_psd_hide"/>
</LinearLayout>
<TextView

9
app/src/main/res/layout/scan_ble_device_item.xml
View File

@@ -8,10 +8,11 @@
android:gravity="center_horizontal">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/img_device"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:src="@mipmap/app_logo"
app:riv_corner_radius="@dimen/dp_10"/>
android:layout_width="@dimen/dp_130"
android:layout_height="@dimen/dp_97"
android:src="@mipmap/icon_water_ble_device"
app:riv_corner_radius="@dimen/dp_10"
android:scaleType="fitXY"/>
<TextView
android:id="@+id/tv_device_name"
android:layout_width="wrap_content"

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

@@ -11,7 +11,7 @@
android:background="@color/white">
<include
android:id="@+id/include_title"
layout="@layout/include_activity_back_layout"/>
layout="@layout/include_activity_back_whitebg_layout"/>
</RelativeLayout>
<TextView
android:layout_width="wrap_content"

BIN
app/src/main/res/mipmap-xhdpi/icon_water_ble_device.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 152 KiB

BIN
app/src/main/res/mipmap-xhdpi/img_login_app_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_water_ble_device.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
app/src/main/res/mipmap-xxhdpi/img_login_app_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 71 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/img_login_app_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 99 KiB

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

@@ -265,6 +265,8 @@
<string name="confirm_delete_record">Delete Record</string>
<string name="no_more_data">No more data</string>
<string name="user_agreement_mine">User Agreement</string>
<!-- End -->

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

@@ -172,6 +172,7 @@
<string name="logout_dialog_tips">确定退出当前账号</string>
<string name="edit_nickname">修改昵称</string>
<string name="input_nickname">请输入昵称</string>
<string name="user_agreement_mine">用户协议</string>