From 18aad0f6f20ce89e2e904a59952f72c194ce085b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 25 四月 2025 13:42:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/featrue/1.2.0-hxb' into 1.2.0
---
app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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 25130eb..bab8420 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
@@ -108,9 +108,9 @@
qrCodeBean.setUserPhone(UserConfigManage.getInstance().getBingPhone());
qrCodeBean.setUserName(UserConfigManage.getInstance().getUserName());
qrCodeBean.setAccount(UserConfigManage.getInstance().getAccount());
- String content = UserConfigManage.getInstance().getBingEmail() + ";" + UserConfigManage.getInstance().getBingPhone() + ";" + UserConfigManage.getInstance().getUserName() + ";" + UserConfigManage.getInstance().getAccount();
+// String content = UserConfigManage.getInstance().getBingEmail() + ";" + UserConfigManage.getInstance().getBingPhone() + ";" + UserConfigManage.getInstance().getUserName() + ";" + UserConfigManage.getInstance().getAccount();
// String content = UserConfigManage.getInstance().getAccount();//
- //String content = new Gson().toJson(qrCodeBean);//鍐呭杩囬暱寰俊鎵爜鏄剧ず鏈夐棶棰�
+ String content = new Gson().toJson(qrCodeBean);//鍐呭杩囬暱寰俊鎵爜鏄剧ず鏈夐棶棰�
Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
viewBinding.qrCodeIv.setImageBitmap(bitmap);
--
Gitblit v1.8.0