2.0备份

wxr

2023-07-25 39b8b0b9bcf5805ada1a44e5dc72f05f9c6e4fcc

2.0备份

 HDL-ON_Android/Assets/Language.ini

@@ -667,6 +667,10 @@
680=Colorful switch
681=Test
682=Group
683=The time is invalid
684=Length out of range





@@ -2008,6 +2012,8 @@
680=炫彩开关
681=自动炫彩测试
682=群组
683=该时间无效
684=长度超出范围



@@ -3348,7 +3354,10 @@
680=Colorful switch
681=Test
682=Group
683=
683=The time is invalid
684=Length out of range





@@ -4685,6 +4694,8 @@
680=Colorful switch
681=Test
682=Group
683=The time is invalid
684=Length out of range



@@ -6010,7 +6021,8 @@
680=Colorful switch
681=Test
682=Group

683=The time is invalid
684=Length out of range




 HDL-ON_Android/Assets/Phone/Classification/Room/HomePagebg.png

 HDL-ON_Android/Assets/Phone/Classification/Room/Roombg.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -456,6 +456,7 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_white.png" />
    <AndroidAsset Include="Assets\Phone\Classification\Room\HomePagebg.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -59,7 +59,7 @@
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodesignProvision>OnPro230605-1-Dev</CodesignProvision>
<CodesignProvision>OnPro230630-1-Dev</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
@@ -1616,6 +1616,7 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockHelpImage4.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
      <BundleResource Include="Resources\Phone\Classification\Room\HomePagebg.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Resources/Language.ini

@@ -667,6 +667,10 @@
680=Colorful switch
681=Test
682=Group
683=The time is invalid
684=Length out of range





@@ -2008,6 +2012,8 @@
680=炫彩开关
681=自动炫彩测试
682=群组
683=该时间无效
684=长度超出范围



@@ -3348,7 +3354,10 @@
680=Colorful switch
681=Test
682=Group
683=
683=The time is invalid
684=Length out of range





@@ -4685,6 +4694,8 @@
680=Colorful switch
681=Test
682=Group
683=The time is invalid
684=Length out of range



@@ -6010,7 +6021,8 @@
680=Colorful switch
681=Test
682=Group

683=The time is invalid
684=Length out of range




 HDL-ON_iOS/Resources/Phone/Classification/Room/HomePagebg.png

 HDL-ON_iOS/Resources/Phone/Classification/Room/Roombg.png

 HDL_ON/Common/R.cs

@@ -6,6 +6,15 @@
    {

        /// <summary>
        /// 长度超出范围
        /// </summary>
        public const int LengthOutOfRange = 684;
        /// <summary>
        /// 该时间无效
        /// </summary>
        public const int TimeInvalid = 683;
        //public const int 
        /// <summary>
        /// 群组（跑马灯分组）
        /// </summary>
        public const int HorseRaceLampGroup = 682;

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -491,48 +491,6 @@
                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
                                {
                                    MainPage.Log("设备数据刷新通知");
                                    var deviceResult = new HttpServerRequest().GetDeviceList();
                                    if (deviceResult.Code == StateCode.SUCCESS)
                                    {
                                        MainPage.Log($"读取设备信息成功");
                                        var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
                                        if (deviceList == null)
                                        {
                                            deviceList = new DevcieApiPack();
                                        }
                                        string delFile = "";
                                        if (FunctionList.List.GetDeviceFunctionList().Count > 0)
                                        {
                                            for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
                                            {
                                                var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
                                                if (SPK.MusicSpkList().Contains(localFunction.spk))
                                                {
                                                    i++;
                                                    continue;
                                                }
                                                var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);

                                                if (delFile == localFunction.savePath)
                                                {
                                                    i++;
                                                    continue;
                                                }
                                                delFile = localFunction.savePath;
                                                FunctionList.List.DeleteFunction(localFunction);
                                            }
                                        }
                                        //处理剩下的新增功能
                                        foreach (var newFunction in deviceList.list)
                                        {
                                            newFunction.SaveFunctionFile();
                                            FunctionList.List.IniFunctionList(newFunction.savePath);
                                        }
                                    }
                                    else
                                    {
                                        MainPage.Log($"读取云端设备数据失败:Code:{deviceResult.Code};  Msg:{deviceResult.message}");
                                    }
                                }
                                //网关密钥变化
                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/custom/mqtt/secret/change")

 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/DAL/ThirdPartySdk/HDLLinphone.cs

