app/src/main/res/layout/activity_as_regards.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/activity_home_login.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/fragment_me.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/fragment_message.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/home_bottom_line.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/res/layout/activity_as_regards.xml
@@ -11,215 +11,231 @@ android:id="@+id/toolbar_top_rl" layout="@layout/toolbar_top_view_44" /> <ImageView android:id="@+id/as_regards_icon_iv" android:layout_width="53.5dp" android:layout_height="53.5dp" android:layout_marginTop="@dimen/dp_29" android:src="@drawable/logo" <androidx.core.widget.NestedScrollView android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" android:overScrollMode="never" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl" /> app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl"> <TextView android:id="@+id/as_regards_icon_versions_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:text="@string/app_version_number" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_iv" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent"> <ImageView android:id="@+id/as_regards_qr_code_iv" android:layout_width="168dp" android:layout_height="168dp" android:layout_marginTop="@dimen/dp_34" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_versions_tv" /> <TextView android:id="@+id/as_regards_download_app_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:text="@string/app_scan_code_download" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" /> <!--版本更新--> <RelativeLayout android:id="@+id/as_regards_version_updating_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_57" android:layout_marginTop="@dimen/dp_29" android:background="@color/text_FFFFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv"> <TextView android:id="@+id/as_regards_version_updating_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/app_version_upgrade" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_15" /> <LinearLayout android:id="@+id/as_regards_version_updating_ll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_13"> <!--标准图标--> <ImageView android:id="@+id/as_regards_rl_ll_right_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:src="@drawable/next" /> </LinearLayout> android:id="@+id/as_regards_icon_iv" android:layout_width="53.5dp" android:layout_height="53.5dp" android:layout_marginTop="@dimen/dp_29" android:src="@drawable/logo" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/as_regards_rl_right_content_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_9" android:layout_toStartOf="@+id/as_regards_version_updating_ll" android:text="@string/app_new_version" android:textColor="@color/text_7C8590" android:textSize="@dimen/text_15" /> <TextView android:id="@+id/as_regards_icon_versions_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:text="@string/app_version_number" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_iv" /> </RelativeLayout> <!--服务协议--> <RelativeLayout android:id="@+id/service_agreement_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_57" android:background="@color/text_FFFFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_version_updating_rl"> <TextView android:id="@+id/service_agreement_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/app_service_agreement" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_15" /> <LinearLayout android:id="@+id/service_agreement_ll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_13"> <!--标准图标--> <ImageView android:id="@+id/service_agreement_ll_right_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:src="@drawable/next" /> </LinearLayout> android:id="@+id/as_regards_qr_code_iv" android:layout_width="168dp" android:layout_height="168dp" android:layout_marginTop="@dimen/dp_34" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_icon_versions_tv" /> <TextView android:id="@+id/as_regards_download_app_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginTop="@dimen/dp_12" android:text="@string/app_scan_code_download" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_qr_code_iv" /> <!--版本更新--> <RelativeLayout android:id="@+id/as_regards_version_updating_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_57" android:layout_marginTop="@dimen/dp_29" android:background="@color/text_FFFFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_download_app_tv"> <TextView android:id="@+id/as_regards_version_updating_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/app_version_upgrade" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_15" /> <LinearLayout android:id="@+id/as_regards_version_updating_ll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_13"> <!--标准图标--> <ImageView android:id="@+id/as_regards_rl_ll_right_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:src="@drawable/next" /> </LinearLayout> <TextView android:id="@+id/as_regards_rl_right_content_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_9" android:layout_toStartOf="@+id/as_regards_version_updating_ll" android:text="@string/app_new_version" android:textColor="@color/text_7C8590" android:textSize="@dimen/text_15" /> </RelativeLayout> <!--服务协议--> <RelativeLayout android:id="@+id/service_agreement_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_57" android:background="@color/text_FFFFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/as_regards_version_updating_rl"> <TextView android:id="@+id/service_agreement_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/app_service_agreement" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_15" /> <LinearLayout android:id="@+id/service_agreement_ll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_13"> <!--标准图标--> <ImageView android:id="@+id/service_agreement_ll_right_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:src="@drawable/next" /> </LinearLayout> </RelativeLayout> <!--隐私政策--> <RelativeLayout android:id="@+id/privacy_policy_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_57" android:background="@color/text_FFFFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl"> </RelativeLayout> <!--隐私政策--> <RelativeLayout android:id="@+id/privacy_policy_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_57" android:background="@color/text_FFFFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/service_agreement_rl"> <TextView android:id="@+id/privacy_policy_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/app_privacy_policy" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_15" <TextView android:id="@+id/privacy_policy_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/app_privacy_policy" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_15" /> /> <LinearLayout android:id="@+id/privacy_policy_ll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_13"> <!--标准图标--> <ImageView android:id="@+id/privacy_policy_ll_right_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:src="@drawable/next" /> </LinearLayout> <LinearLayout android:id="@+id/privacy_policy_ll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_13"> <!--标准图标--> <ImageView android:id="@+id/privacy_policy_ll_right_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:src="@drawable/next" /> </LinearLayout> </RelativeLayout> <!--联系我们--> <RelativeLayout android:id="@+id/contact_us_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_57" android:background="@color/text_FFFFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl"> </RelativeLayout> <!--联系我们--> <RelativeLayout android:id="@+id/contact_us_rl" android:layout_width="match_parent" android:layout_height="@dimen/dp_57" android:background="@color/text_FFFFFFFF" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/privacy_policy_rl"> <TextView android:id="@+id/contact_us_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/contact_us" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_15" <TextView android:id="@+id/contact_us_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_21" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_16" android:text="@string/contact_us" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_15" /> /> <LinearLayout android:id="@+id/contact_us_ll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_13"> <!--标准图标--> <ImageView android:id="@+id/contact_us_ll_right_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:src="@drawable/next" /> </LinearLayout> <LinearLayout android:id="@+id/contact_us_ll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/dp_13"> <!--标准图标--> <ImageView android:id="@+id/contact_us_ll_right_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:src="@drawable/next" /> </LinearLayout> </RelativeLayout> </RelativeLayout> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/layout/activity_home_login.xml
@@ -8,301 +8,314 @@ android:background="@color/text_FFFFFFFF" tools:context="com.hdl.photovoltaic.ui.LoginActivity"> <ImageView android:layout_width="0dp" android:layout_height="612dp" android:background="@drawable/logo_bj" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <LinearLayout android:id="@+id/home_login_language_ll" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_60" android:gravity="center_vertical" android:orientation="horizontal" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> <TextView android:id="@+id/home_login_language_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/language_pull_down" android:text="@string/home_login_chinese" android:textColor="@color/text_FF000000" android:textSize="@dimen/text_14" /> <ImageView android:id="@+id/home_login_down_iv" android:layout_width="11dp" android:layout_height="7dp" android:layout_marginStart="@dimen/dp_4" android:src="@drawable/language_pull_down" /> </LinearLayout> <!-- <TextView--> <!-- android:id="@+id/home_login_language_tv"--> <!-- android:layout_width="wrap_content"--> <!-- android:layout_height="@dimen/dp_20"--> <!-- android:layout_marginStart="@dimen/dp_20"--> <!-- android:layout_marginTop="@dimen/dp_63"--> <!-- android:src="@drawable/language_pull_down"--> <!-- android:text="@string/home_login_chinese"--> <!-- android:textColor="@color/text_FF000000"--> <!-- android:textSize="@dimen/text_14"--> <!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent" />--> <!-- <ImageView--> <!-- android:id="@+id/home_login_down_iv"--> <!-- android:layout_width="11dp"--> <!-- android:layout_height="7dp"--> <!-- android:layout_marginStart="81.5dp"--> <!-- android:src="@drawable/language_pull_down"--> <!-- app:layout_constraintBottom_toBottomOf="@+id/home_login_language_tv"--> <!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintTop_toTopOf="@+id/home_login_language_tv" />--> <TextView android:id="@+id/home_login_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_39" android:layout_marginTop="@dimen/dp_40" android:text="@string/app_name" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_28" android:textStyle="bold" app:layout_constraintStart_toStartOf="@+id/home_login_language_ll" app:layout_constraintTop_toBottomOf="@+id/home_login_language_ll" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/home_login_check_b_c_cl" android:layout_width="wrap_content" android:layout_height="20dp" android:layout_marginTop="@dimen/dp_56" app:layout_constraintStart_toStartOf="@+id/home_login_language_ll" app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv"> <ImageView android:id="@+id/home_login_check_b_c_iv" android:layout_width="20dp" android:layout_height="20dp" android:background="@drawable/yesandnoselected" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/home_login_install_user_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_6" android:text="@string/home_login_an_installer" android:textColor="@color/text_FF000000" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv" app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> <!--账号输入框--> <EditText android:id="@+id/home_login_account_et" <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="@dimen/dp_45" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_44" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:gravity="center_vertical" android:hint="@string/home_login_input_phone_email" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_FF000000" android:textColorHint="@color/text_25000000" android:textSize="@dimen/text_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_check_b_c_cl" /> android:layout_height="match_parent" android:fillViewport="true" android:overScrollMode="never"> <ImageView android:id="@+id/home_login_clear_contents_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/clear" app:layout_constraintBottom_toBottomOf="@+id/home_login_account_et" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/home_login_account_et" /> <View android:id="@+id/home_login_line1_v" android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_E1E1E1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_account_et" /> <TextView android:id="@+id/home_login_account_text_error_tv" android:layout_width="2dp" android:layout_height="14dp" android:layout_marginTop="2dp" android:textColor="@color/text_D34545" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/home_login_line1_v" app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" /> <!--密码输入框--> <EditText android:id="@+id/home_login_password_et" android:layout_width="match_parent" android:layout_height="@dimen/dp_45" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="32dp" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:gravity="center_vertical" android:hint="@string/home_login_input_psw" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_FF000000" android:textColorHint="@color/text_25000000" android:textSize="@dimen/text_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" /> <ImageView android:id="@+id/home_login_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" app:layout_constraintBottom_toBottomOf="@+id/home_login_password_et" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/home_login_password_et" /> <View android:id="@+id/home_login_line2_v" android:layout_width="0dp" android:layout_height="0.5dp" android:background="@color/text_E1E1E1" app:layout_constraintEnd_toEndOf="@+id/home_login_line1_v" app:layout_constraintStart_toStartOf="@+id/home_login_line1_v" app:layout_constraintTop_toBottomOf="@+id/home_login_password_et" /> <TextView android:id="@+id/home_login_password_text_error_tv" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:layout_marginEnd="@dimen/dp_20" android:textColor="@color/text_D34545" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/home_login_line2_v" app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" /> <!--注册--> <TextView android:id="@+id/home_login_register_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:text="@string/home_login_register" android:textColor="@color/text_245EC3" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="@+id/home_login_line2_v" app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" /> <!--忘记密码--> <TextView android:id="@+id/home_login_forget_password_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginTop="@dimen/dp_24" android:text="@string/home_login_forget_password" android:textColor="@color/text_245EC3" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v" app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" /> <!--登录--> <TextView android:id="@+id/home_login_tv" android:layout_width="0dp" android:layout_height="52dp" android:layout_marginTop="44dp" android:background="@drawable/yesandnocheck" android:enabled="false" android:gravity="center" android:text="@string/home_login_logoin" android:textColor="@color/text_FFFFFFFF" android:textSize="18sp" app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v" app:layout_constraintStart_toStartOf="@+id/home_login_line2_v" app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" /> <TextView android:id="@+id/home_login_experience_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_25" android:layout_marginTop="@dimen/text_28" android:text="@string/home_login_power_station" android:textColor="@color/text_245EC3" android:textSize="18sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_tv" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent"> <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_32" android:gravity="center" android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> <ImageView android:layout_width="0dp" android:layout_height="612dp" android:background="@drawable/logo_bj" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <ImageView android:id="@+id/home_login_privacy_check_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:background="@drawable/yesandnoselected" /> <LinearLayout android:id="@+id/home_login_language_ll" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_60" android:gravity="center_vertical" android:orientation="horizontal" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> <View android:layout_width="@dimen/dp_6" android:layout_height="match_parent" /> <TextView android:id="@+id/home_login_language_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/language_pull_down" android:text="@string/home_login_chinese" android:textColor="@color/text_FF000000" android:textSize="@dimen/text_14" /> <TextView android:id="@+id/home_login_privacy_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_40" android:layout_marginStart="@dimen/dp_6" android:gravity="start|center" android:singleLine="false" android:tag="click" android:text="@string/home_login_consent_service_agreement" android:textColor="@color/text_FF000000" android:textSize="@dimen/text_14" /> </LinearLayout> <ImageView android:id="@+id/home_login_down_iv" android:layout_width="11dp" android:layout_height="7dp" android:layout_marginStart="@dimen/dp_4" android:src="@drawable/language_pull_down" /> </LinearLayout> <!-- <TextView--> <!-- android:id="@+id/home_login_language_tv"--> <!-- android:layout_width="wrap_content"--> <!-- android:layout_height="@dimen/dp_20"--> <!-- android:layout_marginStart="@dimen/dp_20"--> <!-- android:layout_marginTop="@dimen/dp_63"--> <!-- android:src="@drawable/language_pull_down"--> <!-- android:text="@string/home_login_chinese"--> <!-- android:textColor="@color/text_FF000000"--> <!-- android:textSize="@dimen/text_14"--> <!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent" />--> <!-- <ImageView--> <!-- android:id="@+id/home_login_down_iv"--> <!-- android:layout_width="11dp"--> <!-- android:layout_height="7dp"--> <!-- android:layout_marginStart="81.5dp"--> <!-- android:src="@drawable/language_pull_down"--> <!-- app:layout_constraintBottom_toBottomOf="@+id/home_login_language_tv"--> <!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintTop_toTopOf="@+id/home_login_language_tv" />--> <TextView android:id="@+id/home_login_title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_39" android:layout_marginTop="@dimen/dp_40" android:text="@string/app_name" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_28" android:textStyle="bold" app:layout_constraintStart_toStartOf="@+id/home_login_language_ll" app:layout_constraintTop_toBottomOf="@+id/home_login_language_ll" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/home_login_check_b_c_cl" android:layout_width="wrap_content" android:layout_height="20dp" android:layout_marginTop="@dimen/dp_56" app:layout_constraintStart_toStartOf="@+id/home_login_language_ll" app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv"> <ImageView android:id="@+id/home_login_check_b_c_iv" android:layout_width="20dp" android:layout_height="20dp" android:background="@drawable/yesandnoselected" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/home_login_install_user_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_6" android:text="@string/home_login_an_installer" android:textColor="@color/text_FF000000" android:textSize="@dimen/text_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv" app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> <!--账号输入框--> <EditText android:id="@+id/home_login_account_et" android:layout_width="match_parent" android:layout_height="@dimen/dp_45" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_44" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:gravity="center_vertical" android:hint="@string/home_login_input_phone_email" android:inputType="text" android:lines="1" android:maxLines="1" android:textColor="@color/text_FF000000" android:textColorHint="@color/text_25000000" android:textSize="@dimen/text_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_check_b_c_cl" /> <ImageView android:id="@+id/home_login_clear_contents_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/clear" app:layout_constraintBottom_toBottomOf="@+id/home_login_account_et" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/home_login_account_et" /> <View android:id="@+id/home_login_line1_v" android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:background="@color/text_E1E1E1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_account_et" /> <TextView android:id="@+id/home_login_account_text_error_tv" android:layout_width="2dp" android:layout_height="14dp" android:layout_marginTop="2dp" android:textColor="@color/text_D34545" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/home_login_line1_v" app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" /> <!--密码输入框--> <EditText android:id="@+id/home_login_password_et" android:layout_width="match_parent" android:layout_height="@dimen/dp_45" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="32dp" android:layout_marginEnd="@dimen/dp_60" android:background="@null" android:gravity="center_vertical" android:hint="@string/home_login_input_psw" android:inputType="textPassword" android:lines="1" android:maxLines="1" android:textColor="@color/text_FF000000" android:textColorHint="@color/text_25000000" android:textSize="@dimen/text_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" /> <ImageView android:id="@+id/home_login_hide_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_32" android:src="@drawable/hide" app:layout_constraintBottom_toBottomOf="@+id/home_login_password_et" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/home_login_password_et" /> <View android:id="@+id/home_login_line2_v" android:layout_width="0dp" android:layout_height="0.5dp" android:background="@color/text_E1E1E1" app:layout_constraintEnd_toEndOf="@+id/home_login_line1_v" app:layout_constraintStart_toStartOf="@+id/home_login_line1_v" app:layout_constraintTop_toBottomOf="@+id/home_login_password_et" /> <TextView android:id="@+id/home_login_password_text_error_tv" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="2dp" android:layout_marginEnd="@dimen/dp_20" android:textColor="@color/text_D34545" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/home_login_line2_v" app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" /> <!--注册--> <TextView android:id="@+id/home_login_register_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:text="@string/home_login_register" android:textColor="@color/text_245EC3" android:textSize="@dimen/text_14" app:layout_constraintStart_toStartOf="@+id/home_login_line2_v" app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" /> <!--忘记密码--> <TextView android:id="@+id/home_login_forget_password_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_20" android:layout_marginTop="@dimen/dp_24" android:text="@string/home_login_forget_password" android:textColor="@color/text_245EC3" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v" app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" /> <!--登录--> <TextView android:id="@+id/home_login_tv" android:layout_width="0dp" android:layout_height="52dp" android:layout_marginTop="44dp" android:background="@drawable/yesandnocheck" android:enabled="false" android:gravity="center" android:text="@string/home_login_logoin" android:textColor="@color/text_FFFFFFFF" android:textSize="18sp" app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v" app:layout_constraintStart_toStartOf="@+id/home_login_line2_v" app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" /> <TextView android:id="@+id/home_login_experience_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_25" android:layout_marginTop="@dimen/text_28" android:text="@string/home_login_power_station" android:textColor="@color/text_245EC3" android:textSize="18sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_login_tv" /> <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_32" android:gravity="center" android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"> <ImageView android:id="@+id/home_login_privacy_check_iv" android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:background="@drawable/yesandnoselected" /> <View android:layout_width="@dimen/dp_6" android:layout_height="match_parent" /> <TextView android:id="@+id/home_login_privacy_tv" android:layout_width="wrap_content" android:layout_height="@dimen/dp_40" android:layout_marginStart="@dimen/dp_6" android:gravity="start|center" android:singleLine="false" android:tag="click" android:text="@string/home_login_consent_service_agreement" android:textColor="@color/text_FF000000" android:textSize="@dimen/text_14" /> </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/layout/fragment_me.xml
@@ -5,121 +5,131 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/bj"> <!--头部标签--> <RelativeLayout android:id="@+id/title_cl" <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="@dimen/dp_44" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_38" android:layout_marginEnd="@dimen/dp_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> android:layout_height="match_parent" android:fillViewport="true" android:overScrollMode="never"> <TextView android:id="@+id/me_title_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="@string/me" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_18" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="match_parent"> <!--头部标签--> <RelativeLayout android:id="@+id/title_cl" android:layout_width="match_parent" android:layout_height="@dimen/dp_44" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_38" android:layout_marginEnd="@dimen/dp_16" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> <TextView android:id="@+id/me_title_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="@string/me" android:textColor="@color/text_030D1C" android:textSize="@dimen/text_18" /> </RelativeLayout> </RelativeLayout> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/fragment_me_icon_parent_cl" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_13" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_cl"> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/fragment_me_icon_parent_cl" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_13" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_cl"> <ImageView android:id="@+id/fragment_me_icon_iv" android:layout_width="73dp" android:layout_height="73dp" android:background="@drawable/default_image" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <ImageView android:id="@+id/fragment_me_icon_iv" android:layout_width="73dp" android:layout_height="73dp" android:background="@drawable/default_image" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/fragment_me_user_name_tv" android:layout_width="wrap_content" android:layout_height="22dp" android:layout_marginTop="@dimen/dp_16" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv" app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv" app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" /> <TextView android:id="@+id/fragment_me_user_name_tv" android:layout_width="wrap_content" android:layout_height="22dp" android:layout_marginTop="@dimen/dp_16" android:textColor="@color/text_E6000000" android:textSize="@dimen/text_18" app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv" app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv" app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" /> <ImageView android:id="@+id/fragment_me_user_name_next_iv" android:layout_width="16dp" android:layout_height="@dimen/dp_16" android:layout_marginStart="3dp" android:src="@drawable/next" app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_name_tv" app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv" app:layout_constraintTop_toTopOf="@+id/fragment_me_user_name_tv" /> <ImageView android:id="@+id/fragment_me_user_name_next_iv" android:layout_width="16dp" android:layout_height="@dimen/dp_16" android:layout_marginStart="3dp" android:src="@drawable/next" app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_name_tv" app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv" app:layout_constraintTop_toTopOf="@+id/fragment_me_user_name_tv" /> <TextView android:id="@+id/fragment_me_user_role_tv" android:layout_width="wrap_content" android:layout_height="17dp" android:layout_marginTop="@dimen/dp_11" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv" app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv" app:layout_constraintTop_toBottomOf="@+id/fragment_me_user_name_tv" /> <TextView android:id="@+id/fragment_me_user_role_tv" android:layout_width="wrap_content" android:layout_height="17dp" android:layout_marginTop="@dimen/dp_11" android:textColor="@color/text_66000000" android:textSize="@dimen/text_14" app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv" app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv" app:layout_constraintTop_toBottomOf="@+id/fragment_me_user_name_tv" /> <ImageView android:id="@+id/fragment_me_user_role_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:layout_marginStart="3dp" android:src="@drawable/next" app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_role_tv" app:layout_constraintStart_toEndOf="@+id/fragment_me_user_role_tv" app:layout_constraintTop_toTopOf="@+id/fragment_me_user_role_tv" /> </androidx.constraintlayout.widget.ConstraintLayout> <ImageView android:id="@+id/fragment_me_user_role_next_iv" android:layout_width="@dimen/dp_16" android:layout_height="@dimen/dp_16" android:layout_marginStart="3dp" android:src="@drawable/next" app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_role_tv" app:layout_constraintStart_toEndOf="@+id/fragment_me_user_role_tv" app:layout_constraintTop_toTopOf="@+id/fragment_me_user_role_tv" /> </androidx.constraintlayout.widget.ConstraintLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_25" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/bj_13fffffff" android:orientation="vertical" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl"> <!--设备调试--> <include android:id="@+id/fragment_me_line_device_debug_il" layout="@layout/fragment_me_line" /> <!--主账号才显示--> <include android:id="@+id/fragment_me_line_user_management_il" layout="@layout/fragment_me_line" /> <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_25" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/bj_13fffffff" android:orientation="vertical" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl"> <!--设备调试--> <include android:id="@+id/fragment_me_line_device_debug_il" layout="@layout/fragment_me_line" /> <!--主账号才显示--> <include android:id="@+id/fragment_me_line_user_management_il" layout="@layout/fragment_me_line" /> <include android:id="@+id/fragment_me_line_set_il" layout="@layout/fragment_me_line" /> <!--关于--> <include android:id="@+id/fragment_me_line_asregards_il" layout="@layout/fragment_me_line" /> </LinearLayout> <include android:id="@+id/fragment_me_line_set_il" layout="@layout/fragment_me_line" /> <!--关于--> <include android:id="@+id/fragment_me_line_asregards_il" layout="@layout/fragment_me_line" /> </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout> app/src/main/res/layout/fragment_message.xml
@@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="20dp" android:layout_marginEnd="4dp" android:layout_marginEnd="36dp" android:layout_toEndOf="@+id/message_tab_nascent_title_tv" android:text="@string/alarm_record" android:textColor="@color/text_66000000" app/src/main/res/layout/home_bottom_line.xml
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="0dp" android:layout_height="@dimen/dp_49" android:layout_width="100dp" android:layout_height="@dimen/dp_64" android:layout_weight="1"> <ImageView @@ -16,7 +16,7 @@ <TextView android:id="@+id/title_tv" android:layout_width="wrap_content" android:layout_height="@dimen/text_16" android:layout_height="wrap_content" android:layout_below="@+id/icon_iv" android:layout_centerInParent="true" android:textColor="@color/text_E6000000"