大华摄像头更新

wxr

2022-12-01 8301df084faa8f43f4b9cb7f92088e5fd9e64524

大华摄像头更新

 DLL/LC/Android/LcVideoSdk.dll

Binary files differ

 DLL/LC/Android/LcVideoSdk1125.dll

Binary files differ

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -182,9 +182,6 @@
    <Reference Include="ScanSdk">
      <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath>
    </Reference>
    <Reference Include="ZxingSDK">
      <HintPath>..\..\LC\Android\ZxingSDK.dll</HintPath>
    </Reference>
    <Reference Include="Shared.Droid.LCVideoSDK">
      <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
    </Reference>
@@ -200,6 +197,9 @@
    <Reference Include="LcPullToRefreshRecyclerView">
      <HintPath>..\DLL\LC\Android\LcPullToRefreshRecyclerView.dll</HintPath>
    </Reference>
    <Reference Include="ZxingSDK">
      <HintPath>..\DLL\LC\Android\ZxingSDK.dll</HintPath>
    </Reference>
    <Reference Include="LcVideoSdk">
      <HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
    </Reference>

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL_ON/DAL/DriverLayer/Control_Udp.cs

@@ -552,7 +552,7 @@
                        }
                        else
                        {
                            ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { 17, Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
                            ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { (byte)(((int)function.bus.LoopId) + 16), Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });

                        }
                        break;

 HDL_ON/Entity/FunctionList.cs

@@ -73,6 +73,10 @@
            if (_IpCamImou == null)
            {
                _IpCamImou = Functions.FindAll((obj) => obj.spk == SPK.IpCam_Imou);
                if (_IpCamImou.Count > 0)
                {
                    Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                }
            }
            return _IpCamImou;
        }
@@ -373,6 +377,9 @@
            {
                MainPage.Log($"IniFunctionList error : {ex.Message}");
            }
            finally
            {
            }
        }

        /// <summary>
@@ -433,8 +440,18 @@
        /// </summary>
        public void Clear()
        {
            Functions = new List<Function>();
            _FunctionList = null;
            try
            {
                _IpCamImou.Clear();
                _IpCamImou = null;
                _FunctionList.Clear();
                _FunctionList = null;
            }
            catch (Exception ex)
            {
                MainPage.Log($"清理FunctionList异常:{ex.Message}");
                _FunctionList = null;
            }
        }

        /// <summary>

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -233,34 +233,62 @@
                        doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.IpCam_Imou:
                        FunctionList.List.GetIpCamImouList();

                        var waitPage = new Loading();
                        MainPage.BaseView.AddChidren(waitPage);
                        waitPage.Start("");
                        new System.Threading.Thread(() =>
                        {
                            var http = new HttpServerRequest();
                            var pack = http.GetLcSubAccountToken();
                            if (pack.Code == StateCode.SUCCESS)
                            try
                            {
                                if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
                                var http = new HttpServerRequest();
                                var pack = http.GetLcSubAccountToken();
                                if (pack.Code == StateCode.SUCCESS)
                                {
                                    if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
                                    {
                                        Application.RunOnMainThread(() =>
                                        {
                                            new PublicAssmebly().TipMsg("", $"获取乐橙数据失败");
                                        });
                                    }
#if __ANDROID__
                                    Application.RunOnMainThread(() =>
                                    {
                                        try
                                        {
                                            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();
                                            Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
                                        }
                                        catch (Exception ex)
                                        {

                                        }
                                    });
#endif
                                }
                                else
                                {
                                    Application.RunOnMainThread(() =>
                                    {
                                        new PublicAssmebly().TipMsg("", $"获取乐橙数据失败");
                                        new PublicAssmebly().TipMsg("", $"获取乐橙数据失败({pack.Code})");
                                    });
                                }
                                Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                                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();
                                Application.RunOnMainThread(() =>
                                {
                                    //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
                                    Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId,function.name);
                                });
                            }
                            else
                            }catch(Exception ex)
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    new PublicAssmebly().TipMsg("", $"获取乐橙数据失败({pack.Code})");
                                MainPage.Log("加载乐橙摄像头异常");
                            }
                            finally
                            {
                                Application.RunOnMainThread(() => {
                                    if (waitPage != null)
                                    {
                                        waitPage.RemoveFromParent();
                                        waitPage = null;
                                    }
                                });
                            }
                        })

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

@@ -26,15 +26,24 @@
        {
            Action<string, string> action = (s, a) =>
            {
                //var page = new AddDevciePage(brand);
                //MainPage.BasePageView.AddChidren(page);
                //page.LoadPage(contentView);
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                var backTemp = new AddLcCam();
                backTemp.backAction = () => {
                    Load3tyBrandDeviceList();
                };
                Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
                if (brand.productBrand == "")
                {
#if __ANDROID__
                    var backTemp = new AddLcCam();
                    backTemp.backAction = () =>
                    {
                        Load3tyBrandDeviceList();
                    };
                    Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
#endif
                }
                else
                {
                    var page = new AddDevciePage(brand);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage(contentView);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
            };
            new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

 HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs

@@ -104,7 +104,7 @@
            }
            this.function = FunctionList.List.GetAcstParentList()[0];
            this.BackgroundColor = CSS.CSS_Color.BackgroundColor;
            this.AddChidren(new Button() { Height = Application.GetRealHeight(50), BackgroundColor = curColor });
            //this.AddChidren(new Button() { Height = Application.GetRealHeight(50), BackgroundColor = curColor });
            contentView = new VerticalScrolViewLayout() {
                Height = Application.GetRealHeight(667 - 56),
            };
@@ -226,7 +226,8 @@
                }
                Application.RunOnMainThread(() =>
                {
                    var view = basePage.subViewList[temp.sid];
                    AcstSubControlView view = null;
                    basePage.subViewList.TryGetValue(temp.sid,out view);
                    if (view != null)
                    {
                        view.btnSubHumidityValues.Text = temp.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString()) + "%";