From 0c30225f2a63928f8496fa7846c8e26acf090c89 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 07 十月 2023 18:57:53 +0800
Subject: [PATCH] 2023年10月07日18:57:46
---
app/src/main/res/layout/activity_set.xml | 16 +++++++
app/src/main/res/values/strings.xml | 1
app/src/main/res/layout/toolbar_top_view_52.xml | 6 ++-
app/src/main/res/drawable/out_login.xml | 9 ++++
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 27 ++++++++++++-
app/src/main/res/layout/set_line.xml | 12 ++++++
app/src/main/res/values/colors.xml | 1
7 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index ea57ab4..a614e2d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -2,6 +2,9 @@
import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -30,12 +33,32 @@
}
private void initEvent() {
-
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
}
private void initView() {
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_set);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF);
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C));
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF));
+ viewBinding.setNicknameIl.sllLlRlNameTv.setText(R.string.set_nickname);
+ viewBinding.setChangePasswordIl.sllLlRlNameTv.setText(R.string.home_login_淇敼瀵嗙爜);
+ viewBinding.setCloseAccountIl.sllLlRlNameTv.setText(R.string.set_娉ㄩ攢璐﹀彿);
+ viewBinding.setMesIl.sllLlRlTitleTv.setText(R.string.set_娑堟伅璁剧疆);
+ viewBinding.setPushMsgIl.sllLlRlNameTv.setText(R.string.set_鎺ㄩ�佹秷鎭�);
+ viewBinding.setCallMsgIl.sllLlRlNameTv.setText(R.string.set_鎶ヨ娑堟伅);
+ viewBinding.setGeneralMsgIl.sllLlRlTitleTv.setText(R.string.set_閫氱敤璁剧疆);
+ viewBinding.setMultiLanguageIl.sllLlRlNameTv.setText(R.string.set_澶氳瑷�);
+ viewBinding.setDataCenterIl.sllLlRlNameTv.setText(R.string.set_鏁版嵁涓績);
+ viewBinding.setPrivacyIl.sllLlRlTitleTv.setText(R.string.set_privacy);
+ viewBinding.setSystemAuthorizationIl.sllLlRlNameTv.setText(R.string.set_绯荤粺鏉冮檺绠＄悊);
+ viewBinding.setShareIl.sllLlRlNameTv.setText(R.string.set_绗笁鏂逛俊鎭叡浜竻鍗�);
+// viewBinding.setPushMsgIl.sllLlRlRightIconIv.setLayoutParams(new RelativeLayout.LayoutParams(57, 31));
}
diff --git a/app/src/main/res/drawable/out_login.xml b/app/src/main/res/drawable/out_login.xml
new file mode 100644
index 0000000..2d6b4c6
--- /dev/null
+++ b/app/src/main/res/drawable/out_login.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="@dimen/dp_28" />
+ <stroke
+ android:width="@dimen/dp_1"
+ android:color="@color/text_FF5757" />
+
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
index f27536c..2d6d07f 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/app/src/main/res/layout/activity_set.xml
@@ -80,7 +80,21 @@
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_100" />
+ android:layout_height="@dimen/dp_141">
+
+ <TextView
+ android:id="@+id/out_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_41"
+ android:layout_marginStart="@dimen/dp_86"
+ android:layout_marginTop="@dimen/dp_50"
+ android:layout_marginEnd="@dimen/dp_86"
+ android:background="@drawable/out_login"
+ android:gravity="center"
+ android:text="@string/set_閫�鍑虹櫥褰�"
+ android:textColor="@color/text_FF5757"
+ android:textSize="@dimen/text_16" />
+ </RelativeLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/set_line.xml b/app/src/main/res/layout/set_line.xml
index 5736ba5..55c2aff 100644
--- a/app/src/main/res/layout/set_line.xml
+++ b/app/src/main/res/layout/set_line.xml
@@ -33,6 +33,18 @@
android:layout_marginEnd="@dimen/dp_13"
android:src="@drawable/next" />
+ <TextView
+ android:id="@+id/sll_ll_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/sll_ll_rl_right_icon_iv"
+ android:text="@string/set_nickname"
+ android:textColor="@color/text_7C8590"
+ android:textSize="@dimen/text_15"
+ android:visibility="gone" />
+
<View
android:id="@+id/line_v"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/toolbar_top_view_52.xml b/app/src/main/res/layout/toolbar_top_view_52.xml
index 2ce085a..0cb2a32 100644
--- a/app/src/main/res/layout/toolbar_top_view_52.xml
+++ b/app/src/main/res/layout/toolbar_top_view_52.xml
@@ -19,8 +19,10 @@
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_gravity="center"
- android:layout_marginLeft="@dimen/dp_16"
- android:scaleType="centerInside" />
+ android:layout_marginStart="@dimen/dp_16"
+ android:scaleType="centerInside"
+ android:src="@drawable/back"
+ />
</LinearLayout>
<!--2.鏍囬鏂囨湰-->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aa3c17a..afabc07 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,6 +35,7 @@
<color name="text_7C8590">#7C8590</color>
<color name="text_030D1C">#030D1C</color>
<color name="text_F5F7FA">#F5F7FA</color>
+ <color name="text_FF5757">#FF5757</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c52b577..774cc9e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,6 +88,7 @@
<string name="set_绯荤粺鏉冮檺绠＄悊">绯荤粺鏉冮檺绠＄悊</string>
<string name="set_绗笁鏂逛俊鎭叡浜竻鍗�">绗笁鏂逛俊鎭叡浜竻鍗�</string>
<string name="set_閫�鍑虹櫥褰�">閫�鍑虹櫥褰�</string>
+ <string name="set_privacy">闅愮璁剧疆</string>
<!--uin-->
--
Gitblit v1.8.0