From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
index abccc93..382ce06 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
@@ -1,6 +1,10 @@
 package com.hdl.photovoltaic.ui.me;
 
 
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -9,6 +13,12 @@
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.linkpm.sdk.user.bean.NewVersionBean;
 import com.hdl.photovoltaic.R;
@@ -20,10 +30,16 @@
 import com.hdl.photovoltaic.other.HdlAppUpdateLogic;
 import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.ui.BPowerStationActivity;
+import com.hdl.photovoltaic.ui.CPowerStationActivity;
+import com.hdl.photovoltaic.ui.StartActivity;
+import com.hdl.photovoltaic.utils.BadgeUtils;
 import com.hdl.photovoltaic.widget.FlashingBoxDialog;
 import com.hdl.photovoltaic.widget.FlashingIconBoxDialog;
 import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
 import com.hdl.photovoltaic.widget.UpdateConfirmationCancelDialog;
+
+import java.util.Map;
 
 /**
  * 鍏充簬鐣岄潰锛坅pp鏇存柊锛�
@@ -77,7 +93,7 @@
         String content = "https://developer.hdlcontrol.com/AppDownload/HDLPhotovoltaicDownload.html";
         if (!AppConfigManage.getOnlineServer()) {
             //娴嬭瘯鐜
-               content = "https://developer.hdlcontrol.com/AppDownload/HDLPhotovoltaicDebugDownload.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);
@@ -126,7 +142,6 @@
                 Intent intent = new Intent();
                 intent.setClass(_mActivity, ContactUsActivity.class);
                 startActivity(intent);
-
             }
         });
 
@@ -200,4 +215,8 @@
             }
         }, this, ShowErrorMode.YES);
     }
+
+   
+
+ 
 }
\ No newline at end of file

--
Gitblit v1.8.0