From f37f3a667bd81f78736e381717b82f632cb1fdeb Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期三, 10 六月 2020 15:52:57 +0800
Subject: [PATCH] test
---
ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs | 98 +++++++++++++++++++++++++++---------------------
1 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs
index 72703b8..46835de 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs
@@ -6,6 +6,7 @@
using Shared.Common;
using Shared.Phone.UserCenter.Device;
using Shared.Phone.UserCenter.SmartSound.Util;
+using Shared.Phone.UserCenter.SmartSound.Widget;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.SmartSound
@@ -38,7 +39,6 @@
/// </summary>
public void ShowForm()
{
- // iniData();//鍏堝姞杞芥ā鎷熸暟鎹�
this.ScrollEnabled = false;
@@ -47,12 +47,10 @@
Dictionary<string, string> floorDictionary = Config.Instance.Home.FloorDics;//妤煎眰鍒楄〃
var helpBtn = new MyButton();
- //helpBtn.TextSize = 15;
helpBtn.TextColor = UserCenterColor.Current.TextOrangeColor;
helpBtn.Text = "甯姪";
helpBtn.Gravity = Gravity.CenterRight;
helpBtn.TextAlignment = TextAlignment.CenterRight;
- //helpBtn.BackgroundColor = UserCenterColor.Current.BlackBackGround;
topFrameLayout.AddChidren(helpBtn);
helpBtn.X -= Application.GetRealWidth(58);
@@ -61,7 +59,16 @@
helpBtn.MouseUpEventHandler += (sernder, e) =>
{
- //杩欓噷鏄姞杞藉府缁勭殑鐣岄潰
+ //鐢熸垚涓�涓脊绐楃敾闈�
+ var dialogForm = new TextDialog("缁戝畾鏅鸿兘闊崇鍒扮涓夋柟 APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴�");
+ dialogForm.SetTitleText("甯姪");
+
+ //鎸変笅纭鎸夐挳
+ dialogForm.ComfirmClickEvent += () =>
+ {
+ //鐢婚潰鍏抽棴
+ dialogForm.CloseDialog();
+ };
};
}
@@ -69,11 +76,10 @@
/// 鍒濆鍖栦腑閮ㄦ帶浠�(澶栭儴鍙互璋冪敤)
/// </summary>
/// <param name="i_reGetDeviceOnlineStatu">閲嶆柊鑾峰彇璁惧鐨勫湪绾跨姸鎬�</param>
- public async void InitMiddleFrame()
+ public void InitMiddleFrame()
{
- // show鍑烘病鏈夎澶囩殑鍥炬爣鏂囧瓧鎻愮ず
- this.ShowNotDataImage(bodyFrameLayout, new string[] { "杩樻病鏈夐煶绠卞摝锛�", "缁戝畾鏅鸿兘闊崇璇峰墠寰�绗笁鏂� APP 杩涜鎿嶄綔" });
-
+ this.ClearBodyFrame();
+
var frame = new FrameLayout();
this.bodyFrameLayout.AddChidren(frame);
frame.BackgroundColor = UserCenterColor.Current.White;
@@ -87,48 +93,50 @@
frame.AddChidren(listView);
listView.BeginHeaderRefreshingAction += () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- await getData();
- //涓嬫媺鍒锋柊
- iniView();
-
HdlThreadLogic.Current.RunMain(() =>
{
//闅愯棌涓嬫媺鍒锋柊鐗规晥
listView.EndHeaderRefreshing();
+ this.InitMiddleFrame();
});
-
});
};
- this.ShowProgressBar();
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ this.ShowProgressBar();
+ await getData();
- await getData();
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ iniView();
- this.CloseProgressBar(ShowReLoadMode.NO);
+ if (smartSoundInfo == null || smartSoundInfo.ResponseData == null || smartSoundInfo.ResponseData.RowCount == 0)
+ {
+ // show鍑烘病鏈夎澶囩殑鍥炬爣鏂囧瓧鎻愮ず
+ this.ShowNotDataImage(bodyFrameLayout, new string[] { "杩樻病鏈夐煶绠卞摝锛�", "缁戝畾鏅鸿兘闊崇璇峰墠寰�绗笁鏂� APP 杩涜鎿嶄綔" });
+ }
- iniView();
+ this.CloseProgressBar();
+ });
+ });
}
-
+
/// <summary>
/// 鑾峰彇闊崇鍒楄〃
/// </summary>
/// <returns></returns>
private async Task getData()
{
- SmartSoundInfo.Auth auth = new SmartSoundInfo.Auth();
- auth.HomeID = Common.Config.Instance.Home.Id;
- auth.UserID = Common.Config.Instance.Guid;
- auth.Platform = "";
+ //SmartSoundInfo.Auth auth = new SmartSoundInfo.Auth();
+ //auth.HomeID = Common.Config.Instance.Home.Id;
+ //auth.UserID = Common.Config.Instance.Guid;
+ //auth.Platform = "";
string url = string.Format("https://developer.hdlcontrol.com/zigbeespeakerservice/Auth?Platform&PageSetting.PageSize=100&PageSetting.PageIndex=1&UserID={0}&HomeID={1}",
Common.Config.Instance.Guid,Common.Config.Instance.Home.Id);
- byte[] byteData = Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(auth));
- //byte[] ResponseData = null;
-
- dataString = await UserCenterLogic.GetResponseDataByRequestHttps("zigbeespeakerservice/Auth", true, auth);
- //Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(pra)
- //dataString = System.Text.Encoding.UTF8.GetString(ResponseData);
+
dataString = await MyHttpWebResponse.GetWebRequest(url);
smartSoundInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<SmartSoundInfo>(dataString);
@@ -136,7 +144,7 @@
}
/// <summary>
- ///
+ /// 璁剧疆澶囨敞
/// </summary>
/// <param name="soundInfo"></param>
/// <param name="new_remark"></param>
@@ -185,31 +193,31 @@
row.InitControl();
row.btnDelect.AddTag("index", i);
row.btnRename.AddTag("index", i);
+ row.frameTable.AddTag("index", i);
//閲嶅懡鍚�
row.btnRename.ButtonClickEvent += (sender, e) =>
{
- //
- int index = (int)(((NormalViewControl)sender).GetTagByKey("index"));
+ int index = (int)((NormalViewControl)sender).GetTagByKey("index");
var smartSound = smartSoundInfo.ResponseData.Data[index];
ShowRenameDialog(row, smartSound);
-
};
// 瑙ｉ櫎缁戝畾
row.btnDelect.ButtonClickEvent += (sender, e) =>
{
- //
int index = (int)(((NormalViewControl)sender).GetTagByKey("index"));
ShowDelectDialog(index);
};
- //璺宠浆鍒版帶鍒跺唴瀹圭晫闈�
+ //璺宠浆鍒版帶鍒跺唴瀹圭晫闈� FrameRowControl
row.frameTable.ButtonClickEvent += (sender, e) =>
{
- if (SmartSound.CurretnData != null)
- SmartSound.CurretnData.Clear();
- var smartSoundControlForm = new SmartSoundControlForm();
+ int index = (int)row.frameTable.GetTagByKey("index");
+ if (SmartSound.getInstantiate().LayerList != null)
+ SmartSound.getInstantiate().LayerList.Clear();
+
+ var smartSoundControlForm = new SmartSoundControlForm(smartSoundInfo.ResponseData.Data[index]);
smartSoundControlForm.AddForm();
};
}
@@ -220,12 +228,16 @@
/// </summary>
private void ShowDelectDialog(int index)
{
- this.ShowMassage(ShowMsgType.Confirm, "鎺ヨЕ缁戝畾闇�瑕佺涓夋柟 APP 杩涜鎿嶄綔", () =>
+ //鐢熸垚涓�涓脊绐楃敾闈�
+ var dialogForm = new TextDialog("瑙ｉ櫎缁戝畾闇�瑕佸埌绗笁鏂� APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴�");
+ dialogForm.SetTitleText("瑙ｉ櫎缁戝畾");
+
+ //鎸変笅纭鎸夐挳
+ dialogForm.ComfirmClickEvent += () =>
{
- // 绉婚櫎缁戝畾鐨勯�昏緫
- //smartSoundList.RemoveAt(index);
- listView.RemoveAt(index);
- }, "璺宠浆鑷冲皬搴� APP");
+ //鐢婚潰鍏抽棴
+ dialogForm.CloseDialog();
+ };
}
/// <summary>
/// 閲嶅懡鍚嶅脊绐�
--
Gitblit v1.8.0