From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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/CPersonalDataActivity.java
similarity index 94%
rename from app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index 8884874..963fa25 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
@@ -10,9 +10,11 @@
import androidx.activity.result.ActivityResultLauncher;
+import androidx.appcompat.content.res.AppCompatResources;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -27,6 +29,7 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
+import com.hdl.photovoltaic.ui.bean.QrCodeBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
@@ -37,9 +40,9 @@
/**
- * 涓汉璧勬枡鐨勭晫闈�
+ * C绔釜浜鸿祫鏂欑殑鐣岄潰
*/
-public class PersonalDataActivity extends CustomBaseActivity {
+public class CPersonalDataActivity extends CustomBaseActivity {
private ActivityPersonalDataBinding viewBinding;
private CameraAlbumPopWindow cameraAlbumPopWindow;
@@ -126,6 +129,15 @@
changedNickname();
}
});
+ viewBinding.personalDataQrCodeIl.getRoot().setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+
+ startActivity(QrCodeMainActivity.class);
+
+ }
+ });
}
@@ -137,9 +149,12 @@
viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
viewBinding.personalDataUserNameIl.sllLlRlNameTv.setText(R.string.me_personal_data_user_name);
+ viewBinding.personalDataQrCodeIl.sllLlRlNameTv.setText(R.string.qr_code_business_card);
viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
+ viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
setMemberHeadIcon();
}
--
Gitblit v1.8.0