2021-04-13 1.智能音箱功能完善

JLChen

2021-04-13 740987b80e7e6cf62561130d0bef4ca64170ad06

2021-04-13 1.智能音箱功能完善

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,32 +1,28 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/BindingResidence/BindingResidencePage.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage.cs" Line="84" Column="51" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
      <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" Line="121" Column="42" />
      <File FileName="HDL_ON/UI/BindingResidence/WellcomToHomeForm.cs" />
    </Files>
  <MonoDevelop.Ide.Workbench>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="DAL" expanded="True">
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="BindingResidence" expanded="True">
                  <Node name="BindingResidencePage.cs" selected="True" />
                </Node>
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True" />
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="SmartSpeaker" expanded="True">
                      <Node name="SmartSpeakerSelectDevicesPage.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True" />
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Other" expanded="True" />
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>
      </Pad>

 HDL-ON_Android/Assets/Language.ini

@@ -713,7 +713,7 @@
9038=(Frequently Asked Questions)
9039=Share and function
9040=Alerts
9041=System info.
9041=System info
9042=Information Center
9043=Please note that your account number is logged in elsewhere. If it is not made by yourself, please change the password immediately.
9044=Successfully uploaded

 HDL-ON_iOS/Resources/Language.ini

@@ -713,7 +713,7 @@
9038=(Frequently Asked Questions)
9039=Share and function
9040=Alerts
9041=System info.
9041=System info
9042=Information Center
9043=Please note that your account number is logged in elsewhere. If it is not made by yourself, please change the password immediately.
9044=Successfully uploaded

 HDL_ON/HDL_ON.projitems

@@ -398,7 +398,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SmartSpeaker\SmartSpeakerListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SmartSpeaker\SmartSpeakerSelectDevicesPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SmartSpeaker\SmartSpeakerRoomListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SmartSpeaker\SmartSpeakerSelectDevicesPage %28副本%29.cs" />

  </ItemGroup>

  <ItemGroup>

    <Folder Include="$(MSBuildThisFileDirectory)DAL\" />


 HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs

@@ -35,7 +35,6 @@
        /// æ€å¿…é©°=AISpeech
       


        /// <summary>
        /// 
        /// </summary>
@@ -46,7 +45,7 @@
        }

        /// <summary>
        /// 
        /// åŠ è½½è§†å›¾
        /// </summary>
        public void LoadPage()
        {
@@ -61,8 +60,6 @@

            };
            bodyView.AddChidren(bodyScrolView);

            //AddEmptyTipView();

            LoadSmartSpeakertListView(bodyScrolView);
        }
@@ -385,7 +382,7 @@
        /// <param name="btnName"></param>
        void RenameAlexaRemark(string newName, SpeakerInfo speakerInfo, Button btnName)
        {

            //显示loading动画效果
            var waitPage = new Loading();
            bodyView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));
