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-17 08:42:54 +08:00
parent 92ca8067d2
commit 8b3c6d1761
18 changed files with 282 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/drawable/anim_connect_ble_device.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item
android:drawable="@mipmap/img_add_dev_aini_1"
android:duration="300" />
<item
android:drawable="@mipmap/img_add_dev_aini_2"
android:duration="300" />
<item
android:drawable="@mipmap/img_add_dev_aini_3"
android:duration="300" />
<item
android:drawable="@mipmap/img_add_dev_aini_2"
android:duration="500" />
</animation-list>

25
app/src/main/res/drawable/anim_connect_device.xml
View File

@@ -1,33 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item
android:drawable="@mipmap/img_add_dev_aini_1"
android:duration="200" />
<item
android:drawable="@mipmap/img_add_dev_aini_2"
android:duration="200" />
<item
android:drawable="@mipmap/img_add_dev_aini_3"
android:duration="200" />
<item
android:drawable="@mipmap/img_add_dev_aini_2"
android:duration="500" />
<item
android:drawable="@mipmap/img_connect_anim_phone1"
android:duration="200" />
<item
android:drawable="@mipmap/img_connect_anim_phone2"
android:duration="200" />
<item
android:drawable="@mipmap/img_connect_anim_phone3"
android:duration="200" />
<item
android:drawable="@mipmap/img_connect_anim_phone1"
android:duration="500" />
<item
android:drawable="@mipmap/img_connect_anim_wifi1"

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

@@ -37,8 +37,8 @@
<ImageView
android:id="@+id/iv_connect_animation"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_200"
android:layout_width="@dimen/dp_300"
android:layout_height="@dimen/dp_300"
android:layout_gravity="center_horizontal"
android:src="@drawable/anim_add_device_scan"/>

221
app/src/main/res/layout/device_reset_wifi.xml
View File

@@ -15,118 +15,141 @@
layout="@layout/include_activity_back_gray_layout" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:textSize="20sp"
android:textColor="@color/textPrimaryColor"
android:text="@string/select_wifi_tip"
android:textStyle="bold"/>
<LinearLayout
android:id="@+id/linear_wifi_info"
android:id="@+id/linear_wifi_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="@dimen/dp_10">
<LinearLayout
android:id="@+id/linear_wifi"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:orientation="horizontal"
android:layout_marginHorizontal="@dimen/dp_20"
android:background="@drawable/shape_round_corner_100"
android:layout_marginTop="@dimen/dp_20"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_20">
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/icon_wifi"/>
<EditText
android:id="@+id/et_wifi_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/textPrimaryColor"
android:textColorHint="@color/textPrimaryColor"
android:hint="@string/input_wifi_name_tip"/>
<TextView
android:id="@+id/tv_select_wifi"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:background="@drawable/shape_green_50"
android:paddingVertical="@dimen/dp_8"
android:gravity="center"
android:textSize="13sp"
android:textColor="@color/white"
android:text="@string/select_wifi_tip"/>
</LinearLayout>
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:textSize="20sp"
android:textColor="@color/textPrimaryColor"
android:text="@string/select_wifi_tip"
android:textStyle="bold"/>
<LinearLayout
android:id="@+id/linear_psd"
android:id="@+id/linear_wifi_info"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:orientation="horizontal"
android:layout_marginHorizontal="@dimen/dp_20"
android:background="@drawable/shape_round_corner_100"
android:layout_marginTop="@dimen/dp_20"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_20">
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/icon_phone_code"/>
<EditText
android:id="@+id/et_input_psd"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="@dimen/dp_10">
<LinearLayout
android:id="@+id/linear_wifi"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColorHint="@color/textPrimaryColor"
android:textColor="@color/textPrimaryColor"
android:hint="@string/input_wifi_psd_tip"/>
android:layout_height="@dimen/dp_50"
android:orientation="horizontal"
android:layout_marginHorizontal="@dimen/dp_20"
android:background="@drawable/shape_round_corner_100"
android:layout_marginTop="@dimen/dp_20"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_20">
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/icon_wifi"/>
<EditText
android:id="@+id/et_wifi_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColor="@color/textPrimaryColor"
android:textColorHint="@color/textPrimaryColor"
android:hint="@string/input_wifi_name_tip"/>
<TextView
android:id="@+id/tv_select_wifi"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:background="@drawable/shape_green_50"
android:paddingVertical="@dimen/dp_8"
android:gravity="center"
android:textSize="13sp"
android:textColor="@color/white"
android:text="@string/select_wifi_tip"/>
</LinearLayout>
<LinearLayout
android:id="@+id/linear_psd"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:orientation="horizontal"
android:layout_marginHorizontal="@dimen/dp_20"
android:background="@drawable/shape_round_corner_100"
android:layout_marginTop="@dimen/dp_20"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/dp_20">
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/icon_phone_code"/>
<EditText
android:id="@+id/et_input_psd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="@null"
android:textSize="14sp"
android:textColorHint="@color/textPrimaryColor"
android:textColor="@color/textPrimaryColor"
android:hint="@string/input_wifi_psd_tip"/>
</LinearLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_wifi_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:visibility="gone"/>
<TextView
android:id="@+id/tv_next"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/white"
android:text="@string/button_next"
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"
android:visibility="gone"/>
</LinearLayout>
<TextView
android:id="@+id/tv_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:textSize="20sp"
android:textColor="@color/textPrimaryColor"
android:text="进度"
android:textStyle="bold"
android:visibility="gone"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_wifi_list"
<LinearLayout
android:id="@+id/linear_connect_ble"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:visibility="gone"/>
android:orientation="vertical">
<ImageView
android:id="@+id/iv_connect_animation"
android:layout_width="@dimen/dp_300"
android:layout_height="@dimen/dp_300"
android:layout_marginTop="@dimen/dp_50"
android:layout_gravity="center_horizontal"
android:src="@drawable/anim_add_device_scan"
android:visibility="visible"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:gravity="center"
android:textSize="20sp"
android:textColor="@color/textPrimaryColor"
android:text="蓝牙连接中"
android:textStyle="bold"/>
</LinearLayout>
<TextView
android:id="@+id/tv_next"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/white"
android:text="@string/button_next"
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"
android:visibility="gone"/>
</LinearLayout>

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

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