From e7e48e1a65fdaa361e14e7e77e24043a63126bd6 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 13 一月 2026 15:52:15 +0800
Subject: [PATCH] 2026年01月13日15:47:59 升级gradle版本
---
app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 75 +------------------------------------
1 files changed, 3 insertions(+), 72 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 57fb1c4..5c75473 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,23 +1,14 @@
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;
-import android.os.Build;
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;
@@ -29,16 +20,12 @@
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.apkwgtupload.ApkDownLoadService;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.UpdateConfirmationCancelDialog;
-import java.util.Map;
/**
* 鍏充簬鐣岄潰锛坅pp鏇存柊锛�
@@ -141,7 +128,7 @@
Intent intent = new Intent();
intent.setClass(_mActivity, ContactUsActivity.class);
startActivity(intent);
-// String json = "{\"expandData\":{\"expantContent\":\"{\\\"createTime\\\":1763705189605,\\\"homeName\\\":\\\"鏅鸿兘妯″紡娴嬭瘯\\\",\\\"isRead\\\":false,\\\"msgId\\\":1991742202645020673,\\\"type\\\":\\\"EVENT\\\",\\\"homeId\\\":1990254883420880898,\\\"status\\\":\\\"UNTREATED\\\"}\",\"homeId\":1990254883420880898,\"messageType\":\"Alarm\"},\"aps\":{\"badge\":2,\"alert\":{\"title\":\"event\",\"body\":\"Battery voltage low\"}}}";
+ String json = "{\"expandData\":{\"expantContent\":\"{\\\"createTime\\\":1763705189605,\\\"homeName\\\":\\\"鏅鸿兘妯″紡娴嬭瘯\\\",\\\"isRead\\\":false,\\\"msgId\\\":1991742202645020673,\\\"type\\\":\\\"EVENT\\\",\\\"homeId\\\":1990254883420880898,\\\"status\\\":\\\"UNTREATED\\\"}\",\"homeId\":1990254883420880898,\"messageType\":\"Alarm\"},\"aps\":{\"badge\":2,\"alert\":{\"title\":\"event\",\"body\":\"Battery voltage low\"}}}";
//// Gson gson = new Gson();
//// Type type = new TypeToken<Map<String, String>>() {
//// }.getType();
@@ -210,60 +197,4 @@
}, this, ShowErrorMode.YES);
}
- private void showCustomNotification(String title, String message, Map<String, String> data) {
- NotificationManager notificationManager =
- (NotificationManager) _mActivity.getSystemService(Context.NOTIFICATION_SERVICE);
-
- // 鍒涘缓閫氱煡娓犻亾锛圓ndroid 8.0+锛�
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- createNotificationChannel(notificationManager);
- }
-
- NotificationCompat.Builder builder = new NotificationCompat.Builder(_mActivity, "fcm_channel")
- .setSmallIcon(R.drawable.desktop_logo)
- .setContentTitle(title)
- .setContentText(message)
- .setAutoCancel(true)
- .setNumber(5)
- .setWhen(System.currentTimeMillis());
-
-
- // 璁剧疆鐐瑰嚮鎰忓浘
- Intent intent = createNotificationIntent(data);
- PendingIntent pendingIntent = PendingIntent.getActivity(
- _mActivity, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
- builder.setContentIntent(pendingIntent);
-
- // 鏄剧ず閫氱煡
- notificationManager.notify((int) System.currentTimeMillis(), builder.build());
- }
-
- private Intent createNotificationIntent(Map<String, String> data) {
- Intent intent = new Intent(_mActivity, StartActivity.class);
- intent.putExtra("from_fcm", true);
- intent.putExtra("pushData", JSON.toJSON(data).toString());
-// if (data != null) {
-// for (Map.Entry<String, String> entry : data.entrySet()) {
-// intent.putExtra(entry.getKey(), entry.getValue());
-// }
-// }
-
-// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
- return intent;
- }
-
- @RequiresApi(api = Build.VERSION_CODES.O)
- private void createNotificationChannel(NotificationManager notificationManager) {
- NotificationChannel channel = new NotificationChannel(
- "fcm_channel",
- "FCM 娑堟伅",
- NotificationManager.IMPORTANCE_HIGH
- );
- channel.setDescription("Firebase Cloud Messaging 閫氱煡");
- // 鍚敤瑙掓爣
- channel.setShowBadge(true);
- notificationManager.createNotificationChannel(channel);
- BadgeUtils.setBadgeCount(_mActivity, 7);
- }
}
\ No newline at end of file
--
Gitblit v1.8.0