From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
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 8d0a4d9..8884874 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
@@ -10,7 +10,6 @@
import androidx.activity.result.ActivityResultLauncher;
-import androidx.core.app.ActivityCompat;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
@@ -26,7 +25,6 @@
import com.hdl.photovoltaic.databinding.ActivityPersonalDataBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
-import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.uni.HDLUniMP;
@@ -94,7 +92,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentMeRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopFragmentMeRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// backPressedData();
@@ -134,7 +132,7 @@
private void initView() {
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
- viewBinding.toolbarTopFragmentMeRl.topBackBtn.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentMeRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
--
Gitblit v1.8.0