Merge branch 'wjc'

wjc

2023-06-19 a1ac20d9cbe90b566bffe3ed39a6e07700c3248f

 app/src/main/res/layout/activity_start.xml

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".ui.StartActivity">
    tools:context="com.hdl.photovoltaic.ui.StartActivity">

    <TextView
        android:layout_width="wrap_content"