From 740987b80e7e6cf62561130d0bef4ca64170ad06 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 13 四月 2021 16:08:19 +0800
Subject: [PATCH] 2021-04-13 1.智能音箱功能完善
---
/dev/null | 422 --------------------------------------
HDL-ON_iOS/Resources/Language.ini | 2
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs | 70 +++---
HDL-ON_Android/Assets/Language.ini | 2
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage.cs | 52 ++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 30 +-
HDL_ON/HDL_ON.projitems | 1
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs | 35 ++
8 files changed, 100 insertions(+), 514 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index c5a8a47..9afb6b1 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.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>
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index a86efe6..08f1736 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/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
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index a86efe6..08f1736 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/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
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 080bd88..1f32ee0 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/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\" />
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs
index c704948..4b29afa 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs
+++ b/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)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
index e1895fa..fd1aac3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
@@ -15,12 +15,12 @@
public class SmartSpeakerRoomListPage : FrameLayout
{
/// <summary>
- ///
+ /// bodyView
/// </summary>
FrameLayout bodyView;
/// <summary>
- /// 褰撳墠
+ /// 褰撳墠涓绘粦鍔╒iew
/// </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
{
- //閬嶅巻鍔犺浇鎴块棿鍒嗕韩涓暟缁熻鐘舵�丷owLayout
+ //鎴块棿鍒楄〃
foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
{
AddRoomFunctionRowLayout(room);
diff --git "a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage \050\345\211\257\346\234\254\051.cs" "b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage \050\345\211\257\346\234\254\051.cs"
deleted file mode 100644
index 91f1cee..0000000
--- "a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage \050\345\211\257\346\234\254\051.cs"
+++ /dev/null
@@ -1,422 +0,0 @@
-锘�//using System;
-//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>
-// ///
-// /// </summary>
-// FrameLayout bodyView;
-// /// <summary>
-// /// 鍏ㄩ�夋寜閽�
-// /// </summary>
-// Button btnChooseAll;
-// /// <summary>
-// /// 褰撳墠
-// /// </summary>
-// VerticalScrolViewLayout bodyScrolView;
-// ///// <summary>
-// ///// 搴曢儴淇濆瓨鎿嶄綔鎸夐挳
-// ///// </summary>
-// //Button btnSave;
-
-// /// <summary>
-// /// 闊崇鍙傛暟
-// /// </summary>
-// SpeakerInfo speakerInfo;
-
-// /// <summary>
-// /// 璁惧銆佸満鏅垪琛�
-// /// </summary>
-// List<SpeakerTargetInfo> targetInfoList = new List<SpeakerTargetInfo>();
-// ///// <summary>
-// ///// 绠＄悊褰撳墠閫夋嫨閫夌殑璁惧銆佸満鏅垪琛�
-// ///// </summary>
-// //List<SpeakerTargetInfo> selectInfoList = new List<SpeakerTargetInfo>();
-
-// /// <summary>
-// /// 褰撳墠鎴块棿鐨勮澶囧拰鍦烘櫙
-// /// </summary>
-// List<SpeakerTargetInfo> roomFunctionOrSceneList = new List<SpeakerTargetInfo>();
-
-// /// <summary>
-// ///
-// /// </summary>
-// /// <param name="speakerInfo"></param>
-// /// <param name="roomFunctionOrSceneList"></param>
-// public SmartSpeakerSelectDevicesPage(SpeakerInfo speakerInfo, List<SpeakerTargetInfo> roomFunctionOrSceneList)
-// {
-// bodyView = this;
-// bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
-// this.speakerInfo = speakerInfo;
-// this.roomFunctionOrSceneList = roomFunctionOrSceneList;
-// }
-
-// /// <summary>
-// ///
-// /// </summary>
-// public void LoadPage()
-// {
-// new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement)).LoadTopView();
-
-// //椤堕儴鍏ㄩ�夋寜閽�
-// var allRoomView = new FrameLayout()
-// {
-// Y = Application.GetRealHeight(64),
-// Height = Application.GetRealHeight(50),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// bodyView.AddChidren(allRoomView);
-
-// Button btnAllRoomText = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// Width = Application.GetRealWidth(280),
-// TextID = StringId.SelectedAll,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextAlignment = TextAlignment.CenterLeft,
-// };
-// allRoomView.AddChidren(btnAllRoomText);
-
-// btnChooseAll = new Button()
-// {
-// X = Application.GetRealWidth(331),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetMinRealAverage(28),
-// Height = Application.GetMinRealAverage(28),
-// UnSelectedImagePath = "Public/ChooseIcon.png",
-// SelectedImagePath = "Public/ChooseOnIcon.png",
-// IsSelected = true,
-// };
-// allRoomView.AddChidren(btnChooseAll);
-
-// allRoomView.AddChidren(new Button()
-// {
-// Gravity = Gravity.CenterHorizontal,
-// Y = Application.GetRealHeight(49),
-// Height = Application.GetMinReal(1),
-// Width = Application.GetRealWidth(343),
-// BackgroundColor = CSS_Color.DividingLineColor,
-// });
-
-// bodyScrolView = new VerticalScrolViewLayout()
-// {
-// Y = allRoomView.Bottom,
-// Height = Application.GetRealHeight(450),
-// };
-// bodyView.AddChidren(bodyScrolView);
-
-// var btnSave = new ConfirmButton()
-// {
-// Y = Application.GetRealHeight(519 + 64),
-// TextID = StringId.Save
-// };
-// bodyView.AddChidren(btnSave);
-
-// //鍏ㄩ�夋寜閽偣鍑讳簨浠�
-// LoadEvent_AllSharedDataChange(allRoomView, btnChooseAll);
-// LoadEvent_Save(btnSave);
-
-// GetDeviceAndSceneList();
-// }
-
-
-// /// <summary>
-// /// 鍏ㄩ�夋寜閽偣鍑讳簨浠�
-// /// </summary>
-// void LoadEvent_AllSharedDataChange(FrameLayout allRoomView, Button btnChooseAll)
-// {
-// EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
-// {
-// btnChooseAll.IsSelected = !btnChooseAll.IsSelected;
-// if(selectInfoList == null)
-// {
-// selectInfoList = new List<SpeakerTargetInfo>();
-// }
-
-// if (btnChooseAll.IsSelected)
-// {
-// foreach (var info in roomFunctionOrSceneList)
-// {
-// selectInfoList.Add(info);
-// }
-// }
-// RefreshListView();
-// };
-// btnChooseAll.MouseUpEventHandler = eventHandler;
-// allRoomView.MouseUpEventHandler = eventHandler;
-
-// }
-
-// /// <summary>
-// /// 淇濆瓨鎸夐挳鐐瑰嚮浜嬩欢
-// /// </summary>
-// /// <param name="btnSave"></param>
-// void LoadEvent_Save(Button btnSave)
-// {
-// EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
-// {
-// AddDevicesSceneList(targetInfoList);
-// };
-
-// btnSave.MouseUpEventHandler = eventHandler;
-// }
-
-// /// <summary>
-// ///
-// /// </summary>
-// /// <param name="updateList"></param>
-// void AddDevicesSceneList(List<SpeakerTargetInfo> updateList)
-// {
-// var waitPage = new Loading();
-// bodyView.AddChidren(waitPage);
-// waitPage.Start(Language.StringByID(StringId.PleaseWait));
-
-// System.Threading.Tasks.Task.Run(() =>
-// {
-// try
-// {
-// var updateSpeakerDeviceListObj = new UpdateSpeakerDeviceListObj()
-// {
-// homeId = speakerInfo.homeId,
-// tokenId = speakerInfo.tokenId,
-// targetInfos = updateList
-// };
-
-// var revertObj = new HttpServerRequest().UpdateSpeakerDeviceList(updateSpeakerDeviceListObj);
-// if (revertObj.Code == StateCode.SUCCESS)
-// {
-// Application.RunOnMainThread(() =>
-// {
-// //淇濆瓨鎴愬姛銆侀〉闈㈠叧闂�
-// Utlis.ShowTip(Language.StringByID(StringId.SavedSuccessfully));
-// if (bodyView != null)
-// {
-// bodyView.RemoveFromParent();
-// }
-// });
-
-// }
-// else
-// {
-// //鎻愮ず閿欒
-// IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
-// }
-// }
-// catch
-// {
-
-// }
-// finally
-// {
-// Application.RunOnMainThread(() =>
-// {
-// if (waitPage != null)
-// {
-// waitPage.RemoveFromParent();
-// waitPage = null;
-// }
-// });
-// }
-// });
-// }
-
-// /// <summary>
-// /// 鍔犺浇鎴块棿鐨勮澶囧拰鍦烘櫙鍒楄〃
-// /// </summary>
-// void GetDeviceAndSceneList()
-// {
-// bodyScrolView.RemoveAll();
-
-// var waitPage = new Loading();
-// bodyView.AddChidren(waitPage);
-// waitPage.Start(Language.StringByID(StringId.PleaseWait));
-
-// System.Threading.Tasks.Task.Run(() =>
-// {
-// try
-// {
-// var revertObj = new HttpServerRequest().GetSpeakerDeviceList(0, speakerInfo.tokenId);
-// if (revertObj.Code == StateCode.SUCCESS)
-// {
-// var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpeakerTargetInfo>>(revertObj.Data.ToString());
-// Application.RunOnMainThread(() => {
-// if (list != null && list.Count > 0)
-// {
-// targetInfoList = list;
-// }
-// else
-// {
-// targetInfoList = new List<SpeakerTargetInfo>();
-// }
-// RefreshListView();
-// });
-
-// }
-// else
-// {
-// //鎻愮ず閿欒
-// IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
-// }
-// }
-// catch
-// {
-
-// }
-// finally
-// {
-// Application.RunOnMainThread(() =>
-// {
-// if (waitPage != null)
-// {
-// waitPage.RemoveFromParent();
-// waitPage = null;
-// }
-// });
-// }
-// });
-// }
-
-// /// <summary>
-// ///
-// /// </summary>
-// void RefreshListView()
-// {
-// bodyScrolView.RemoveAll();
-
-// if (roomFunctionOrSceneList == null) return;
-
-// foreach (var roomData in roomFunctionOrSceneList)
-// {
-// AddRowView(roomData);
-// }
-
-
-// }
-
-
-// /// <summary>
-// ///
-// /// </summary>
-// /// <param name="info"></param>
-// void AddRowView(SpeakerTargetInfo info)
-// {
-
-// var roomView = new FrameLayout()
-// {
-// Height = Application.GetRealHeight(50),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// Tag = "row"
-// };
-// bodyScrolView.AddChidren(roomView);
-
-// Button btnRoomText = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// Width = Application.GetRealWidth(280),
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextAlignment = TextAlignment.CenterLeft,
-// Text = info.targetName,
-// };
-// roomView.AddChidren(btnRoomText);
-
-// Button btnChoose = new Button()
-// {
-// X = Application.GetRealWidth(331),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetMinRealAverage(28),
-// Height = Application.GetMinRealAverage(28),
-// UnSelectedImagePath = "Public/ChooseIcon.png",
-// SelectedImagePath = "Public/ChooseOnIcon.png",
-// Tag = "ChooseIcon"
-// };
-// roomView.AddChidren(btnChoose);
-
-// var targetData = selectInfoList.Find((obj) => obj.targetId == info.targetId);
-// if (targetData != null)
-// {
-// btnChoose.IsSelected = true;
-// //鍒锋柊灞炰簬褰撳墠鎴块棿鐨勫垎浜粺璁�
-// //funs_New.Add(shareData);
-// }
-// else
-// {
-// if (btnChooseAll.IsSelected)
-// btnChooseAll.IsSelected = false;
-// }
-
-
-// var btnLine = new Button()
-// {
-// Gravity = Gravity.CenterHorizontal,
-// //Y = Application.GetRealHeight(49),
-// Height = Application.GetRealHeight(1),
-// Width = Application.GetRealWidth(343),
-// BackgroundColor = CSS_Color.DividingLineColor,
-// };
-// bodyScrolView.AddChidren(btnLine);
-
-
-// EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
-// {
-// btnChoose.IsSelected = !btnChoose.IsSelected;
-// var sd = selectInfoList.Find((obj) => obj.targetId == info.targetId);
-// if (btnChoose.IsSelected)
-// {
-// try
-// {
-// if (null == sd)
-// {
-// selectInfoList.Add(info);
-// }
-// btnChooseAll.IsSelected = true;
-
-// foreach (var f in roomFunctionOrSceneList)
-// {
-// if (selectInfoList.Find((obj) => obj.targetId == f.targetId) == null)
-// {
-// btnChooseAll.IsSelected = false;
-// break;
-// }
-// }
-// }
-// catch (Exception ex)
-// {
-// MainPage.Log($"Evhaaa {ex.Message}");
-// }
-// }
-// else
-// {
-// if (null != sd)
-// {
-// selectInfoList.Remove(sd);
-// }
-// btnChooseAll.IsSelected = false;
-// }
-// };
-
-// btnChoose.MouseUpEventHandler = eventHandler;
-// roomView.MouseUpEventHandler = eventHandler;
-// btnRoomText.MouseUpEventHandler = eventHandler;
-
-
-// }
-
-
-// }
-
-
-
-//}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage.cs
index b06bea9..ce32f35 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerSelectDevicesPage.cs
+++ b/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鎴栬�協alse
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)
{
--
Gitblit v1.8.0