From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整,新风,音乐

---
 HDL-ON_Android/Other/JPush/JPushReceiver.cs |   71 +++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 07f2fcb..3261a1a 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -1,31 +1,50 @@
 锘�
 using System;
-using Android.App;
 using Android.Content;
 using CN.Jpush.Android.Api;
 using CN.Jpush.Android.Service;
+using Com.Hdl.Hdllinphonesdk;
 using HDL_ON;
 using HDL_ON.DAL.Server;
 using Shared;
-using Android.OS;
 
 namespace HDL_ON_Android
 {
 
-    [BroadcastReceiver(Enabled = true, Exported = false)]
-    [Android.App.IntentFilter(new string[]
-    {
-        "cn.jpush.android.intent.RECEIVE_MESSAGE"
-    },
-    Categories = new string[]
-    {
-        "com.hdl.onpro"
-    })]
-    public class JPushReceiver : JPushMessageReceiver
+    //[BroadcastReceiver(Enabled = true, Exported = false)]
+    //[Android.App.IntentFilter(new string[]
+    //{
+    //    "cn.jpush.android.intent.RECEIVE_MESSAGE"
+    //},
+    //Categories = new string[]
+    //{
+    //    "com.hdl.onpro"
+    //})]
+
+
+    //[Android.App.Service(Enabled = true)]
+    //[Android.App.IntentFilter(
+    //    new string[] { "cn.jpush.android.intent.SERVICE_MESSAGE" },
+    //    Categories = new string[]
+    //    {
+    //        "com.hdl.onpro"
+    //    })]
+
+    [BroadcastReceiver(Enabled = true, Exported = true)]
+    [Android.App.IntentFilter(new string[] { "cn.jpush.android.intent.SERVICE_MESSAGE" }, Categories = new string[] { "com.hdl.onpro" })]
+    public class JPushReceiver : JPushMessageReceiver// JPushMessageService
     {
 
 
         private static string TAG = "JPushReceiver";
+
+        public override void OnMessage(Context p0, CustomMessage p1)
+        {
+            Console.WriteLine("鏀跺埌鏋佸厜鎺ㄩ��");
+            base.OnMessage(p0, p1);
+
+        }
+
         /// <summary>
         /// 鐢ㄦ埛鐐瑰嚮鎵撳紑浜嗛�氱煡
         /// 鐐瑰嚮閫氱煡鍥炶皟
@@ -34,9 +53,10 @@
         /// <param name="notificationMessage"></param>
         public override void OnNotifyMessageOpened(Context context, NotificationMessage notificationMessage)
         {
+
+
             //2020-12-23 瑙e喅鐐瑰嚮閫氱煡鏍忔墦寮�涓嶄簡APP闂
             //base.OnNotifyMessageOpened(context, notificationMessage);
-
             OpenNotification(context, notificationMessage);
         }
 
@@ -62,14 +82,10 @@
                 pushMes.messageType = jpushExpandData.messageType;
                 pushMes.expantContent = jpushExpandData.expantContent;
                 pushMes.HomeId = jpushExpandData.homeId;
-                Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
+                Utlis.WriteLine("鏀跺埌閫氱煡鍥炶皟\r\nPushMes messageType : " + pushMes.messageType);
             }
 
-            if (!string.IsNullOrEmpty(pushMes.spk))//鑷爺鍙瀵硅闇�瑕佽褰曟椂闂村弽鍛�
-            {
-                UserInfo.Current.pushMessageInfo = pushMes;
-                UserInfo.Current.inCall = DateTime.Now;
-            }
+           
 
             Utlis.WriteLine("PushMes title : " + pushMes.Title);
             Utlis.WriteLine("PushMes message : " + pushMes.Content);
@@ -114,7 +130,6 @@
         public override void OnRegister(Context context, string p1)
         {
             base.OnRegister(context, p1);
-            Utlis.WriteLine("JPushOnRegister: " + p1);
         }
 
         /// <summary>
@@ -147,9 +162,18 @@
                 Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
                 Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);
 
-                Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
-                i.SetFlags(ActivityFlags.NewTask);
-                context.StartActivity(i);
+                if (Shared.Application.Activity == null)
+                {
+                    Intent i = new Intent(context, typeof(SplashActivity));
+                    i.SetFlags(ActivityFlags.NewTask);
+                    context.StartActivity(i);
+                }
+                else
+                {
+                    Intent i = new Intent(context, typeof(BaseActivity));
+                    i.SetFlags(ActivityFlags.NewTask);
+                    context.StartActivity(i);
+                }
                 //瑙f瀽msg
                 AdjustPushMessage(pushMes);
             }
@@ -161,7 +185,6 @@
 
         public static void AdjustPushMessage(JPushMessageInfo pushMes)
         {
-
             new System.Threading.Thread(new System.Threading.ThreadStart(() =>
             {
                 while (MainPage.BasePageView == null)

--
Gitblit v1.8.0