From 5e43612bb0afc1202fe802d4307b02cdfc05756f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 07 十月 2023 17:32:42 +0800
Subject: [PATCH] 2023年10月07日17:32:35
---
app/src/main/res/layout/fragment_me.xml | 1
app/src/main/res/layout/activity_set.xml | 90 +++++++++++
app/src/main/res/values/strings.xml | 21 ++
app/src/main/AndroidManifest.xml | 3
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 42 +++++
app/src/main/res/layout/fragment_me_line.xml | 31 ++-
app/src/main/res/layout/set_line.xml | 48 ++++++
app/src/main/res/values/colors.xml | 2
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java | 68 +++++++-
app/src/main/res/layout/frgment_house_list_line.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 43 ++++
app/src/main/res/layout/set_title_line.xml | 30 +++
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 30 +++
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 10 -
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 3
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 33 +++
16 files changed, 415 insertions(+), 42 deletions(-)
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
index df81b6b..9bb9383 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
@@ -15,12 +15,11 @@
public class GatewayBean implements Serializable {
-
/**
* true-鍦ㄧ嚎
* false-绂荤嚎
*/
- private boolean online=true;
+ private boolean online = true;
/**
* 缃戝叧鍨嬪彿
*/
@@ -88,8 +87,14 @@
*/
private String src;
+ private String systemStatusDesc;//浜戠-鐘舵��
+
+ private String hwVersion;//浜戠-杞欢鐗堟湰鍙�
+ private String categorySecondName;//浜戠-璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+
+
public String getSrc() {
- return src==null?"":this.src;
+ return src == null ? "" : this.src;
}
public void setSrc(String src) {
@@ -119,25 +124,28 @@
public void setOnline(boolean online) {
this.online = online;
}
+
/**
* 缃戝叧鍨嬪彿
*/
public String getDevice_model() {
return device_model == null ? "" : device_model;
}
+
/**
* 缃戝叧鍨嬪彿
*/
public void setDevice_model(String device_model) {
this.device_model = device_model;
}
+
/**
* 缃戝叧澶囨敞
*/
public String getDevice_name() {
- if(TextUtils.isEmpty(device_name)){
+ if (TextUtils.isEmpty(device_name)) {
return getDevice_model();
- }else {
+ } else {
}
return device_name;
@@ -155,7 +163,8 @@
public void setTemplateSettingFlag(boolean templateSettingFlag) {
this.templateSettingFlag = templateSettingFlag;
}
- private String templateAddr ;
+
+ private String templateAddr;
public String getTemplateAddr() {
return templateAddr == null ? "" : templateAddr;
@@ -164,7 +173,6 @@
public void setTemplateAddr(String templateAddr) {
this.templateAddr = templateAddr;
}
-
/**
@@ -176,6 +184,7 @@
/**
* 缃戝叧Mac
+ *
* @return
*/
@NonNull
@@ -189,6 +198,7 @@
public void setDevice_mac(String device_mac) {
this.device_mac = device_mac;
}
+
/**
* 缃戝叧Id
*/
@@ -203,6 +213,7 @@
public void setGatewayId(String gatewayId) {
this.gatewayId = gatewayId;
}
+
/**
* 缃戝叧绫诲瀷
*/
@@ -226,6 +237,7 @@
public void setGateway_type(String gateway_type) {
this.gateway_type = gateway_type;
}
+
/**
* 缃戝叧Oid
*/
@@ -240,6 +252,7 @@
public void setOid(String oid) {
this.oid = oid;
}
+
/**
* IP鍦板潃
*/
@@ -254,6 +267,7 @@
public void setIp_address(String ip_address) {
this.ip_address = ip_address;
}
+
/**
* 杩炴帴鐨勭綉鍏崇被鍨� LAN WIFI
*/
@@ -268,6 +282,7 @@
public void setAccess_mode(String access_mode) {
this.access_mode = access_mode;
}
+
/**
* 鏄惁涓荤綉鍏� true false
*/
@@ -281,18 +296,21 @@
public void setMaster(String master) {
this.master = master;
}
+
/**
* 鏄惁鍔犲瘑
*/
public boolean getIsLocalEncrypt() {
return isLocalEncrypt;
}
+
/**
* 鏄惁鍔犲瘑
*/
public void setIsLocalEncrypt(boolean localEncrypt) {
isLocalEncrypt = localEncrypt;
}
+
/**
* 鑾峰彇浣忓畢Id
*/
@@ -310,23 +328,27 @@
/**
* 鑾峰彇姣背娉id
+ *
* @return sid
*/
public String getSid() {
- return sid==null?"":this.sid;
+ return sid == null ? "" : this.sid;
}
+
/**
* 璁剧疆姣背娉id
*/
public void setSid(String sid) {
this.sid = sid;
}
+
/**
* 鏄惁鏈湴缃戝叧 true false
*/
public void setIsLocalGateWay(boolean isLocalGateWay) {
this.isLocalGateWay = isLocalGateWay;
}
+
/**
* 鑾峰彇缃戝叧鏄惁鏈湴缃戝叧
*/
@@ -336,9 +358,10 @@
/*
- * 妯℃澘鏍囪 wxr
- * */
+ * 妯℃澘鏍囪 wxr
+ * */
private boolean templateFlag = false;
+
public boolean isLocalEncrypt() {
return isLocalEncrypt;
}
@@ -346,4 +369,29 @@
public void setLocalEncrypt(boolean localEncrypt) {
isLocalEncrypt = localEncrypt;
}
+
+
+ public String getSystemStatusDesc() {
+ return systemStatusDesc == null ? "" : systemStatusDesc;
+ }
+
+ public void setSystemStatusDesc(String systemStatusDesc) {
+ this.systemStatusDesc = systemStatusDesc;
+ }
+
+ public String getHwVersion() {
+ return hwVersion == null ? "" : hwVersion;
+ }
+
+ public void setHwVersion(String hwVersion) {
+ this.hwVersion = hwVersion;
+ }
+
+ public String getCategorySecondName() {
+ return categorySecondName == null ? "" : categorySecondName;
+ }
+
+ public void setCategorySecondName(String categorySecondName) {
+ this.categorySecondName = categorySecondName;
+ }
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe8187c..1098bb9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,9 @@
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
<activity
+ android:name=".ui.me.SetActivity"
+ android:exported="false" />
+ <activity
android:name=".ui.account.ChangePassword"
android:exported="false" />
<activity
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index 820d6b8..39ee3a0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -38,7 +38,6 @@
import java.util.ArrayList;
import java.util.List;
-import io.reactivex.rxjava3.disposables.Disposable;
/**
* 璁惧閫昏緫
@@ -110,6 +109,31 @@
public void onSuccess(String str) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
+ //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
+ getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
+ @Override
+ public void onSuccess(List<OidBean> obj) {
+ if (obj == null) {
+ return;
+ }
+ fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
}
}
@@ -237,7 +261,7 @@
* @param cloudCallBeak 鍥炶皟update
*/
public void fullUpdateOid(List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
- String requestUrl = HttpApi.POST_Device_ChildDevices_List;
+ String requestUrl = HttpApi.POST_Device_Oid;
JsonObject json = new JsonObject();
json.addProperty("operationSource", "PROGRAM_ENERGY");//
json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
@@ -558,6 +582,11 @@
gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());
gatewayBean.setLocalEncrypt(true);
gatewayBean.setMaster("true");
+ gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());
+ gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());
+ gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());
+ gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());
+
//娣诲姞缃戝叧
HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index 1708f29..491be13 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -6,9 +6,6 @@
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.view.MotionEvent;
import android.view.View;
import com.google.gson.Gson;
@@ -21,10 +18,7 @@
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
-import com.hdl.sdk.link.core.bean.LinkResponse;
import com.hdl.sdk.link.core.bean.ModbusResponse;
-
-import java.nio.charset.StandardCharsets;
/**
* 鎴戠殑鐢电珯鐣岄潰
@@ -90,9 +84,9 @@
}
private void initView() {
- viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.my_power_station_鐢电珯);
+ viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.my_power_station_title);
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message_娑堟伅);
- viewBinding.myMeBottomIl3.titleTv.setText(R.string.my_power_station_鎴戠殑);
+ viewBinding.myMeBottomIl3.titleTv.setText(R.string.my_power_station_me);
this.bottomViewChangeOfStyle();
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
index fea4793..b86b787 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
@@ -24,11 +24,41 @@
private String osn;//璁惧sn(mac)
private String powerPvNow;//鍙戠數鍔熺巼
private String totalElectricityPvToday;//浠婃棩鍙戠數閲�
+ private String systemStatusDesc;//鐘舵��
+
private String inv;//inv鐘舵��
private int deviceStatus;//1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
private String addresses;
private Map<String, String> status;
+ private String hwVersion;//杞欢鐗堟湰鍙�
+ private String categorySecondName;//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+
+ public String getSystemStatusDesc() {
+ return systemStatusDesc== null ? "" :systemStatusDesc;
+ }
+
+ public void setSystemStatusDesc(String systemStatusDesc) {
+ this.systemStatusDesc = systemStatusDesc;
+ }
+
+ public String getHwVersion() {
+ return hwVersion== null ? "" :hwVersion;
+ }
+
+ public void setHwVersion(String hwVersion) {
+ this.hwVersion = hwVersion;
+ }
+
+ public String getCategorySecondName() {
+ return categorySecondName== null ? "" :categorySecondName;
+ }
+
+ public void setCategorySecondName(String categorySecondName) {
+ this.categorySecondName = categorySecondName;
+ }
+
+
public String getGatewayId() {
return gatewayId == null ? "" : gatewayId;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index 5f88429..e5dda5f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -1,14 +1,16 @@
package com.hdl.photovoltaic.ui.me;
+import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.databinding.FragmentMeBinding;
-import com.hdl.photovoltaic.uni.HDLUniMP;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
+/**
+ * 涓汉涓績鐣岄潰
+ */
public class MeFragment extends CustomBaseFragment {
private FragmentMeBinding viewBinding;
@@ -20,15 +22,46 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.my_power_station_鎴戠殑);
+
+
+ //鍒濆鍖�
+ initView();
+ //鍒濆鍖栫晫闈㈢洃鍚櫒
+ initEvent();
+ //鍒濆鍖栨暟鎹�
+ initData();
+
+
+ }
+
+ private void initData() {
+ }
+
+ private void initEvent() {
+
+ viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent=new Intent();
+ intent.setClass(_mActivity,SetActivity.class);
+ startActivity(intent);
+ }
+ });
+ }
+
+ private void initView() {
+ viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.my_power_station_me);
viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
+
viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
- viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_璁剧疆);
+ viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
+ viewBinding.fragmentMeLineSetIl.fragmentMeLineV.setVisibility(View.VISIBLE);
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_鍏充簬);
-
}
+
+
}
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
new file mode 100644
index 0000000..ea57ab4
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -0,0 +1,42 @@
+package com.hdl.photovoltaic.ui.me;
+
+
+import android.os.Bundle;
+
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.databinding.ActivitySetBinding;
+
+/**
+ * 璁剧疆鐣岄潰
+ */
+public class SetActivity extends CustomBaseActivity {
+
+ private ActivitySetBinding viewBinding;
+
+ @Override
+ public Object getContentView() {
+ viewBinding = ActivitySetBinding.inflate(getLayoutInflater());
+ return viewBinding.getRoot();
+ }
+
+ @Override
+ public void onBindView(Bundle savedInstanceState) {
+ //鍒濆鍖�
+ initView();
+ //鍒濆鍖栫晫闈㈢洃鍚櫒
+ initEvent();
+
+ }
+
+ private void initEvent() {
+
+ }
+
+ private void initView() {
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_set);
+ viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF);
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index 15ab92b..4e3a7dd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -35,6 +35,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * 鐢电珯鍒楄〃鐣岄潰
+ */
public class HouseListFragment extends CustomBaseFragment {
public static final String SORT_TYPE_1 = "powerSort";//鍙戠數鍔熺巼鎺掑簭
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
new file mode 100644
index 0000000..f27536c
--- /dev/null
+++ b/app/src/main/res/layout/activity_set.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".ui.me.SetActivity">
+
+ <include
+ android:id="@+id/toolbar_top_fragment_house_list_rl"
+ layout="@layout/toolbar_top_view_52" />
+
+ <ScrollView
+ android:id="@+id/set_sll"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+
+ <LinearLayout
+ android:id="@+id/sll_ll"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/text_FFFFFFFF"
+ android:orientation="vertical">
+
+ <include
+ android:id="@+id/set_account_il"
+ layout="@layout/set_title_line" />
+
+ <include
+ android:id="@+id/set_nickname_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_change_password_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_close_account_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_mes_il"
+ layout="@layout/set_title_line" />
+
+ <include
+ android:id="@+id/set_push_msg_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_call_msg_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_general_msg_il"
+ layout="@layout/set_title_line" />
+
+ <include
+ android:id="@+id/set_multi_language_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_data_center_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_privacy_il"
+ layout="@layout/set_title_line" />
+
+ <include
+ android:id="@+id/set_system_authorization_il"
+ layout="@layout/set_line" />
+
+ <include
+ android:id="@+id/set_share_il"
+ layout="@layout/set_line" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_100" />
+
+
+ </LinearLayout>
+ </ScrollView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index dc1b9b7..934d5d0 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -46,7 +46,6 @@
layout="@layout/fragment_me_line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
- android:layout_marginTop="@dimen/dp_12"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_line_set_il" />
diff --git a/app/src/main/res/layout/fragment_me_line.xml b/app/src/main/res/layout/fragment_me_line.xml
index 63c114a..a762cd9 100644
--- a/app/src/main/res/layout/fragment_me_line.xml
+++ b/app/src/main/res/layout/fragment_me_line.xml
@@ -29,9 +29,9 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_23"
android:layout_marginStart="@dimen/dp_7"
- android:text="@string/me_璁剧疆"
+ android:text="@string/me_set"
android:textColor="@color/text_90000000"
- android:textSize="@dimen/dp_16"
+ android:textSize="@dimen/text_16"
app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
app:layout_constraintStart_toEndOf="@+id/fragment_me_line_left_icon_iv"
app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
@@ -45,15 +45,24 @@
app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
- <!--闅愯棌绾挎潯-->
-<!-- <View-->
- <!-- android:id="@+id/fragment_me_line_v"-->
- <!-- android:layout_width="0dp"-->
- <!-- android:layout_height="1dp"-->
- <!-- android:background="@color/text_E1E1E1"-->
- <!-- app:layout_constraintBottom_toBottomOf="parent"-->
- <!-- app:layout_constraintEnd_toEndOf="parent"-->
- <!-- app:layout_constraintStart_toStartOf="parent" />-->
+ <!--鍔犲ぇ鐐瑰嚮鐑尯-->
+ <TextView
+ android:id="@+id/fragment_me_line_right_icon_click_iv"
+ android:layout_width="@dimen/dp_80"
+ android:layout_height="match_parent"
+ app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@id/fragment_me_line_left_icon_iv" />
+ <!-- 闅愯棌绾挎潯-->
+ <View
+ android:id="@+id/fragment_me_line_v"
+ android:layout_width="0dp"
+ android:layout_height="0.5dp"
+ android:background="@color/text_E1E1E1"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/frgment_house_list_line.xml b/app/src/main/res/layout/frgment_house_list_line.xml
index e82711b..6b87c59 100644
--- a/app/src/main/res/layout/frgment_house_list_line.xml
+++ b/app/src/main/res/layout/frgment_house_list_line.xml
@@ -30,7 +30,7 @@
android:layout_marginTop="@dimen/dp_28"
android:layout_toEndOf="@+id/fragment_house_list_line_left_iv"
android:gravity="center_vertical"
- android:text="@string/my_power_station_鐢电珯"
+ android:text="@string/my_power_station_title"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_16" />
diff --git a/app/src/main/res/layout/set_line.xml b/app/src/main/res/layout/set_line.xml
new file mode 100644
index 0000000..5736ba5
--- /dev/null
+++ b/app/src/main/res/layout/set_line.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <RelativeLayout
+ android:id="@+id/sll_ll_name_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/sll_ll_rl_name_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/set_nickname"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_15"
+
+ />
+
+ <ImageView
+ android:id="@+id/sll_ll_rl_right_icon_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_13"
+ android:src="@drawable/next" />
+
+ <View
+ android:id="@+id/line_v"
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_alignParentBottom="true"
+ android:background="@color/text_E1E1E1"
+ android:visibility="gone"
+
+ />
+
+ </RelativeLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/set_title_line.xml b/app/src/main/res/layout/set_title_line.xml
new file mode 100644
index 0000000..b9cfe8b
--- /dev/null
+++ b/app/src/main/res/layout/set_title_line.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <RelativeLayout
+ android:id="@+id/sll_ll_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_47"
+ android:background="@color/text_F5F7FA"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/sll_ll_rl_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_19"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_20"
+ android:text="@string/set_account"
+ android:textColor="@color/text_7C8590"
+ android:textSize="@dimen/text_13"
+
+ />
+
+ </RelativeLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8b1fadc..aa3c17a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,5 +34,7 @@
<color name="text_636363">#636363</color>
<color name="text_7C8590">#7C8590</color>
<color name="text_030D1C">#030D1C</color>
+ <color name="text_F5F7FA">#F5F7FA</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 6b4d1df..c52b577 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,8 +53,8 @@
<!--鎴戠殑鐢电珯-->
- <string name="my_power_station_鐢电珯">鐢电珯</string>
- <string name="my_power_station_鎴戠殑">鎴戠殑</string>
+ <string name="my_power_station_title">鐢电珯</string>
+ <string name="my_power_station_me">鎴戠殑</string>
<string name="my_power_station_鎴戠殑鐢电珯">鎴戠殑鐢电珯</string>
<string name="my_power_station_鍙戠數鍔熺巼">鍙戠數鍔熺巼</string>
<string name="my_power_station_浠婃棩鍙戠數">浠婃棩鍙戠數</string>
@@ -73,9 +73,22 @@
<string name="message_娑堟伅">娑堟伅</string>
<!--鎴戠殑-->
- <string name="me_鎴戠殑">鎴戠殑</string>
- <string name="me_璁剧疆">璁剧疆</string>
+ <string name="me">鎴戠殑</string>
+ <string name="me_set">璁剧疆</string>
<string name="me_鍏充簬">鍏充簬</string>
+ <string name="set_account">璐﹀彿瀹夊叏</string>
+ <string name="set_nickname">鏄电О</string>
+ <string name="set_娉ㄩ攢璐﹀彿">娉ㄩ攢璐﹀彿</string>
+ <string name="set_娑堟伅璁剧疆">娑堟伅璁剧疆</string>
+ <string name="set_鎺ㄩ�佹秷鎭�">鎺ㄩ�佹秷鎭�</string>
+ <string name="set_鎶ヨ娑堟伅">鎶ヨ娑堟伅</string>
+ <string name="set_閫氱敤璁剧疆">閫氱敤璁剧疆</string>
+ <string name="set_澶氳瑷�">澶氳瑷�</string>
+ <string name="set_鏁版嵁涓績">鏁版嵁涓績</string>
+ <string name="set_绯荤粺鏉冮檺绠＄悊">绯荤粺鏉冮檺绠＄悊</string>
+ <string name="set_绗笁鏂逛俊鎭叡浜竻鍗�">绗笁鏂逛俊鎭叡浜竻鍗�</string>
+ <string name="set_閫�鍑虹櫥褰�">閫�鍑虹櫥褰�</string>
+
<!--uin-->
<string name="uni_open_error">椤甸潰鍒濆鍖栦腑 璇风瓑寰�5绉掑啀鐐瑰嚮</string>
--
Gitblit v1.8.0