~wjc/HDLPhotovoltaicDebugAPP.git

parent: ff0ee15e | 补丁 | 提交 | show whitespace

2025年03月13日13:14:12

wjc

2025-03-13 fca10a1c33626368a34e107df8a4d442b7d7b1ca

2025年03月13日13:14:12

8个文件已修改

	app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_change_password.xml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/activity_register_account.xml	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/dialog_static_list.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/fragment_me.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values-en/strings.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values-zh/strings.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/values/strings.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java

@@ -72,27 +72,27 @@
        initView();
        //初始化界面监听器
        initEvent();
        KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
            @Override
            public void onKeyboardShow(int h) {
                ConstraintSet cs = new ConstraintSet();
                cs.clone(viewBinding.parentCl);
                cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
                //应用约束
                cs.applyTo(viewBinding.parentCl);
            }

            @Override

            public void onKeyboardHide(int h) {
                ConstraintSet cs = new ConstraintSet();
                cs.clone(viewBinding.parentCl);
                cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
                //应用约束
                cs.applyTo(viewBinding.parentCl);
            }

        });
//        KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
//            @Override
//            public void onKeyboardShow(int h) {
//                ConstraintSet cs = new ConstraintSet();
//                cs.clone(viewBinding.parentCl);
//                cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
//                //应用约束
//                cs.applyTo(viewBinding.parentCl);
//            }
//
//            @Override
//
//            public void onKeyboardHide(int h) {
//                ConstraintSet cs = new ConstraintSet();
//                cs.clone(viewBinding.parentCl);
//                cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
//                //应用约束
//                cs.applyTo(viewBinding.parentCl);
//            }
//
//        });
    }



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

@@ -7,6 +7,18 @@
    android:background="@drawable/login"
    tools:context=".ui.account.ChangePassword">

    <androidx.core.widget.NestedScrollView
        android:id="@+id/parent_nsv"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:fillViewport="true"
        android:overScrollMode="never">

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/parent_cl1"
            android:layout_width="match_parent"
            android:layout_height="match_parent">

    <TextView
        android:id="@+id/change_back_tv"
        android:layout_width="@dimen/dp_30"
@@ -370,5 +382,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" />
        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.core.widget.NestedScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -8,6 +8,18 @@
    android:background="@drawable/login"
    tools:context=".ui.account.RegisterAccountActivity">

    <androidx.core.widget.NestedScrollView
        android:id="@+id/parent_nsv"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:fillViewport="true"
        android:overScrollMode="never">

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/parent_cl1"
            android:layout_width="match_parent"
            android:layout_height="match_parent">

    <!--    <ImageView-->
    <!--        android:layout_width="0dp"-->
    <!--        android:layout_height="0dp"-->
@@ -423,6 +435,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />

        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.core.widget.NestedScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -52,7 +52,7 @@

    <View
        android:layout_width="match_parent"
        android:layout_height="20dp"
        android:layout_height="10dp"
        android:background="@color/text_FF000000"

        />

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

@@ -34,6 +34,7 @@
                    android:layout_centerInParent="true"
                    android:text="@string/me"
                    android:textColor="@color/text_E6FFFFFF"

                    android:textSize="@dimen/text_18" />



 app/src/main/res/values-en/strings.xml

@@ -345,7 +345,7 @@
    <string name="account">Account</string>
    <string name="psw">Password</string>

    <string name="battery_capacity_indicator">Battery capacity</string>
    <string name="battery_capacity_indicator">Battery energy</string>
    <string name="be_debugging">Debugging in progress</string>
    <string name="debugging_completed">Debugging completed</string>
    <string name="delivered">Delivered</string>

 app/src/main/res/values-zh/strings.xml

@@ -341,7 +341,7 @@
    <string name="account_not_recoverable">注销账户是不可恢复的操作，注销账户之后，您APP所有账户数据（包括昵称、头像、二维码照片等）都会被删除，且无法再找回。</string>
    <string name="account">账号</string>
    <string name="psw">密码</string>
    <string name="battery_capacity_indicator">电池容量</string>
    <string name="battery_capacity_indicator">电池能量</string>
    <string name="be_debugging">调试中</string>
    <string name="debugging_completed">调试完成</string>
    <string name="delivered">已交付</string>

 app/src/main/res/values/strings.xml

