From 8231d2af7893e221d90c71bd5dec4cf3f2f1f0ce Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 十一月 2023 19:07:59 +0800
Subject: [PATCH] 2023年11月30日19:07:47
---
app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java | 95 ++++++
app/src/main/res/layout/activity_set.xml | 88 +----
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 95 ++++++
app/src/main/res/values/strings.xml | 8
app/src/main/AndroidManifest.xml | 17
app/src/main/res/drawable/select_state.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/adapter/LanguageAdapter.java | 122 ++++++++
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 44 --
app/src/main/res/layout/activity_account_and_security.xml | 64 ++++
app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 12
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 3
app/src/main/res/layout/set_line.xml | 2
app/src/main/res/values/colors.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 68 ++--
app/src/main/res/layout/activity_language_selection.xml | 27 +
app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 17
app/src/main/res/drawable/version_icon.png | 0
app/src/main/res/layout/activity_as_regards.xml | 1
app/src/main/res/layout/activity_temperature_unit.xml | 25 +
app/src/main/res/layout/item_language.xml | 53 +++
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 88 +++++
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 21 +
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 6
app/src/main/res/drawable/backgruond_ff6b6b.xml | 5
24 files changed, 708 insertions(+), 155 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6b25e14..dbf67b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -66,12 +66,21 @@
<application
android:name=".HDLApp"
android:allowBackup="true"
- android:icon="@mipmap/ic_launcher"
+ android:icon="@drawable/version_icon"
android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
- android:roundIcon="@mipmap/ic_launcher_round"
+ android:roundIcon="@drawable/version_icon"
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
+ <activity
+ android:name=".ui.me.TemperatureUnitActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.me.languageSelectionActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.me.AccountAndSecurityActivity"
+ android:exported="false" />
<activity
android:name=".ui.me.PersonalDataActivity"
android:exported="false" />
@@ -127,12 +136,10 @@
android:value="812" />
<meta-data
android:name="design_width_in_dp"
- android:value="375" />
- <!--涓嶅姞杩欎釜浣滅敤鍩熶笂鍘绘墦寮�鐩稿唽鐨勬槸闂��-->
+ android:value="375" /> <!-- 涓嶅姞杩欎釜浣滅敤鍩熶笂鍘绘墦寮�鐩稿唽鐨勬槸闂�� -->
<meta-data
android:name="ScopedStorage"
android:value="true" />
-
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
index 9afe853..f74a509 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -330,6 +330,27 @@
}
+
+ /**
+ * 淇敼鐢ㄦ埛鍚嶇О
+ *
+ * @param memberName 鐢ㄦ埛鍚嶇О
+ * @param cloudCallBeak -
+ */
+ public void updateMemberName_C(String memberName, CloudCallBeak<Boolean> cloudCallBeak) {
+ updateMemberInfo_C("", memberName, "", "", "", "", cloudCallBeak);
+ }
+
+ /**
+ * 淇敼鐢ㄦ埛澶村儚
+ *
+ * @param memberHeadIcon 澶村儚鍦板潃
+ * @param cloudCallBeak -
+ */
+ public void updateMemberHeadIcon_C(String memberHeadIcon, CloudCallBeak<Boolean> cloudCallBeak) {
+ updateMemberInfo_C("", "", "", memberHeadIcon, "", "", cloudCallBeak);
+ }
+
/**
* 鏇存柊涓汉淇℃伅(C绔处鍙�)
*
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 25cdd6f..1b0c1a0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -354,9 +354,9 @@
spannable.setSpan(new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
- //todo 闇�瑕佽烦杞埌闅愮鐣岄潰
+ //todo 闇�瑕佽烦杞埌鏈嶅姟鍗忚鐣岄潰
Intent intent = new Intent();
- intent.putExtra("type", 0);
+ intent.putExtra("type", WebActivity.ServiceAgreement);
intent.setClass(_mActivity, WebActivity.class);
startActivity(intent);
}
@@ -378,7 +378,7 @@
public void onClick(@NonNull View widget) {
//todo 闇�瑕佽烦杞埌闅愮鐣岄潰
Intent intent = new Intent();
- intent.putExtra("type", 1);
+ intent.putExtra("type", WebActivity.PrivacyAgreement);
intent.setClass(_mActivity, WebActivity.class);
startActivity(intent);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/LanguageAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/LanguageAdapter.java
new file mode 100644
index 0000000..bade54d
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/LanguageAdapter.java
@@ -0,0 +1,122 @@
+package com.hdl.photovoltaic.ui.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.hdl.photovoltaic.R;
+
+import java.util.List;
+
+public class LanguageAdapter extends RecyclerView.Adapter<LanguageAdapter.MyViewHolder> {
+
+
+ private List<ItemData> mList;
+ private final Context mContext;
+ private OnclickListener noOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
+
+ public LanguageAdapter(List<ItemData> list, Context context) {
+
+ this.mList = list;
+ this.mContext = context;
+ }
+
+ @NonNull
+ @Override
+ public LanguageAdapter.MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_language, parent, false);
+ return new LanguageAdapter.MyViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull LanguageAdapter.MyViewHolder holder, int position) {
+ ItemData itemData = this.mList.get(position);
+ holder.item_lift_name_tv.setText(itemData.getTitle());
+ holder.item_lift_name_tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ holder.item_right_icon_iv.setBackground(null);
+ if (itemData.isState()) {
+ holder.item_lift_name_tv.setTextColor(mContext.getColor(R.color.text_245EC3));
+ holder.item_right_icon_iv.setBackground(mContext.getResources().getDrawable(R.drawable.select_state));
+ }
+ if (position == this.mList.size() - 1) {
+ holder.item_bottom_line_v.setVisibility(View.GONE);
+ }
+ holder.itemView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (noOnclickListener != null) {
+ noOnclickListener.onClick(holder.getAdapterPosition(), itemData);
+ }
+ }
+ });
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return this.mList == null ? 0 : this.mList.size();
+ }
+
+
+ public void setList(List<ItemData> list) {
+ this.mList = list;
+ }
+
+ public void setNoOnclickListener(OnclickListener onclickListener) {
+ this.noOnclickListener = onclickListener;
+ }
+ /**
+ * 涓�琛屽竷灞�瀹瑰櫒
+ */
+ static class MyViewHolder extends RecyclerView.ViewHolder {
+
+
+ public TextView item_lift_name_tv;
+
+ public ImageView item_right_icon_iv;
+ public View item_bottom_line_v;
+
+ public MyViewHolder(@NonNull View itemView) {
+ super(itemView);
+ item_lift_name_tv = itemView.findViewById(R.id.item_lift_name_tv);
+ item_right_icon_iv = itemView.findViewById(R.id.item_right_icon_iv);
+ item_bottom_line_v = itemView.findViewById(R.id.item_bottom_line_v);
+ }
+ }
+
+ public interface OnclickListener {
+ void onClick(int position, ItemData itemData);
+ }
+
+ public static class ItemData {
+
+ private String title;
+ private boolean state;
+
+ public String getTitle() {
+ return title == null ? "" : title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public boolean isState() {
+ return state;
+ }
+
+ public void setState(boolean state) {
+ this.state = state;
+ }
+
+
+ }
+
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
new file mode 100644
index 0000000..926aa71
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
@@ -0,0 +1,88 @@
+package com.hdl.photovoltaic.ui.me;
+
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.databinding.ActivityAccountAndSecurityBinding;
+
+/**
+ * 璐﹀彿鍜屽畨鍏ㄧ殑鐣岄潰
+ */
+public class AccountAndSecurityActivity extends CustomBaseActivity {
+ private ActivityAccountAndSecurityBinding viewBinding;
+
+ @Override
+ public Object getContentView() {
+ viewBinding = ActivityAccountAndSecurityBinding.inflate(getLayoutInflater());
+ return viewBinding.getRoot();
+ }
+
+ @Override
+ public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
+ //鍒濆鍖�
+ initView();
+ //鍒濆鍖栫晫闈㈢洃鍚櫒
+ initEvent();
+ }
+
+ private void initEvent() {
+
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+
+ viewBinding.setAccountPhoneIl.getRoot().setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ }
+ });
+ viewBinding.setAccountMailIl.getRoot().setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ }
+ });
+
+ viewBinding.setChangePswIl.getRoot().setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(MeChangePasswordActivity.class);
+ }
+ });
+
+ viewBinding.setAccountClose.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ }
+ });
+
+
+ }
+
+ private void initView() {
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_account_security);
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+
+ viewBinding.setAccountPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
+ viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setText(R.string.set_not_bind);
+ viewBinding.setAccountPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+
+ viewBinding.setAccountMailIl.sllLlRlNameTv.setText(R.string.set_email_address);
+ viewBinding.setAccountMailIl.sllLlRlRightContentTv.setText(R.string.set_not_bind);
+ viewBinding.setAccountMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+
+ viewBinding.setChangePswIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
index 245df08..b65c318 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
@@ -64,6 +64,8 @@
mNewVersionBean = newVersionBean;
if (newVersionBean != null) {
//todo 鍙戠幇鏂扮増鏈�,鏀瑰彉UI鏍峰紡
+ viewBinding.asRegardsRlRightContentTv.setText(R.string.app_discover_new_version);
+ viewBinding.asRegardsRlRightContentTv.setTextColor(getResources().getColor(R.color.text_245EC3, null));
}
}
@@ -73,7 +75,7 @@
}
});
//todo 绛夋帴鍙�
- String content = "涓嬭浇鍦板潃url";
+ String content = "https://spark.appc02.com/ksgd1";
Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
viewBinding.asRegardsQrCodeIv.setImageBitmap(bitmap);
@@ -99,7 +101,7 @@
@Override
public void onClick(View v) {
Intent intent = new Intent();
- intent.putExtra("type", 0);
+ intent.putExtra("type", WebActivity.ServiceAgreement);
intent.setClass(_mActivity, WebActivity.class);
startActivity(intent);
}
@@ -109,7 +111,7 @@
@Override
public void onClick(View v) {
Intent intent = new Intent();
- intent.putExtra("type", 1);
+ intent.putExtra("type", WebActivity.PrivacyAgreement);
intent.setClass(_mActivity, WebActivity.class);
startActivity(intent);
@@ -119,13 +121,11 @@
}
private void initView() {
- setNotificationBarBackgroundColor(CustomColor.white);
- getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_regard);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- String versionsStr = "v" + AppConfigManage.getVersionName();
+ String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
viewBinding.asRegardsIconVersionsTv.setText(versionsStr);
}
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 a1d776b..900eb6c 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
@@ -72,18 +72,27 @@
// hideLoading();
//鑾峰彇鐢ㄦ埛澶村儚璺緞
if (cUserInfo.getMemberHeadIcon().contains("http")) {
- updateView(null, cUserInfo);
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
} else {
HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String url) {
cUserInfo.setMemberHeadIcon(url);
- updateView(null, cUserInfo);
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
}
@Override
public void onFailure(HDLException e) {
- updateView(null, cUserInfo);
+// //鏇存柊鐢ㄦ埛澶村儚
+// setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
HdlThreadLogic.toast(_mActivity, e);
}
});
@@ -110,7 +119,8 @@
public void onSuccess(BUserInfo bUserInfo) {
mB_UserInfo = bUserInfo;
// hideLoading();
- updateView(bUserInfo, null);
+
+ setMemberName(bUserInfo.getUserName());
}
@Override
@@ -161,38 +171,6 @@
}
/**
- * 鏇存柊ui
- *
- * @param bUserInfo B绔釜浜轰俊鎭�
- * @param cUserInfo C绔釜浜轰俊鎭�
- */
- private void updateView(BUserInfo bUserInfo, CUserInfo cUserInfo) {
- if (viewBinding == null) {
- return;
- }
- String userName = UserConfigManage.getInstance().getUserName();
- if (bUserInfo != null) {
- //B绔�
- userName = bUserInfo.getUserName();
- }
- if (cUserInfo != null) {
- //C绔�
- userName = cUserInfo.getMemberName();
- setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
- }
- viewBinding.fragmentMeUserNameIv.setText(userName);
- UserConfigManage.getInstance().setUserName(userName);
- UserConfigManage.getInstance().Save();
- }
-
- @Override
- public void onResume() {
- super.onResume();
- //鏇存柊鐢ㄦ埛鍚嶇О
- updateView(null, null);
- }
-
- /**
* 鍒濆鍖栫晫闈�
*/
private void initView() {
@@ -228,8 +206,12 @@
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10 && resultCode == 10) {
if (data != null) {
- String url = data.getStringExtra("memberHeadIcon");
- setMemberHeadIcon(url);
+ String iconUrl = data.getStringExtra("memberHeadIcon");
+ String memberName = data.getStringExtra("memberName");
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(iconUrl);
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(memberName);
}
}
@@ -245,4 +227,14 @@
GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4));
}
+
+ /**
+ * 鏄剧ず鐢ㄦ埛鍚嶇О
+ */
+ private void setMemberName(String userName) {
+ viewBinding.fragmentMeUserNameIv.setText(userName);
+ UserConfigManage.getInstance().setUserName(userName);
+ UserConfigManage.getInstance().Save();
+
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
index ab42849..a06881c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
@@ -9,7 +9,6 @@
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.google.gson.JsonObject;
-import com.hdl.linkpm.sdk.core.callback.IDefaultCallBack;
import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -70,11 +69,9 @@
viewBinding.toolbarTopFragmentMeRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- //鏁版嵁鏄娇鐢↖ntent杩斿洖
Intent intent = new Intent();
- //鎶婅繑鍥炴暟鎹瓨鍏ntent
intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
- //璁剧疆杩斿洖鏁版嵁
+ intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
setResult(10, intent);
finish();
}
@@ -132,21 +129,23 @@
cameraAlbumPopWindow = new CameraAlbumPopWindow(_mActivity, new CameraAlbumPopWindow.CameraAlbumListener() {
@Override
public void successCallBack(final File a) {
+ //涓婁紶澶村儚鏂囦欢
HDLLinkPMUser.getInstance().uploadUserHeadImage(a, new IResponseCallBack<ImageSubmitInfo>() {
@Override
public void onSuccess(ImageSubmitInfo imageKey) {
JsonObject imageInfo = new JsonObject();
imageInfo.addProperty("memberHeadIcon", imageKey.getUrl());
- HDLLinkPMUser.getInstance().updateMemberInfo(imageInfo, new IDefaultCallBack() {
+ //涓婁紶澶村儚鍦板潃
+ HdlAccountLogic.getInstance().updateMemberHeadIcon_C(imageKey.getUrl(), new CloudCallBeak<Boolean>() {
@Override
- public void onSuccess() {
+ public void onSuccess(Boolean obj) {
mMemberHeadIconUrl = imageKey.getUrl();
setMemberHeadIcon();
}
@Override
- public void onFailure(HDLException error) {
- HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg());
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("uploadUserHeadImage error:" + e.getMsg());
// hideLoading();
}
});
@@ -180,7 +179,7 @@
confirmationInputDialog.setYesOnclickListener(new ConfirmationInputDialog.onYesOnclickListener() {
@Override
public void Confirm(String str) {
- HdlAccountLogic.getInstance().updateMemberInfo_C("", str, "", "", "", "", new CloudCallBeak<Boolean>() {
+ HdlAccountLogic.getInstance().updateMemberName_C(str, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
UserConfigManage.getInstance().setUserName(str);
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 0c8aafa..4030284 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
@@ -29,6 +29,7 @@
*/
public class SetActivity extends CustomBaseActivity {
+
private ActivitySetBinding viewBinding;
@Override
@@ -55,24 +56,28 @@
finish();
}
});
- viewBinding.setNicknameIl.sllLlNameRl.setOnClickListener(new View.OnClickListener() {
+ //澶氳瑷�
+ viewBinding.setLanguageIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- changedNickname();
+ startActivity(languageSelectionActivity.class);
}
});
- viewBinding.setChangePasswordIl.sllLlNameRl.setOnClickListener(new View.OnClickListener() {
+ //璐﹀彿涓庡畨鍏�
+ viewBinding.setAccountSecurityIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(MeChangePasswordActivity.class);
+ startActivity(AccountAndSecurityActivity.class);
}
});
- viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setOnClickListener(new View.OnClickListener() {
+ //娓╁害鍗曚綅
+ viewBinding.setTemperatureUnitIl.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- v.setSelected(!v.isSelected());
+ startActivity(TemperatureUnitActivity.class);
}
});
+ //閫�鍑虹櫥褰�
viewBinding.outTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -88,30 +93,9 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- viewBinding.setNicknameIl.sllLlRlNameTv.setText(R.string.set_nickname);
- viewBinding.setChangePasswordIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
- viewBinding.setCloseAccountIl.sllLlRlNameTv.setText(R.string.set_close_account);
- viewBinding.setMesIl.sllLlRlTitleTv.setText(R.string.set_message_setting);
- viewBinding.setPushMsgIl.sllLlRlNameTv.setText(R.string.set_push_notification);
- viewBinding.setPushMsgIl.sllLlRlRightNextIv.setVisibility(View.GONE);
- viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setVisibility(View.VISIBLE);
- viewBinding.setCallMsgIl.sllLlRlNameTv.setText(R.string.set_alarm_message);
- viewBinding.setGeneralMsgIl.sllLlRlTitleTv.setText(R.string.set_general_setting);
- viewBinding.setMultiLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
- viewBinding.setDataCenterIl.sllLlRlNameTv.setText(R.string.set_data_centre);
- viewBinding.setPrivacyIl.sllLlRlTitleTv.setText(R.string.set_privacy);
- viewBinding.setSystemAuthorizationIl.sllLlRlNameTv.setText(R.string.set_system_rights_managemen);
- viewBinding.setShareIl.sllLlRlNameTv.setText(R.string.set_3_msg_sharing);
-
- if (UserConfigManage.getInstance().isBAccount()) {
- //B绔�
- viewBinding.setNicknameIl.sllLlNameRl.setVisibility(View.GONE);
- } else {
- //C绔�
- viewBinding.setNicknameIl.sllLlNameRl.setVisibility(View.VISIBLE);
- }
-
-
+ viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
+ viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);
+ viewBinding.setTemperatureUnitIl.sllLlRlNameTv.setText(R.string.set_temperature_unit);
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
new file mode 100644
index 0000000..38f277b
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
@@ -0,0 +1,95 @@
+package com.hdl.photovoltaic.ui.me;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.databinding.ActivityAccountAndSecurityBinding;
+import com.hdl.photovoltaic.databinding.ActivityTemperatureUnitBinding;
+import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 娓╁害鍗曚綅鐨勭晫闈�
+ */
+public class TemperatureUnitActivity extends CustomBaseActivity {
+
+ private ActivityTemperatureUnitBinding viewBinding;
+ private LanguageAdapter languageAdapter;
+
+ private List<LanguageAdapter.ItemData> list;
+
+ @Override
+ public Object getContentView() {
+ viewBinding = ActivityTemperatureUnitBinding.inflate(getLayoutInflater());
+ return viewBinding.getRoot();
+ }
+
+ @Override
+ public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
+ readData();
+ //鍒濆鍖�
+ initView();
+ //鍒濆鍖栫晫闈㈢洃鍚櫒
+ initEvent();
+
+
+ }
+
+ private void readData() {
+ list = new ArrayList<>();
+ LanguageAdapter.ItemData c = new LanguageAdapter.ItemData();
+ c.setState(false);
+ c.setTitle(getString(R.string.set_c));
+ list.add(c);
+ LanguageAdapter.ItemData f = new LanguageAdapter.ItemData();
+ f.setState(false);
+ f.setTitle(getString(R.string.set_f));
+ list.add(f);
+
+ }
+
+ private void initEvent() {
+
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+
+ languageAdapter.setNoOnclickListener(new LanguageAdapter.OnclickListener() {
+ @Override
+ public void onClick(int position, LanguageAdapter.ItemData itemData) {
+ for (int i = 0; i < list.size(); i++) {
+ LanguageAdapter.ItemData data = list.get(i);
+ data.setState(false);
+ }
+ list.get(position).setState(true);
+ languageAdapter.notifyDataSetChanged();
+
+
+ }
+ });
+
+ }
+
+ private void initView() {
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_temperature_unit);
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
+ languageAdapter = new LanguageAdapter(this.list, _mActivity);
+ viewBinding.languageRc.setLayoutManager(linearLayout);
+ viewBinding.languageRc.setAdapter(languageAdapter);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
index 2369660..b9b3843 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
@@ -17,6 +17,9 @@
private ActivityWebBinding viewBinding;
+ public static final int ServiceAgreement = 0;
+ public static final int PrivacyAgreement = 1;
+
/**
* 0,琛ㄧず鏈嶅姟鍗忚
* 1,琛ㄧず闅愮鍗忚
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
new file mode 100644
index 0000000..e35dad7
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
@@ -0,0 +1,95 @@
+package com.hdl.photovoltaic.ui.me;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.databinding.ActivityLanguageSelectionBinding;
+import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class languageSelectionActivity extends CustomBaseActivity {
+
+ /**
+ * 璇█閫夋嫨鐨勭晫闈�
+ */
+ private ActivityLanguageSelectionBinding viewBinding;
+
+ private LanguageAdapter languageAdapter;
+
+ private List<LanguageAdapter.ItemData> list;
+
+ @Override
+ public Object getContentView() {
+ viewBinding = ActivityLanguageSelectionBinding.inflate(getLayoutInflater());
+ return viewBinding.getRoot();
+ }
+
+ @Override
+ public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
+ readData();
+ //鍒濆鍖�
+ initView();
+ //鍒濆鍖栫晫闈㈢洃鍚櫒
+ initEvent();
+
+
+ }
+
+ private void readData() {
+ list = new ArrayList<>();
+ LanguageAdapter.ItemData zh = new LanguageAdapter.ItemData();
+ zh.setState(false);
+ zh.setTitle("绠�浣撲腑鏂�");
+ list.add(zh);
+ LanguageAdapter.ItemData en = new LanguageAdapter.ItemData();
+ en.setState(false);
+ en.setTitle("English");
+ list.add(en);
+
+ }
+
+ private void initEvent() {
+
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+
+ languageAdapter.setNoOnclickListener(new LanguageAdapter.OnclickListener() {
+ @Override
+ public void onClick(int position, LanguageAdapter.ItemData itemData) {
+ for (int i = 0; i < list.size(); i++) {
+ LanguageAdapter.ItemData data = list.get(i);
+ data.setState(false);
+ }
+ list.get(position).setState(true);
+ languageAdapter.notifyDataSetChanged();
+
+
+ }
+ });
+
+ }
+
+ private void initView() {
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_language_choice);
+ viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
+ languageAdapter = new LanguageAdapter(this.list, _mActivity);
+ viewBinding.languageRc.setLayoutManager(linearLayout);
+ viewBinding.languageRc.setAdapter(languageAdapter);
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/backgruond_ff6b6b.xml b/app/src/main/res/drawable/backgruond_ff6b6b.xml
new file mode 100644
index 0000000..4853c42
--- /dev/null
+++ b/app/src/main/res/drawable/backgruond_ff6b6b.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/text_FF6B6B" />
+ <corners android:radius="@dimen/dp_4" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/select_state.png b/app/src/main/res/drawable/select_state.png
new file mode 100644
index 0000000..f18bd94
--- /dev/null
+++ b/app/src/main/res/drawable/select_state.png
Binary files differ
diff --git a/app/src/main/res/drawable/version_icon.png b/app/src/main/res/drawable/version_icon.png
new file mode 100644
index 0000000..54426b7
--- /dev/null
+++ b/app/src/main/res/drawable/version_icon.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_account_and_security.xml b/app/src/main/res/layout/activity_account_and_security.xml
new file mode 100644
index 0000000..47244c1
--- /dev/null
+++ b/app/src/main/res/layout/activity_account_and_security.xml
@@ -0,0 +1,64 @@
+<?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"
+ android:background="@color/text_F5F7FA"
+ tools:context=".ui.me.AccountAndSecurityActivity">
+
+ <include
+ android:id="@+id/toolbar_top_fragment_house_list_rl"
+ layout="@layout/toolbar_top_view_52" />
+
+
+ <include
+ android:id="@+id/set_account_phone_il"
+ layout="@layout/set_line"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ android:layout_marginTop="@dimen/dp_12"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
+
+ <include
+ android:id="@+id/set_account_mail_il"
+ layout="@layout/set_line"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/set_account_phone_il" />
+
+ <include
+ android:id="@+id/set_change_psw_il"
+ layout="@layout/set_line"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_57"
+ android:layout_marginTop="@dimen/dp_12"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/set_account_mail_il" />
+
+
+ <TextView
+ android:id="@+id/set_account_close"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_52"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:layout_marginBottom="@dimen/dp_55"
+ android:background="@drawable/backgruond_ff6b6b"
+ android:gravity="center"
+ android:text="@string/set_close_account"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_18"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+
+ />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index 0911f67..64fdd3d 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -15,6 +15,7 @@
android:id="@+id/as_regards_icon_iv"
android:layout_width="53.5dp"
android:layout_height="53.5dp"
+ android:src="@drawable/version_icon"
android:layout_marginTop="@dimen/dp_29"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_language_selection.xml b/app/src/main/res/layout/activity_language_selection.xml
new file mode 100644
index 0000000..ec64668
--- /dev/null
+++ b/app/src/main/res/layout/activity_language_selection.xml
@@ -0,0 +1,27 @@
+<?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"
+ android:background="@color/text_F5F7FA"
+ tools:context=".ui.me.languageSelectionActivity">
+
+ <include
+ android:id="@+id/toolbar_top_fragment_house_list_rl"
+ layout="@layout/toolbar_top_view_52" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/language_rc"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_0"
+ android:layout_marginTop="@dimen/dp_12"
+ 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">
+
+ </androidx.recyclerview.widget.RecyclerView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 ec388a1..f8e3234 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/app/src/main/res/layout/activity_set.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_F5F7FA"
tools:context=".ui.me.SetActivity">
<include
@@ -14,7 +15,9 @@
android:id="@+id/set_sll"
android:layout_width="match_parent"
android:layout_height="0dp"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginTop="@dimen/dp_12"
+ android:layout_marginBottom="@dimen/dp_20"
+ app:layout_constraintBottom_toTopOf="@+id/out_tv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
@@ -27,78 +30,37 @@
android:orientation="vertical">
<include
- android:id="@+id/set_account_il"
- layout="@layout/set_title_line" />
-
- <include
- android:id="@+id/set_nickname_il"
+ android:id="@+id/set_language_il"
layout="@layout/set_line" />
<include
- android:id="@+id/set_change_password_il"
+ android:id="@+id/set_account_security_il"
layout="@layout/set_line" />
<include
- android:id="@+id/set_close_account_il"
+ android:id="@+id/set_temperature_unit_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_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_logout"
- android:textColor="@color/text_FF5757"
- android:textSize="@dimen/text_16" />
- </RelativeLayout>
-
</LinearLayout>
</ScrollView>
+ <TextView
+ android:id="@+id/out_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_52"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:layout_marginBottom="@dimen/dp_55"
+ android:background="@drawable/backgruond_ff6b6b"
+ android:gravity="center"
+ android:text="@string/set_logout"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_18"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+
+ />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_temperature_unit.xml b/app/src/main/res/layout/activity_temperature_unit.xml
new file mode 100644
index 0000000..574430c
--- /dev/null
+++ b/app/src/main/res/layout/activity_temperature_unit.xml
@@ -0,0 +1,25 @@
+<?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.TemperatureUnitActivity">
+
+ <include
+ android:id="@+id/toolbar_top_fragment_house_list_rl"
+ layout="@layout/toolbar_top_view_52" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/language_rc"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_0"
+ android:layout_marginTop="@dimen/dp_12"
+ 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">
+
+ </androidx.recyclerview.widget.RecyclerView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_language.xml b/app/src/main/res/layout/item_language.xml
new file mode 100644
index 0000000..31591d5
--- /dev/null
+++ b/app/src/main/res/layout/item_language.xml
@@ -0,0 +1,53 @@
+<?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="71dp"
+ android:background="@color/text_FFFFFFFF">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="71dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/item_lift_name_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_16"
+ android:textSize="@dimen/text_16"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <ImageView
+ android:id="@+id/item_right_icon_iv"
+ android:layout_width="@dimen/dp_44"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginEnd="@dimen/dp_21"
+ android:textSize="@dimen/text_16"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:id="@+id/item_bottom_line_v"
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:layout_marginBottom="0.5dp"
+ android:background="@color/text_E1E1E1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+
+ />
+
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/set_line.xml b/app/src/main/res/layout/set_line.xml
index 6564639..424c5cd 100644
--- a/app/src/main/res/layout/set_line.xml
+++ b/app/src/main/res/layout/set_line.xml
@@ -18,7 +18,7 @@
android:layout_height="@dimen/dp_21"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
- android:text="@string/set_nickname"
+ android:text="--"
android:textColor="@color/text_030D1C"
android:textSize="@dimen/text_15"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6a18a38..f009d1c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -40,6 +40,8 @@
<color name="text_FF5757">#FF5757</color>
<color name="text_565758">#565758</color>
<color name="text_222222">#222222</color>
+ <color name="text_FF6B6B">#FF6B6B</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 35b26cd..cba05cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,8 @@
<string name="set_data_centre">鏁版嵁涓績</string>
<string name="set_system_rights_managemen">绯荤粺鏉冮檺绠＄悊</string>
<string name="set_3_msg_sharing">绗笁鏂逛俊鎭叡浜竻鍗�</string>
+ <string name="set_account_security">璐﹀彿涓庡畨鍏�</string>
+ <string name="set_temperature_unit">娓╁害鍗曚綅</string>
<string name="set_logout">閫�鍑虹櫥褰�</string>
<string name="set_privacy">闅愮璁剧疆</string>
<string name="set_nickname_modification">鏄电О淇敼</string>
@@ -114,6 +116,12 @@
<string name="me_personal_data_super_admin">瓒呯骇绠＄悊鍛�</string>
<string name="me_personal_data_photograph">鎷嶇収</string>
<string name="me_personal_data_select_album">浠庣浉鍐屼腑閫夋嫨</string>
+ <string name="set_email_address">鐢靛瓙閭</string>
+ <string name="set_not_bind">鏈粦瀹�</string>
+ <string name="set_language_choice">璇█閫夋嫨</string>
+ <string name="set_c">C(鎽勬皬搴�)</string>
+ <string name="set_f">F(鍗庢皬搴�)</string>
+
<!--app鏇存柊-->
<string name="app_version_number">鐗堟湰鍙�</string>
--
Gitblit v1.8.0