@@ -445,10 +442,21 @@
        /// <param name="platformName"></param>
        /// <returns></returns>
        string GetSpeakerTypeString(string platformName){
            //1.platformName判空
            if (string.IsNullOrEmpty(platformName))
            {
                return "";
            }
            //2.先赋云端返回的默认值
            var name = platformName;
            if (platformName == SpeakerType.DuerOS.ToString())
            {
                name = "小度";
                if (Language.CurrentLanguage == "Chinese")
                {
                    name = "小度";
                }
                //2.1当前语言不是中文的话，直接等于云端返回的platformName音箱类型

            }
            else if (platformName == SpeakerType.Google.ToString()){
                name = "Google Home";
@@ -463,11 +471,19 @@
            }
            else if (platformName == SpeakerType.Aligenie.ToString())
            {
                name = "天猫精灵";
                if (Language.CurrentLanguage == "Chinese")
                {
                    name = "天猫精灵";
                }
                //2.1当前语言不是中文的话，直接等于云端返回的platformName音箱类型
            }
            else if (platformName == SpeakerType.AISpeech.ToString())
            {
                name = "思必驰";
                if (Language.CurrentLanguage == "Chinese")
                {
                    name = "思必驰";
                }
                //2.1当前语言不是中文的话，直接等于云端返回的platformName è‹±æ–‡éŸ³ç®±ç±»åž‹
            }

            return name;
@@ -542,9 +558,8 @@

        }


        /// <summary>
        /// 
        /// è·³è½¬é¡µé¢
        /// </summary>
        void GotoPage(SpeakerInfo speakerInfo)
        {

 HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs

@@ -15,12 +15,12 @@
    public class SmartSpeakerRoomListPage : FrameLayout
    {
        /// <summary>
        /// 
        /// bodyView
        /// </summary>
        FrameLayout bodyView;
       
        /// <summary>
        /// å½“前
        /// å½“前主滑动View
        /// </summary>
        VerticalScrolViewLayout bodyScrolView;
        /// <summary>
@@ -29,8 +29,9 @@
        SpeakerInfo speakerInfo;

        /// <summary>
        /// 
        /// æˆ¿é—´åˆ—表和无区域功能页面
        /// </summary>
        /// <param name="speakerInfo">音箱参数</param>
        public SmartSpeakerRoomListPage(SpeakerInfo speakerInfo)
        {
            bodyView = this;
@@ -39,7 +40,7 @@
        }

        /// <summary>
        /// 
        /// åŠ è½½è§†å›¾
        /// </summary>
        public void LoadPage()
        {
@@ -55,13 +56,12 @@
            };
            bodyView.AddChidren(bodyScrolView);


            //LoadSmartSpeakertListView(bodyScrolView);
            //加载房间列表
            ShowRoomListView();
        }

        /// <summary>
        /// åŠ è½½æˆ¿é—´åˆ—表,统计分享的数据
        /// åŠ è½½æˆ¿é—´åˆ—表
        /// </summary>
        void ShowRoomListView()
        {
@@ -70,29 +70,39 @@
            var titleView = new FrameLayout()
            {
                BackgroundColor = CSS_Color.MainBackgroundColor,
                Height = Application.GetRealWidth(44),
                Height = Application.GetRealWidth(53),
            };
            bodyScrolView.AddChidren(titleView);

            var btnTitle = new Button()
            //箭头图标
            var btnResidenceDownIcon = new Button()
            {
                X = Application.GetRealWidth(16),
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                X = Application.GetRealWidth(12),
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Public/DownIcon.png",
            };
            titleView.AddChidren(btnResidenceDownIcon);
            //住宅标题
            var btnHomeTitle = new Button()
            {
                X = btnResidenceDownIcon.Right + Application.GetRealWidth(1),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextID = StringId.UseArea,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text = DB_ResidenceData.Instance.CurrentRegion.Name,
            };
            titleView.AddChidren(btnTitle);
            titleView.AddChidren(btnHomeTitle);

            var btnLine = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = titleView.Height - Application.GetRealHeight(2),
                Width = Application.GetRealWidth(360),
                Height = Application.GetRealHeight(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            };
            titleView.AddChidren(btnLine);
            //var btnLine = new Button()
            //{
            //    X = Application.GetRealWidth(16),
            //    Y = titleView.Height - Application.GetRealHeight(2),
            //    Width = Application.GetRealWidth(360),
            //    Height = Application.GetRealHeight(1),
            //    BackgroundColor = CSS_Color.DividingLineColor,
            //};
            //titleView.AddChidren(btnLine);

            //---------------------------------------------
            //未分配区域的功能
@@ -103,11 +113,7 @@
            foreach (var function in allFunctionList)
            {
                function.roomIds.Remove(null);
                if (function.roomIds.Count > 0)
                {
                    //allocatedList.Add(function);
                }
                else
                if (function.roomIds.Count == 0)
                {
                    unallocatedList.Add(function);
                }
@@ -123,11 +129,7 @@

                //roomIds大于0 ä»£è¡¨åˆ†é…åˆ°æˆ¿é—´
                mScene.roomIds.Remove(null);
                if (mScene.roomIds.Count > 0)
                {
                    //allocatedList.Add(function);
                }
                else
                if (mScene.roomIds.Count == 0)
                {
                    globalSceneList.Add(mScene);
                }
@@ -136,7 +138,7 @@

            try
            {
                //遍历加载房间分享个数统计状态RowLayout
                //房间列表
                foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
                {
                    AddRoomFunctionRowLayout(room);

 HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage (¸±±¾).cs

File was deleted

 HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage.cs

@@ -2,19 +2,18 @@
using Shared;
using HDL_ON.UI.CSS;
using System.Collections.Generic;
using System.Threading;
using HDL_ON.DAL.Server;

namespace HDL_ON.UI
{

    /// <summary>
    /// ç®¡ç†é…ç½®ç»™éŸ³ç®±çš„设备列表
    /// ç®¡ç†é…ç½®ç»™éŸ³ç®±çš„设备或着场景列表
    /// </summary>
    public class SmartSpeakerSelectDevicesPage : FrameLayout
    {
        /// <summary>
        /// 
        /// bodyView
        /// </summary>
        FrameLayout bodyView;
        /// <summary>
@@ -46,10 +45,10 @@
        List<SpeakerTargetInfo> roomFunctionOrSceneList = new List<SpeakerTargetInfo>();

        /// <summary>
        /// 
        /// ç®¡ç†é…ç½®ç»™éŸ³ç®±çš„设备或着场景列表
        /// </summary>
        /// <param name="speakerInfo"></param>
        /// <param name="roomFunctionOrSceneList"></param>
        /// <param name="speakerInfo">音箱参数</param>
        /// <param name="roomFunctionOrSceneList">当前房间的功能或者场景</param>
        public SmartSpeakerSelectDevicesPage(SpeakerInfo speakerInfo, List<SpeakerTargetInfo> roomFunctionOrSceneList)
        {
            bodyView = this;
@@ -59,20 +58,20 @@
        }

        /// <summary>
        /// 
        /// åŠ è½½è§†å›¾
        /// </summary>
        public void LoadPage()
        {
            //加载顶部菜单栏
            new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement)).LoadTopView();

            //顶部全选按钮
            var allRoomView = new FrameLayout()
            var allView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyView.AddChidren(allRoomView);
            bodyView.AddChidren(allView);

            Button btnAllRoomText = new Button()
            {
@@ -83,7 +82,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextAlignment = TextAlignment.CenterLeft,
            };
            allRoomView.AddChidren(btnAllRoomText);
            allView.AddChidren(btnAllRoomText);

            btnChooseAll = new Button()
            {
@@ -93,11 +92,10 @@
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/ChooseIcon.png",
                SelectedImagePath = "Public/ChooseOnIcon.png",
                //IsSelected = true,
            };
            allRoomView.AddChidren(btnChooseAll);
            allView.AddChidren(btnChooseAll);

            allRoomView.AddChidren(new Button()
            allView.AddChidren(new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(49),
@@ -108,7 +106,7 @@

            bodyScrolView = new VerticalScrolViewLayout()
            {
                Y = allRoomView.Bottom,
                Y = allView.Bottom,
                Height = Application.GetRealHeight(450),
            };
            bodyView.AddChidren(bodyScrolView);
@@ -121,9 +119,10 @@
            bodyView.AddChidren(btnSave);

            //全选按钮点击事件
            LoadEvent_AllSharedDataChange(allRoomView, btnChooseAll);
            LoadEvent_AllSharedDataChange(allView, btnChooseAll);
            //保存按钮点击事件
            LoadEvent_Save(btnSave);

            //加载房间的功能和场景，并比较配置过的数据实现选中效果
            GetDeviceAndSceneList();
        }

@@ -131,22 +130,22 @@
        /// <summary>
        /// å…¨é€‰æŒ‰é’®ç‚¹å‡»äº‹ä»¶
        /// </summary>
        void LoadEvent_AllSharedDataChange(FrameLayout allRoomView, Button btnChooseAll)
        void LoadEvent_AllSharedDataChange(FrameLayout allView, Button btnChooseAll)
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                btnChooseAll.IsSelected = !btnChooseAll.IsSelected;
                var IsSelected = btnChooseAll.IsSelected;

                //全部数据选中状态设置为true或者false
                foreach (var info in roomFunctionOrSceneList)
                {
                    info.IsSelect = IsSelected;
                }

                //刷新一次列表
                RefreshListView();
            };
            btnChooseAll.MouseUpEventHandler = eventHandler;
            allRoomView.MouseUpEventHandler = eventHandler;
            allView.MouseUpEventHandler = eventHandler;

        }

@@ -165,9 +164,9 @@
        }

        /// <summary>
        /// 
        /// å…¨é‡æ›´æ–°é…ç½®æ•°æ®ï¼ˆåŠŸèƒ½å’Œåœºæ™¯åŒæ—¶æ›´æ–°ï¼‰
        /// </summary>
        /// <param name="updateList"></param>
        /// <param name="updateList">最新的配置数据</param>
        void AddDevicesSceneList(List<SpeakerTargetInfo> updateList)
        {
            var waitPage = new Loading();
@@ -188,7 +187,6 @@
                            {
                                updateList.Add(info);
                            }

                        }
                        else
                        {
@@ -197,18 +195,16 @@
                                updateList.Remove(targetData);
                            }
                        }

                        
                    }


                    //构建请求参数
                    var updateSpeakerDeviceListObj = new UpdateSpeakerDeviceListObj()
                    {
                        homeId = speakerInfo.homeId,
                        tokenId = speakerInfo.tokenId,
                        targetInfos = updateList
                    };

                    //发起请求
                    var revertObj = new HttpServerRequest().UpdateSpeakerDeviceList(updateSpeakerDeviceListObj);
                    if (revertObj.Code == StateCode.SUCCESS)
                    {