1.新增大华摄像头dll及相关功能 2.更换LCVideoOnsdk.dll(跟大华摄像头有冲突) 3.修改适配版本为12.2(含有swift，需12...

chenqiyang

2023-03-16 b002d7e8709e4d6566124bdf7daa4bc3c3fd05d5

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

@@ -7,10 +7,40 @@
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
#if __IOS__
using Shared.IOS.HDLCNVRSDK;
#endif
namespace HDL_ON.UI
{


    public class AddDevciePage : FrameLayout
    {
#if __ANDROID__
    public class dddxx { }
#else
        hdlLCNVRSDKDelegate hdlLCNVRDelegate;
        public class hdlLCNVRSDKDelegate : HDLLCNVRSDKDelegate
        {
            Action act;
            public hdlLCNVRSDKDelegate(Action action)
            {
                act = action;


            }

            public override void AddDeviceFailWithErrorCode(string errorCode)
            {

            }

            public override void BackFromAddDeviceView()
            {
                act?.Invoke();
            }
        }
#endif
        FrameLayout bodyView;
        IntegratedBrand brand;
        VerticalRefreshLayout contentView;
@@ -23,6 +53,7 @@

        public void LoadPage(VerticalRefreshLayout refreshView)
        {

            new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

@@ -49,7 +80,8 @@
        {
            var waitPage = new Loading();
            waitPage.Start();
            new System.Threading.Thread(() => {
            new System.Threading.Thread(() =>
            {
                try
                {
                    var pm = new HttpServerRequest();
@@ -122,7 +154,7 @@
                    Width = Application.GetRealWidth(32),
                    Height = Application.GetRealWidth(32),
                    Radius = (uint)Application.GetRealWidth(4),
                    UnSelectedImagePath =  $"FunctionIcon/Icon/{device.IconName}.png",
                    UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png",
                };
                row.AddChidren(btnIcon);
                Button btnRight = new Button()
@@ -146,11 +178,30 @@
                };
                row.AddChidren(btnName);

                btnName.MouseUpEventHandler = (sender, e) => {


                btnName.MouseUpEventHandler = (sender, e) =>
                {
                    switch (device.spk)
                    {
                        case SPK.IpCam_Imou:
#if __ANDROID__

#if __IOS__

                            //初始化大华摄像头sdk
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                            //跳转添加摄像头
                            hdlLCNVRDelegate = new hdlLCNVRSDKDelegate(() =>
                            {//添加成功返回事件
                                refreshView.BeginHeaderRefreshing();
                                this.RemoveFromParent();
                            });
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().Delegate = hdlLCNVRDelegate;
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToAddDeviceView();
#else
                                FunctionList.List.GetIpCamImouList();
                                if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
                                {
@@ -183,6 +234,7 @@
                                                Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                                                Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
                                                Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();

#if __ANDROID__
                                                Application.RunOnMainThread(() =>
                                                {
@@ -333,24 +385,28 @@
                        case SPK.IrModule:
                            var form = new AddMiniRemoteControlDirection1Page();
                            form.AddForm();
                            form.AddDeviceEvent = (functionObj) => {
                            form.AddDeviceEvent = (functionObj) =>
                            {
                                refreshView.BeginHeaderRefreshing();
                            }; 
                            };
                            break;
                        case SPK.SenesorMegahealth:
                        case SPK.SenesorMegahealth2:
                        case SPK.SensorMmvPose:
                            var form1 = new AddSenesorMegahealthDirection1Page();
                            form1.AddForm(device);
                            form1.AddDeviceEvent = (functionObj) => {
                            form1.AddDeviceEvent = (functionObj) =>
                            {
                                refreshView.BeginHeaderRefreshing();
                                this.RemoveFromParent();
                            };
                            break;
                        case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                        case SPK.SensorEnvironment:
                        case SPK.SensorEnvironmentHailin:
                            var form2 = new AddSensorEnvironmentPage();
                            form2.AddForm(device);
                            form2.AddDeviceEvent = (functionObj) => {
                            form2.AddDeviceEvent = (functionObj) =>
                            {
                                refreshView.BeginHeaderRefreshing();
                                this.RemoveFromParent();
                            };
@@ -359,7 +415,8 @@
                        case SPK.SensorEnvironment3:
                            var form3 = new AddQingpingSensorEnvirTipPage();
                            form3.AddForm(device);
                            form3.AddDeviceEvent = (functionObj) => {
                            form3.AddDeviceEvent = (functionObj) =>
                            {
                                refreshView.BeginHeaderRefreshing();
                                this.RemoveFromParent();
                            };