.vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/HDL_ON.projitems | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage (副本).cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.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) {