From 89e0f6ddd29ad4fb5947bfcea396ad4b55a6621f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 14 六月 2024 11:08:00 +0800
Subject: [PATCH] 2024年06月14日11:07:49
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/QrCodeBean.java | 12 +++++++++++-
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 15 +++++++++++++++
app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java | 10 +++++++++-
app/src/main/res/layout/activity_personal_data.xml | 3 +++
4 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/QrCodeBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/QrCodeBean.java
index 5cf613a..78b74c8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/QrCodeBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/QrCodeBean.java
@@ -9,8 +9,18 @@
private String userName;//鎴峰悕绉�
private String sex;//鎬у埆(鐢凤紝濂�)
private String userPhone;//鎵嬫満鍙�
- private String userEmail;//銆侀偖绠�
+ private String userEmail;//閭
+
+
+ private String account;//璐﹀彿
+ public String getAccount() {
+ return account== null ? "" : account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
public String getUserName() {
return userName == null ? "" : userName;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index ef7d919..963fa25 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.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;
@@ -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();
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
index 8ec0c0f..3056f0c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.ui.me;
+import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Bundle;
@@ -10,12 +11,14 @@
import androidx.appcompat.content.res.AppCompatResources;
+import com.google.gson.Gson;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityQrCodeMainBinding;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.ui.bean.QrCodeBean;
/**
* 浜岀淮鐮佸悕鐗囩殑鐣岄潰
@@ -101,7 +104,12 @@
viewBinding.userAccountTv.setVisibility(View.VISIBLE);
viewBinding.userAccountTv.setText(str);
}
- String content = UserConfigManage.getInstance().getAccount();
+ QrCodeBean qrCodeBean = new QrCodeBean();
+ qrCodeBean.setUserEmail(UserConfigManage.getInstance().getBingEmail());
+ qrCodeBean.setUserPhone(UserConfigManage.getInstance().getBingPhone());
+ qrCodeBean.setUserName(UserConfigManage.getInstance().getUserName());
+ qrCodeBean.setAccount(UserConfigManage.getInstance().getAccount());
+ String content = new Gson().toJson(qrCodeBean);
Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 229, 229, "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
viewBinding.qrCodeIv.setImageBitmap(bitmap);
diff --git a/app/src/main/res/layout/activity_personal_data.xml b/app/src/main/res/layout/activity_personal_data.xml
index c70cd73..b18d5e9 100644
--- a/app/src/main/res/layout/activity_personal_data.xml
+++ b/app/src/main/res/layout/activity_personal_data.xml
@@ -29,6 +29,9 @@
<include
android:id="@+id/personal_data_user_name_il"
layout="@layout/general_line" />
+ <include
+ android:id="@+id/personal_data_qr_code_il"
+ layout="@layout/general_line" />
</LinearLayout>
--
Gitblit v1.8.0