2023年03月31日19:12:15

wjc

2023-03-31 bbfd7bd230204cca3056740412e9f3562459fc17

2023年03月31日19:12:15

增加三方入口可以到门锁界面

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -18,8 +18,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm

 HDL_ON/Entity/Function/Function.cs

@@ -1393,6 +1393,11 @@
            list.Add(DoorLock);
            return list;
        }
        
        /// <summary>
        /// 猫眼
        /// </summary>
        public const string Peephole = "peephole";
        /// <summary>
        /// 萤石视频门锁
        /// </summary>

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs

@@ -422,9 +422,11 @@
                                this.RemoveFromParent();
                            };
                            break;
                        case SPK.VideoDoorLock: {
                                //跳转到android那边去
                                HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(SPK.VideoDoorLock);
                        case SPK.Peephole:
                        case SPK.VideoDoorLock:
                            {
                                //跳转到android,ios那边去
                                HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(device.spk);
                            }
                            break;
                    }

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs

@@ -3,6 +3,7 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
#if __Android__
using Java.Interop;
using Android.Content;
@@ -115,10 +116,10 @@
            bool isFrist = true;
            foreach (var device in deviceList)
            {
                if (!this.CheckSupportDevice(device))
                {
                    continue;
                }
                //if (!this.CheckSupportDevice(device))
                //{
                //    continue;
                //}
                var row = new RowLayout()
                {
                    Height = Application.GetRealHeight(50),
@@ -205,6 +206,21 @@
                                contentView.BeginHeaderRefreshing();
                            };
                            break;
                        case SPK.VideoDoorLock:
                            {
                                CommonMethod.Current.MainThread(() =>
                                {
                                    //萤石视频门锁
                                    var form = new VideoDoorLockPage(device, btnName, new Button(), CommonMethod.Comerom.sanfan, () =>
                                    {
                                        row.RemoveFromParent();
                                    });
                                    MainPage.BasePageView.AddChidren(form);
                                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                                    form.Show();
                                });
                            }
                            break;
                    }
                };


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

@@ -531,6 +531,7 @@
            collect,//收藏
            room,//房间
            push,//推送
            sanfan,//三方
        }

#if __IOS__

 ys/Jars/hdl_ezvizsdk.aar

Binary files differ