Merge branch 'Dev-Branch' into wjc

wjc

2023-07-19 1b56157e8edc3f502810820d99b607e3629c7171

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs

@@ -77,7 +77,8 @@

#else
                    HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk,list);
                        HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) =>
                        HDLEzvizSdk.SetAddCallback(new
                            AndroidIHdlInterface((isBool, serials) =>
                    {
                        if (isBool)
                        {
@@ -166,7 +167,7 @@
            EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);

#else
            HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
            HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk,"");
#endif


@@ -290,6 +291,7 @@
#if __IOS__
#else
                HDLEzvizSdk.Instance.SetHomeId(home.id);
            
#endif

        }
@@ -321,9 +323,15 @@
            this.MainThread(() =>
            {
                if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
                try
                {
                //{ "deviceSid":"J92513662","type":"opendoormsg","extDevId":"J92513662","deviceId":"1641010144999936001","spk":"security.door.ezviz"}
                var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<ExpantContent>(jpushMessageInfo.expantContent);
                if (expantContent == null)
                    {
                        return;
                    }
                    if (expantContent.spk == null)
                {
                    return;
                }
@@ -345,6 +353,10 @@
                {
                    //开门推送
                    this.UpdateDoorLockState(PushMessageType.Prompt);
                    }
                }catch(Exception ex)
                {
                    
                }
            });

@@ -597,6 +609,7 @@
        {

            Action<bool,string> mAction;
            Action<string> mDoorlockAnswer;
            public AndroidIHdlInterface(Action<bool,string> action)
            {
                mAction = action;
@@ -611,7 +624,10 @@
                mAction?.Invoke(p0,p1);
            }

           
            public void DoorlockAnswer(string p0)
            {
                mDoorlockAnswer?.Invoke(p0);
            }
        }
#endif