Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

 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);