@@ -341,7 +341,7 @@
    <string name="account_not_recoverable">注销账户是不可恢复的操作，注销账户之后，您APP所有账户数据（包括昵称、头像、二维码照片等）都会被删除，且无法再找回。</string>
    <string name="account">账号</string>
    <string name="psw">密码</string>
    <string name="battery_capacity_indicator">电池容量</string>
    <string name="battery_capacity_indicator">电池能量</string>
    <string name="be_debugging">调试中</string>
    <string name="debugging_completed">调试完成</string>
    <string name="delivered">已交付</string>

			@@ -72,27 +72,27 @@
			initView();
			//初始化界面监听器
			initEvent();
			KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
			@Override
			public void onKeyboardShow(int h) {
			ConstraintSet cs = new ConstraintSet();
			cs.clone(viewBinding.parentCl);
			cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
			//应用约束
			cs.applyTo(viewBinding.parentCl);
			}

			@Override

			public void onKeyboardHide(int h) {
			ConstraintSet cs = new ConstraintSet();
			cs.clone(viewBinding.parentCl);
			cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
			//应用约束
			cs.applyTo(viewBinding.parentCl);
			}

			});
			// KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
			// @Override
			// public void onKeyboardShow(int h) {
			// ConstraintSet cs = new ConstraintSet();
			// cs.clone(viewBinding.parentCl);
			// cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
			// //应用约束
			// cs.applyTo(viewBinding.parentCl);
			// }
			//
			// @Override
			//
			// public void onKeyboardHide(int h) {
			// ConstraintSet cs = new ConstraintSet();
			// cs.clone(viewBinding.parentCl);
			// cs.connect(viewBinding.registerConfirmPswEt.getId(), ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, px2dip(h));//
			// //应用约束
			// cs.applyTo(viewBinding.parentCl);
			// }
			//
			// });
			}

			@@ -7,6 +7,18 @@
			android:background="@drawable/login"
			tools:context=".ui.account.ChangePassword">

			<androidx.core.widget.NestedScrollView
			android:id="@+id/parent_nsv"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:fillViewport="true"
			android:overScrollMode="never">

			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/parent_cl1"
			android:layout_width="match_parent"
			android:layout_height="match_parent">

			<TextView
			android:id="@+id/change_back_tv"
			android:layout_width="@dimen/dp_30"
			@@ -370,5 +382,7 @@
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" />
			</androidx.constraintlayout.widget.ConstraintLayout>
			</androidx.core.widget.NestedScrollView>

			</androidx.constraintlayout.widget.ConstraintLayout>

			@@ -8,6 +8,18 @@
			android:background="@drawable/login"
			tools:context=".ui.account.RegisterAccountActivity">

			<androidx.core.widget.NestedScrollView
			android:id="@+id/parent_nsv"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:fillViewport="true"
			android:overScrollMode="never">

			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/parent_cl1"
			android:layout_width="match_parent"
			android:layout_height="match_parent">

			<!-- <ImageView-->
			<!-- android:layout_width="0dp"-->
			<!-- android:layout_height="0dp"-->
			@@ -423,6 +435,7 @@
			app:layout_constraintEnd_toEndOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />

			</androidx.constraintlayout.widget.ConstraintLayout>
			</androidx.core.widget.NestedScrollView>

			</androidx.constraintlayout.widget.ConstraintLayout>

			@@ -52,7 +52,7 @@

			<View
			android:layout_width="match_parent"
			android:layout_height="20dp"
			android:layout_height="10dp"
			android:background="@color/text_FF000000"

			/>

			@@ -34,6 +34,7 @@
			android:layout_centerInParent="true"
			android:text="@string/me"
			android:textColor="@color/text_E6FFFFFF"

			android:textSize="@dimen/text_18" />

			@@ -345,7 +345,7 @@
			<string name="account">Account</string>
			<string name="psw">Password</string>

			<string name="battery_capacity_indicator">Battery capacity</string>
			<string name="battery_capacity_indicator">Battery energy</string>
			<string name="be_debugging">Debugging in progress</string>
			<string name="debugging_completed">Debugging completed</string>
			<string name="delivered">Delivered</string>

			@@ -341,7 +341,7 @@
			<string name="account_not_recoverable">注销账户是不可恢复的操作，注销账户之后，您APP所有账户数据（包括昵称、头像、二维码照片等）都会被删除，且无法再找回。</string>
			<string name="account">账号</string>
			<string name="psw">密码</string>
			<string name="battery_capacity_indicator">电池容量</string>
			<string name="battery_capacity_indicator">电池能量</string>
			<string name="be_debugging">调试中</string>
			<string name="debugging_completed">调试完成</string>
			<string name="delivered">已交付</string>