From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs | 87 ++++++++++++++++++-------------------------
1 files changed, 37 insertions(+), 50 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
index cef5888..84b790a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
@@ -23,11 +23,11 @@
/// <summary>
/// 璁惧妗屽竷鎺т欢
/// </summary>
- private FrameLayout frameDeviceTable = null;
+ private NormalFrameLayout frameDeviceTable = null;
/// <summary>
/// 璁惧妗屽竷鎺т欢
/// </summary>
- private FrameLayout frameSceneTable = null;
+ private NormalFrameLayout frameSceneTable = null;
/// <summary>
/// 鍔熻兘鎸夐挳
/// </summary>
@@ -41,9 +41,9 @@
/// </summary>
private Dictionary<string, CommonDevice> dicSelectDevice = new Dictionary<string, CommonDevice>();
/// <summary>
- /// 褰撳墠閫夋嫨鐨勫垎鏀� 1锛氬満鏅� 2锛氬姛鑳�
+ /// 褰撳墠閫夋嫨鐨勫垎鏀� 0锛氬満鏅� 1锛氬姛鑳�
/// </summary>
- private int nowSwitchIndex = 1;
+ private int nowSwitchIndex = 0;
/// <summary>
/// 褰撳墠閫夋嫨鐨勮澶囩储寮�
/// </summary>
@@ -81,12 +81,12 @@
this.dicSelectScene = new Dictionary<int, Common.SceneUI>();
//鍒濆鍖栨甯冩帶浠�
- this.frameSceneTable = new FrameLayout();
+ this.frameSceneTable = new NormalFrameLayout();
frameSceneTable.Y = Application.GetRealHeight(132);
frameSceneTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(132);
bodyFrameLayout.AddChidren(frameSceneTable);
- this.frameDeviceTable = new FrameLayout();
+ this.frameDeviceTable = new NormalFrameLayout();
frameDeviceTable.Y = frameSceneTable.Y;
frameDeviceTable.Height = frameSceneTable.Height;
bodyFrameLayout.AddChidren(frameDeviceTable);
@@ -133,7 +133,7 @@
tabControl.SelectTabEvent += (tabIndex) =>
{
this.nowSwitchIndex = tabIndex;
- if (tabIndex == 1)
+ if (tabIndex == 0)
{
//鏄剧ず鍦烘櫙鍒楄〃
this.frameSceneTable.Visible = true;
@@ -146,7 +146,11 @@
this.frameDeviceTable.Visible = true;
}
};
- tabControl.InitControl();
+ //寮�濮嬪垵濮嬪寲鍦烘櫙鍔熻兘鍒囨崲鎺т欢
+ var listTitle = new List<string>();
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
+ tabControl.InitControl(listTitle);
}
#endregion
@@ -163,19 +167,19 @@
//鍦烘櫙鏈夌偣鐗规畩,濡傛灉鍚屼竴涓埧闂村唴,宸茬粡鍒嗕韩浜�,鍒欎笉鍐嶆樉绀�
//濡傛灉杩欎釜鍦烘櫙鏄敱宓屽鑰屽垎浜殑,杩欎釜鏃跺��,瀹冨彲浠ユ樉绀哄嚭鏉�
- var listScene = new List<Common.SceneUI>();
+ var listScene = new List<int>();
if (memberShardInfo.dicShardRoom.ContainsKey(lookRoom.FileName) == false)
{
- listScene.AddRange(lookRoom.SceneUIList);
+ listScene.AddRange(lookRoom.ListSceneId);
}
else
{
var tempRoom = memberShardInfo.dicShardRoom[lookRoom.FileName];
- foreach (var data in lookRoom.SceneUIList)
+ foreach (var dataId in lookRoom.ListSceneId)
{
- if (tempRoom.SceneUIFilePathList.Contains(data.FileName) == false)
+ if (tempRoom.ListSceneId.Contains(dataId) == false)
{
- listScene.Add(data);
+ listScene.Add(dataId);
}
}
}
@@ -188,46 +192,29 @@
HdlThreadLogic.Current.RunMainInThread(() =>
{
- var listView = new VerticalFrameControl(29);
+ var listView = new VerticalFrameControl(3);
listView.Y = Application.GetRealHeight(53);
listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);
frameSceneTable.AddChidren(listView);
- foreach (var data in listScene)
+ foreach (var dataId in listScene)
{
+ var data = HdlSceneLogic.Current.GetSceneUIBySceneId(dataId);
+ if (data == null)
+ {
+ continue;
+ }
//鍦烘櫙鍥剧墖
- var frameContr = new FrameLayoutControl();
- frameContr.UseClickStatu = false;
- frameContr.Height = Application.GetRealHeight(470);
- listView.AddChidrenFrame(frameContr);
-
- //鍦烘櫙鍥剧墖
- var btnPic = new ImageView();
- btnPic.X = Application.GetRealWidth(179);
- btnPic.Width = Application.GetRealWidth(844);
- btnPic.Height = Application.GetRealHeight(420);
- btnPic.ImagePath = data.IconPath;
- btnPic.Radius = (uint)Application.GetRealHeight(17);
- frameContr.AddChidren(btnPic, ChidrenBindMode.BindEventOnly);
-
- var btnName = new NormalViewControl(251, 282, true);
- btnName.IsMoreLines = true;
- btnName.X = ControlCommonResourse.XXLeft;
- btnName.Y = Application.GetRealHeight(58);
- btnName.BackgroundColor = 0xff333333;
- btnName.RadiusEx = 17;
- btnName.Text = data.Name;
- btnName.TextSize = 15;
- btnName.TextColor = UserCenterColor.Current.White;
- btnName.TextAlignment = TextAlignment.Center;
- frameContr.AddChidren(btnName);
+ var frameContr = new ScenePictrueControl();
+ listView.AddChidren(frameContr);
+ frameContr.InitControl(data);
var btnSelect = new IconViewControl(58);
btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";
btnSelect.SelectedImagePath = "Item/ItemSelected.png";
btnSelect.X = Application.GetRealWidth(887);
btnSelect.Y = Application.GetRealHeight(35);
- frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEventOnly);
+ frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEvent);
if (dicSelectScene.ContainsKey(data.Id) == true)
{
btnSelect.IsSelected = true;
@@ -310,7 +297,7 @@
/// </summary>
/// <param name="dicData"></param>
/// <param name="listView"></param>
- private void InitDeviceObjectRow(Dictionary<int, List<CommonDevice>> dicData, VerticalListControl listView)
+ private void InitDeviceObjectRow(Dictionary<string, List<CommonDevice>> dicData, VerticalListControl listView)
{
var scrolContr = new RoomDeviceGroupMenuControl(dicData);
this.frameDeviceTable.AddChidren(scrolContr);
@@ -398,11 +385,11 @@
/// 鑾峰彇鍒嗙粍鍚庣殑璁惧
/// </summary>
/// <returns></returns>
- private Dictionary<int, List<CommonDevice>> GetAllGroupDevice()
+ private Dictionary<string, List<CommonDevice>> GetAllGroupDevice()
{
//鍏ㄩ儴鐨勮澶�
- var listDevice = lookRoom.GetRoomListDevice();
- var dic = new Dictionary<int, List<CommonDevice>>();
+ var listDevice = HdlRoomLogic.Current.GetRoomListDevice(lookRoom);
+ var dic = new Dictionary<string, List<CommonDevice>>();
foreach (var device in listDevice)
{
if (memberShardInfo.dicAllShardKeys.ContainsKey(device.FilePath) == true)
@@ -411,11 +398,11 @@
continue;
}
var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
- if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
+ if (dic.ContainsKey(typeInfo.BeloneText) == false)
{
- dic[typeInfo.BeloneTextId] = new List<CommonDevice>();
+ dic[typeInfo.BeloneText] = new List<CommonDevice>();
}
- dic[typeInfo.BeloneTextId].Add(device);
+ dic[typeInfo.BeloneText].Add(device);
}
return dic;
}
@@ -441,10 +428,10 @@
{
listScene.Add(scene);
}
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//涓婁紶鏂囦欢
- var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
+ var result = HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
--
Gitblit v1.8.0