萤石门铃

wxr

2024-09-29 6c8a978c08c17230bffcce69a76d5043253e808d

萤石门铃

修复了萤石门铃推送无法弹出界面的问题
云端修改过推送数据，导致原来的流程无法启动萤石门铃的界面

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -53,7 +53,7 @@
        /// <param name="notificationMessage"></param>
        public override void OnNotifyMessageOpened(Context context, NotificationMessage notificationMessage)
        {
            MainPage.Log("接收到推送:点击通知回调");
            //MainPage.Log("接收到推送:点击通知回调");
            OpenNotification(context, notificationMessage,true);
        }

@@ -138,7 +138,7 @@
        {

            try
            {
                MainPage.Log("接收到推送:打开消息显示界面");
                //MainPage.Log("接收到推送:打开消息显示界面");
                var pushMes = new JPushMessageInfo()
                {
                    Title = notificationMessage.NotificationTitle,

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.7.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202409271">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.7.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202409291">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--程序可以读取设备外部存储空间(内置SDcard和外置SDCard)的文件，我的文件等-->

 HDL_ON/Common/HDLCommon.cs

@@ -353,7 +353,8 @@
                                    }
                                }
                            }
                            catch (Exception ex) {
                            catch (Exception ex)
                            {
                                MainPage.Log("Error", $"自研可视对讲通知异常:{ex.StackTrace}");
                            }

@@ -383,7 +384,7 @@
                            })
                            { IsBackground = true }.Start();

                            #elif __IOS__
#elif __IOS__
                            SoundPlayer.Ins.PlaySound();
                            new Thread(() => {
                                int count = 0;
@@ -417,7 +418,7 @@
                                }
                            })
                            { IsBackground = true }.Start();
                            #endif
#endif

                            MainPage.Log("接收到推送:HDL Linphone 狄耐克");
                            eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
@@ -459,11 +460,46 @@
                    }
                    else if (jpushMessageInfo.messageType == (PushMessageType.DOOR_BELL.ToString()))
                    {
                        try
                        {
                            var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
                            string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
                            if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
                            ESVideoInfo eSVideoInfo = new ESVideoInfo();
                            if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
                            {
                                eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"子账号token
                                eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//设备序列号
                                eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
                                eSVideoInfo.spk = json["spk"].ToString();
                                if (eSVideoInfo.spk == SPK.Peephole)
                                {
                                    eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
                                    if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString()))
                                    {
                                        eSVideoInfo.msgId = json["msgId"].ToString();
                                    }
                                    if (json.ContainsKey("currentTime") && !string.IsNullOrEmpty(json["currentTime"].ToString()))
                                    {
                                        eSVideoInfo.currentTime = json["currentTime"].ToString();
                                    }

                                    if (eSVideoInfo != null)
                                    {
                                        //打开呼叫页面
                                        ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);
                                        return;
                                    }
                                }
                            }
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log("Error", $"结束门铃推送数据异常:{ex.Message}");
                        }
                        //萤石门锁推送
                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
                    }

                   
                }
            }
            catch (Exception EX)