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/push/VendorChannelActivity.java |  122 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 122 insertions(+), 0 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java b/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java
new file mode 100644
index 0000000..9509177
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java
@@ -0,0 +1,122 @@
+package com.hdl.photovoltaic.push;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.sdk.android.push.popup.OnPushParseFailedListener;
+import com.alibaba.sdk.android.push.popup.PopupNotifyClick;
+import com.alibaba.sdk.android.push.popup.PopupNotifyClickListener;
+import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.other.HdlPushLogic;
+import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
+
+import java.util.Map;
+
+/**
+ * 鍟嗗巶閫氶亾涓撶敤Activity锛堥�忔槑涓浆椤�)
+ */
+public class VendorChannelActivity extends CustomBaseActivity implements PopupNotifyClickListener, OnPushParseFailedListener {
+
+    private final static String TAG = "VendorChannelActivity";
+    private final PopupNotifyClick mPopupNotifyClick = new PopupNotifyClick(this);
+
+
+    @Override
+    public Object getContentView() {
+        return R.layout.activity_vendor_channel;
+    }
+
+    @Override
+    public void onBindView(Bundle savedInstanceState) {
+        mPopupNotifyClick.onCreate(this, getIntent());
+        // // 寤惰繜涓�灏忔鏃堕棿纭繚鏁版嵁澶勭悊濂藉啀finish锛屽鐞咺ntent
+//        handleIntent(getIntent());
+        // 灏藉揩缁撴潫锛屼笉鏄剧ず鐣岄潰
+
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        Log.d(TAG, "VendorChannelActivity onNewIntent");
+        mPopupNotifyClick.onNewIntent(intent);
+
+    }
+
+
+    /**
+     * 璺宠浆鍒癝tartActivity
+     */
+    private void jumpToStartActivity(String title, String content, Map<String, String> map) {
+        try {
+            String extra = JSONObject.toJSONString(map);
+            PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(title, content, extra);
+            Intent launchIntent = CustomNotification.getInstance().createNotificationIntent(this, pushMessageInfoBean, CustomNotification.FromPush.AliYun);
+            // 鍚姩鐪熸鐨凷tartActivity
+            startActivity(launchIntent);
+            finish();
+        } catch (Exception e) {
+            try {
+                //Log.e(TAG, "璺宠浆鍒癝tartActivity澶辫触", e);
+                // 濡傛灉StartActivity涓嶅瓨鍦紝璺宠浆鍒癕ainActivity
+                Intent mainIntent = CustomNotification.getInstance().createNotificationIntent(this, null, CustomNotification.FromPush.AliYun);
+                startActivity(mainIntent);
+                finish();
+            } catch (Exception e2) {
+                Log.e(TAG, "璺宠浆鍒癕ainActivity涔熷け璐�", e2);
+            }
+        }
+
+    }
+
+
+    @Override
+    public void finish() {
+        super.finish();
+//        // 绂佺敤Activity鍒囨崲鍔ㄧ敾锛屽疄鐜版棤缂濊烦杞�
+//        overridePendingTransition(0, 0);
+    }
+
+
+    @Override
+    public void onSysNoticeOpened(String s, String s1, Map<String, String> map) {
+        //TODO 鑾峰彇鎺ㄩ�佸弬鏁帮紝鏍规嵁涓氬姟闇�姹傚鐞�
+        jumpToStartActivity(s, s1, map);
+
+    }
+
+    @Override
+    public void onPointerCaptureChanged(boolean hasCapture) {
+        super.onPointerCaptureChanged(hasCapture);
+    }
+
+    /**
+     * 涓嶆槸鎺ㄩ�佹暟鎹殑鍥炶皟
+     *
+     * @param intent
+     */
+    @Override
+    public void onNotPushData(Intent intent) {
+        //TODO 娌℃湁鎺ㄩ�佹暟鎹紝鍙兘鏄紓甯歌皟鐢紝闇�瑕佸紓甯稿鐞�
+        finish();
+    }
+
+    /**
+     * 鏄帹閫佹暟鎹紝浣嗘槸鍙堣В瀵嗗け璐ユ椂鐨勫洖璋�
+     *
+     * @param intent
+     */
+    @Override
+    public void onParseFailed(Intent intent) {
+        //TODO 鎺ㄩ�佹暟鎹В瀵嗗紓甯革紝闇�瑕佸紓甯稿鐞�
+        finish();
+    }
+
+
+
+}
\ No newline at end of file

--
Gitblit v1.8.0