Merge branch '1.2.1' into 1.2.0_google

wjc

2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db

 app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java

@@ -5,17 +5,15 @@
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;

import androidx.appcompat.content.res.AppCompatResources;

import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.bean.NewVersionBean;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityAsRegardsBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -24,7 +22,6 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;
import com.hdl.photovoltaic.widget.FlashingIconBoxDialog;
import com.hdl.photovoltaic.widget.apkwgtupload.ApkDownLoadService;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.UpdateConfirmationCancelDialog;

@@ -67,7 +64,7 @@
                if (newVersionBean != null) {
                    //todo 发现新版本,改变UI样式
                    viewBinding.asRegardsRlRightContentTv.setText(R.string.app_discover_new_version);
                    viewBinding.asRegardsRlRightContentTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
                    viewBinding.asRegardsRlRightContentTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
                }
            }

@@ -80,7 +77,7 @@
        String content = "https://developer.hdlcontrol.com/AppDownload/HDLPhotovoltaicDownload.html";
        if (!AppConfigManage.getOnlineServer()) {
            //测试环境
            content = "https://developer.hdlcontrol.com/AppDownload/HDLDebugerDownload.html";
               content = "https://developer.hdlcontrol.com/AppDownload/HDLPhotovoltaicDebugDownload.html";
        }
        Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "0", getColor(R.color.text_00000000), Color.WHITE);
        viewBinding.asRegardsQrCodeIv.setImageBitmap(bitmap);
@@ -137,6 +134,7 @@

    private void initView() {
        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getColor(R.color.text_00000000));
        viewBinding.asRegardsVersionUpdatingRl.setVisibility(View.GONE);
        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_regard);
        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
        String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
@@ -170,11 +168,24 @@
                updateConfirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
                    @Override
                    public void Confirm() {
                        Intent intent = new Intent(_mActivity, ApkDownLoadService.class);
                        intent.putExtra("updateUrl", mNewVersionBean.getPackageUrl());
                        intent.putExtra("downLoadName", HdlAppUpdateLogic.getInstance().getApkFileName());
                        intent.putExtra("downLoadType", "0");
                        _mActivity.startService(intent);
                        FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
                        flashingBoxDialog.setContent(getString(R.string.loading_not_supported));
                        flashingBoxDialog.show();
//                        try {
//                            PackageManager packageManager = getPackageManager();
//                            PackageInfo packageInfo = packageManager.getPackageInfo("com.android.vending", 0);
//                            String versionName = packageInfo.versionName; // 获取版本号
//                            int versionCode = packageInfo.versionCode; // 获取版本代码
//                            // 在此处处理版本信息
//                        } catch (PackageManager.NameNotFoundException e) {
//                            e.printStackTrace();
//                            // 处理异常，例如谷歌Play商店应用未安装
//                        }
//
//                        String packageName = "com.hdl.photovoltaic"; // 替换为你想跳转到的应用的包名
//                        Intent intent = new Intent(Intent.ACTION_VIEW);
//                        intent.setData(Uri.parse("market://details?id=" + packageName));
//                        startActivity(intent);
                        updateConfirmationCancelDialog.dismiss();

                    }