@@ -234,7 +234,7 @@
                //先清空呼叫和监视设备信息
                if (clearCallInfo)
                {
                    InitCallInfo(null);
                    //InitCallInfo(null);//造成接收呼叫时开锁开锁异常
                }

                HDLSipInfo mHDLSipInfo = GetHDLSipInfo(mHDLCallVideoInfo.HomeId);

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -96,7 +96,7 @@
                    {
                        instance = new DB_ResidenceData();
                        instance.SaveResidenceData();
                        instance.residenceImage = "Classification/Room/Roombg.png";
                        instance.residenceImage = "Classification/Room/HomePagebg.png";
                        instance.HomeGateway = new HomeGatewayInfo()
                        {
                            homeId = "1396717478877241345",
@@ -135,7 +135,7 @@
                        instance = new DB_ResidenceData { };
                        return instance;
                    }
                    instance.residenceImage = "Classification/Room/Roombg.png";
                    instance.residenceImage = "Classification/Room/HomePagebg.png";
                    //初始化住宅功能数据
                    SpatialInfo.CurrentSpatial.InitRoomListFunctions();


 HDL_ON/UI/MainPage.cs

@@ -121,7 +121,8 @@
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl
            SPK.GroupControl,
            SPK.AvMusic,SPK.MusicStandard
        };



 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -11,12 +11,16 @@
{
    public partial class PublicAssmebly
    {
        public Button btnTip;

        public int entryMaxLength = 40;
        //public Action entrylistener;

        void EditParaterEvent(Button btnConfirm, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> list, EditText editText, Action<string> callBackAction,
            FrameLayout contentView, Button btnLine, Button btnCancel, FrameLayout editView, Dialog dialog, int titleId)
        {

            var btnTip = new Button()
            btnTip = new Button()
            {
                X = editView.X,
                Y = editView.Bottom,
@@ -151,13 +155,14 @@

            etParater.TextChangeEventHandler = (sender, e) =>
            {
                if (etParater.Text.Length > 20)
                if (System.Text.Encoding.Default.GetBytes(etParater.Text).Length > entryMaxLength)
                {
                    etParater.Text = etParater.Text.Remove(20);

#if __ANDROID__
                    etParater.SetSelectionEnd();
#endif
                    //entrylistener?.Invoke();
                }
            };


 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -157,11 +157,11 @@
                        break;
                    case SPK.MusicStandard:
                    case SPK.AvMusic:
                        //Music.A31MusicModel.Current= new Music.A31MusicModel { functionMusic = function };//当前播放器
                        //var a31PlayMusicPage = new Music.A31PlayMusicPage();
                        //MainPage.BasePageView.AddChidren(a31PlayMusicPage);
                        //a31PlayMusicPage.Show();
                        //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        Music.A31MusicModel.Current = new Music.A31MusicModel { functionMusic = function };//当前播放器
                        var a31PlayMusicPage = new Music.A31PlayMusicPage();
                        MainPage.BasePageView.AddChidren(a31PlayMusicPage);
                        a31PlayMusicPage.Show();
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;

                    case SPK.LightCCT:
                        var TureView = new ColorTureLampPage(function);

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -989,11 +989,11 @@
                foreach (var function in list)
                {
                    //音乐模块有主从关系，需要特殊处理
                    if (SPK.MusicSpkList().Contains( function.spk))
                    {
                        continue;
                    }
                    else
                    //if (SPK.MusicSpkList().Contains( function.spk))
                    //{
                    //    continue;
                    //}
                    //else
                    {
                        if (!function.collect)
                            continue;
@@ -1455,7 +1455,7 @@
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
                    btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
                    btnCollection.Visible = false;
                    //btnCollection.Visible = false;
                    Button btnPower;
                    btnPower = new Button()
                    {
@@ -1602,7 +1602,7 @@
                btnName.MouseUpEventHandler = skipControlPageEvent;
                btnIcon.MouseUpEventHandler = skipControlPageEvent;
                btnState.MouseUpEventHandler = skipControlPageEvent;
                //不需要更新状态的动能列表
                //不需要更新状态的功能列表
                if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
                {
                    UpdataFunctionStates(function);

 HDL_ON/UI/UI2/2-Classification/RoomPage.cs

@@ -1,5 +1,6 @@

using System;
using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -89,6 +90,7 @@

            var list = room.GetRoomFunctions(false);


            foreach (var function in list)
            {
                if (MainPage.RoomNotSupportFunctionList.Contains(function.spk))

 HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs

@@ -292,6 +292,11 @@
                        {
                            LoadEditDialog(() =>
                            {
                                if(hour == 0 && minute == 0 && second == 0)
                                {
                                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.TimeInvalid);
                                    return;
                                }
                                btnWorkHours.Text = hour + "时";
                                btnWorkHours.Text += minute + "分";
                                btnWorkHours.Text += second + "秒";

 HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs

@@ -71,7 +71,7 @@
            #endregion

            #region   ---界面点击事件---
            playView.collectIconBtn.Visible = false;//先暂时隐藏收藏功能
            //playView.collectIconBtn.Visible = false;//先暂时隐藏收藏功能
            //收藏图标事件
            playView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -84,7 +84,7 @@
                {
                    A31MusicModel.Current.functionMusic.collect = false;
                }

                A31MusicModel.Current.functionMusic.CollectFunction();
            };
            ///切换播放模式点击事件;
            playView.playOrderBtn.MouseUpEventHandler += (sender, e) =>

 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs

@@ -194,7 +194,7 @@
            musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
            musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
            musicView.musicNameBtn.Text = player.functionMusic.name;
            musicView.collectIconBtn.Visible = false;//先暂时隐藏收藏功能
            //musicView.collectIconBtn.Visible = false;//先暂时隐藏收藏功能
            ///收藏事件
            musicView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -207,6 +207,7 @@
                {
                    player.functionMusic.collect = false;
                }
                player.functionMusic.CollectFunction();
            };



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

@@ -284,24 +284,27 @@
            recordFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/HistoryList.png";
            recordFL.GetTextButton().TextID = StringId.lishijilu;

            //用户管理
            CustomFrameLayout userManagerView = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
            whiteFl.AddChidren(userManagerView);
            userManagerView.Y = heightY;
            userManagerView.X = recordFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
            userManagerView.AddImageView();
            userManagerView.AddTextButtonView();
            userManagerView.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockUserManager.png";
            userManagerView.GetTextButton().TextID = StringId.UserManagement;
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                //用户管理
                CustomFrameLayout userManagerView = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
                whiteFl.AddChidren(userManagerView);
                userManagerView.Y = heightY;
                userManagerView.X = recordFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
                userManagerView.AddImageView();
                userManagerView.AddTextButtonView();
                userManagerView.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockUserManager.png";
                userManagerView.GetTextButton().TextID = StringId.UserManagement;

            userManagerView.SetClickListener((fl, btnImage, btnText) => {
                var page = new VideoDoorlockUserListPage(device);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                userManagerView.SetClickListener((fl, btnImage, btnText) =>
                {
                    var page = new VideoDoorlockUserListPage(device);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            });

                });
            }
            #endregion


@@ -387,7 +390,29 @@
                //MainPage.BasePageView.AddChidren(historyPage);
                //historyPage.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                CommonMethod.Current.SkipRecordActivity(this.device.deviceId);
                var waitPage = new Loading();
                this.AddChidren(waitPage);
                waitPage.Start("");
                new System.Threading.Thread(() =>
                {
                    try
                    {
                        Application.RunOnMainThread(() =>
                        {
                            CommonMethod.Current.SkipRecordActivity(this.device.deviceId);
                        });
                    }catch(Exception ex)
                    {

                    }
                    finally
                    {
                        Application.RunOnMainThread(() => {
                            waitPage.Hide();
                        });
                    }
                })
                { IsBackground = true }.Start();
            });



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

@@ -18,7 +18,7 @@
        VerticalScrolViewLayout contentView;
        FrameLayout userPermissionsView;

        Button btnUserName;
        //Button btnUserName;

        Function device;
        VideoDoorlockUser doorlockUser;
@@ -75,7 +75,7 @@
            };
            userNameView.AddChidren(btnEditUserNameIcon);

            btnUserName = new Button()
            var btnUserName = new Button()
            {
                X = Application.GetRealWidth(100),
                Width = Application.GetRealWidth(230),
@@ -94,6 +94,76 @@
            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });

            initOptionView(false);

            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                Action<string> callBack = (str) =>
                {
                    if (string.IsNullOrEmpty(str))
                    {
                        new Tip()
                        {
                            CloseTime = 1,
                            Text = Language.StringByID(StringId.UesrNameCannotBeEmpty),
                            Direction = AMPopTipDirection.None,
                        }.Show(bodyView);
                        return;
                    }
                    if (str == UserInfo.Current.userName)
                    {
                        return;
                    }
                    if (System.Text.Encoding.Default.GetBytes(str).Length > 20)
                    {
                        new Tip()
                        {
                            CloseTime = 1,
                            Text = Language.StringByID(StringId.LengthOutOfRange),
                            Direction = AMPopTipDirection.None,
                        }.Show(bodyView);
                        return;
                    }
                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
                    new System.Threading.Thread(() =>
                    {
                        try
                        {
                            var resultObj = ApiUtlis.Ins.HttpRequest.EditDoorlockUserName(device.deviceId, doorlockUser.extUserId, str);
                            if (resultObj.Code == StateCode.SUCCESS)
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    btnUserName.Text = str;
                                });
                            }
                            else
                            {
                                //失败提示
                                IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
                            }
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"update user name error : {ex.Message}");
                        }
                        finally
                        {
                            Application.RunOnMainThread(() =>
                            {
                                waitPage.Hide();
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                };
                var pa = new PublicAssmebly();
                pa.entryMaxLength = 20;
                pa.LoadDialog_EditParater(StringId.ChangeName, doorlockUser.lockUserName, callBack, StringId.UesrNameCannotBeEmpty, 0, new List<string>());
            };
            btnUserName.MouseUpEventHandler = eventHandler;
            btnEditUserNameIcon.MouseUpEventHandler = eventHandler;
            userNameView.MouseUpEventHandler = eventHandler;

        }

        void initOptionView(bool isEdit)
@@ -712,60 +782,7 @@
        /// </summary>
        void LoadEvent_EditUserName()
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                Action<string> callBack = (str) =>
                {
                    if (string.IsNullOrEmpty(str))
                    {
                        new Tip()
                        {
                            CloseTime = 1,
                            Text = Language.StringByID(StringId.UesrNameCannotBeEmpty),
                            Direction = AMPopTipDirection.None,
                        }.Show(bodyView);
                        return;
                    }
                    if (str == UserInfo.Current.userName)
                    {
                        return;
                    }
                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
                    new System.Threading.Thread(() =>
                    {
                        try
                        {
                            var resultObj = ApiUtlis.Ins.HttpRequest.EditDoorlockUserName(device.deviceId, doorlockUser.extUserId,str);
                            if (resultObj.Code == StateCode.SUCCESS)
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    btnUserName.Text = str;
                                });
                            }
                            else
                            {
                                //失败提示
                                IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
                            }
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"update user name error : {ex.Message}");
                        }
                        finally
                        {
                            Application.RunOnMainThread(() =>
                            {
                                waitPage.Hide();
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                };
                new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, doorlockUser.lockUserName, callBack, StringId.UesrNameCannotBeEmpty, 0, new System.Collections.Generic.List<string>());
            };
            btnUserName.MouseUpEventHandler = eventHandler;
            //btnUserName.MouseUpEventHandler = eventHandler;
        }



 SiriIntents/Server/HttpUtil.cs

@@ -16,8 +16,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

 SiriIntents/SiriIntents.csproj

@@ -80,7 +80,7 @@
    <MtouchArch>ARM64</MtouchArch>

    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>

    <MtouchVerbosity></MtouchVerbosity>

    <CodesignProvision>OnProSiri230605-1-Dev</CodesignProvision>

    <CodesignProvision>OnProSiri230630-1-Dev</CodesignProvision>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="System" />


 SiriIntentsUI/SiriIntentsUI.csproj

@@ -84,7 +84,7 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>

    <MtouchVerbosity></MtouchVerbosity>

    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

    <CodesignProvision>OnProSiriUI230605-1-Dev</CodesignProvision>

    <CodesignProvision>OnProSiriUI230630-1-Dev</CodesignProvision>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="System" />