code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-20 18:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

android端bug修复

Browse Source
This commit is contained in:
kerwincui
2021-06-24 14:55:33 +08:00
parent ba344fad6a
commit 81055decbe
10 changed files with 166 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
android/app/src/main/res/layout/fragment_add_device.xml
View File

@@ -34,30 +34,43 @@
android:animationCache="false"
android:background="#FFFFFF">
<com.xuexiang.xui.widget.progress.CircleProgressView
android:id="@+id/progressView_circle_main"
android:layout_width="220dp"
android:layout_height="220dp"
android:layout_gravity="center"
android:layout_marginTop="0dp"
android:layout_marginBottom="0dp"
app:cpv_animate_type="AccelerateDecelerateInterpolator"
app:cpv_circle_broken="false"
app:cpv_end_color="#80006DFE"
app:cpv_end_progress="100"
app:cpv_isFilled="false"
app:cpv_isGraduated="false"
app:cpv_isTracked="true"
app:cpv_progress_duration="3000"
app:cpv_progress_textColor="#0D006DFE"
app:cpv_progress_textSize="48sp"
app:cpv_progress_textVisibility="false"
app:cpv_progress_width="16dp"
app:cpv_scaleZone_width="3dp"
app:cpv_start_color="@color/cardview_light_background"
app:cpv_start_progress="0"
app:cpv_track_color="#FAFAFF"
app:cpv_track_width="26dp" />
<com.king.view.circleprogressview.CircleProgressView
android:id="@+id/circleProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:cpvBlockAngle="1"
app:cpvDuration="300"
app:cpvMax="100"
app:cpvProgress="0"
app:cpvProgressColor="#006DFE"
app:cpvShowLabel="false"
app:cpvStrokeWidth="12dp"
app:cpvTickSplitAngle="5" />
<!-- <com.xuexiang.xui.widget.progress.CircleProgressView-->
<!-- android:id="@+id/progressView_circle_main"-->
<!-- android:layout_width="220dp"-->
<!-- android:layout_height="220dp"-->
<!-- android:layout_gravity="center"-->
<!-- android:layout_marginTop="0dp"-->
<!-- android:layout_marginBottom="0dp"-->
<!-- app:cpv_animate_type="LinearInterpolator"-->
<!-- app:cpv_circle_broken="false"-->
<!-- app:cpv_end_color="#006dfe"-->
<!-- app:cpv_end_progress="98"-->
<!-- app:cpv_isFilled="false"-->
<!-- app:cpv_isGraduated="false"-->
<!-- app:cpv_isTracked="true"-->
<!-- app:cpv_progress_duration="3000"-->
<!-- app:cpv_progress_textSize="48sp"-->
<!-- app:cpv_progress_textVisibility="false"-->
<!-- app:cpv_progress_width="16dp"-->
<!-- app:cpv_scaleZone_width="3dp"-->
<!-- app:cpv_start_color="@color/cardview_light_background"-->
<!-- app:cpv_start_progress="0"-->
<!-- app:cpv_track_color="#FAFAFF"-->
<!-- app:cpv_track_width="26dp" />-->
<LinearLayout
android:layout_width="wrap_content"
@@ -71,14 +84,14 @@
android:layout_height="wrap_content"
android:text="0"
android:textColor="@color/colorAccent"
android:textSize="48sp" />
android:textSize="40dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="%"
android:textColor="@color/colorAccent"
android:textSize="32sp" />
android:textSize="28dp" />
</LinearLayout>
</FrameLayout>
@@ -141,7 +154,7 @@
app:met_errorMessage="WIFI密码无效"
app:met_floatingLabel="normal"
app:met_floatingLabelText="WIFI密码"
app:met_passWordButton="true" />
app:met_passWordButton="false" />
</FrameLayout>
@@ -159,14 +172,13 @@
android:textColor="@color/colorAccent"
android:textSize="12sp" />
<RadioButton
android:id="@+id/remember_passord_radio"
<CheckBox
android:id="@+id/chk_remeber"
android:layout_width="wrap_content"
android:layout_height="42dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:checked="true"
android:text="记住密码"
android:textSize="12sp" />
android:text="记住密码" />
</RelativeLayout>

16
android/app/src/main/res/layout/fragment_device_edit.xml
View File

@@ -135,6 +135,18 @@
android:layout_marginStart="80dp"
android:layout_marginTop="@dimen/config_margin_18dp"
android:text="v1.0" />
<com.xuexiang.xui.widget.textview.supertextview.SuperButton
android:id="@+id/sp_upgrade"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginStart="120dp"
android:layout_marginTop="18dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="升级"
app:sCornersRadius="5dp"
app:sSolidColor="@color/app_color_theme_2" />
</FrameLayout>
<FrameLayout
@@ -202,7 +214,7 @@
android:layout_height="35dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="40dp"
android:text="取消"
android:text="返 回"
app:sCornersRadius="5dp"
app:sSolidColor="@color/app_color_theme_2" />
@@ -213,7 +225,7 @@
android:layout_marginStart="110dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="100dp"
android:text="保存"
android:text="保 存"
app:sCornersRadius="5dp"
app:sSolidColor="@color/colorAccent" />
</FrameLayout>

4
android/app/src/main/res/layout/fragment_device_set.xml
View File

@@ -313,7 +313,7 @@
android:layout_height="35dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="40dp"
android:text="取消"
android:text="取 消"
app:sCornersRadius="5dp"
app:sSolidColor="@color/app_color_theme_2" />
@@ -326,7 +326,7 @@
android:layout_marginEnd="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="100dp"
android:text="应用"
android:text="应 用"
app:sCornersRadius="5dp"
app:sSolidColor="@color/colorAccent" />
</FrameLayout>

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

@@ -93,7 +93,7 @@
<string name="esptouch1_package_multicast">组播</string>
<string name="esptouch1_confirm">确认</string>
<string name="esptouch1_wifi_5g_message">设备不支持 5G Wi-Fi, 请确认当前连接的 Wi-Fi 为 2.4G, 或者您可以尝试选择组播</string>
<string name="esptouch1_location_permission_title">⚠️警告️</string>
<string name="esptouch1_location_permission_title">⚠ 警告 </string>
<string name="esptouch1_location_permission_message">在 Android M 及以上版本，如果您禁止授权位置权限，APP将无法获取 Wi-Fi 信息。</string>
<string name="esptouch1_configure_wifi_change_message">Wi-Fi 已断开或发生了变化</string>
<string name="esptouch1_configuring_message">Esptouch 正在执行配网, 请稍等片刻…</string>