~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -130,17 +130,11 @@
			/// <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 = "";
			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);

			dataString = await MyHttpWebResponse.GetWebRequest(url);

			smartSoundInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<SmartSoundInfo>(dataString);

			dataString = await MyHttpWebResponse.GetWebRequest(url);
			smartSoundInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<SmartSoundInfo>(dataString);
			}

			/// <summary>
			@@ -150,8 +144,7 @@
			/// <param name="new_remark"></param>
			/// <returns></returns>
			private async Task<string> setRemark(SmartSoundInfo.SoundInfo soundInfo, string new_remark)
			{

			{
			if (soundInfo == null)
			return "";

			@@ -162,7 +155,7 @@
			"\"UserID\":" + "\"" + soundInfo.UserID + "\"" + "," +
			"\"HomeID\":" + "\"" + soundInfo.HomeID + "\"" + "}";

			string response_str = await MyHttpWebResponse.PutWebRequest(url, json, Encoding.UTF8);
			string response_str = MyHttpWebResponse.PutWebRequest(url, json, Encoding.UTF8);
			JObject jObject = JObject.Parse(response_str);

			return jObject["StateCode"].ToString();
			@@ -178,55 +171,66 @@

			for (int i = 0; i < smartSoundInfo.ResponseData.Data.Count; i++)
			{
			//
			var smartSound = smartSoundInfo.ResponseData.Data[i];
			var row = new SoundRowLayout();
			listView.AddChidren(row);

			if (smartSound.Platform == "Baidu")
			try
			{
			row.Account = "小度：" + smartSound.UserName;
			row.ImagePath = "SmartSound/Xiaodu.png";
			row.Remark = smartSound.Remark;
			//
			var smartSound = smartSoundInfo.ResponseData.Data[i];
			var row = new SoundRowLayout();
			listView.AddChidren(row);

			if (smartSound.Platform == "Baidu")
			{
			string remark = "小度";
			if (smartSound.Remark != null && smartSound.Remark.Trim() != "")
			remark += "(" + smartSound.Remark + ")";

			row.ImagePath = "SmartSound/Xiaodu.png";
			row.Remark = remark;
			}

			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");
			var smartSound1 = smartSoundInfo.ResponseData.Data[index];
			ShowRenameDialog(row, smartSound1);
			};

			// 解除绑定
			row.btnDelect.ButtonClickEvent += (sender, e) =>
			{
			int index = (int)(((NormalViewControl)sender).GetTagByKey("index"));
			var smartSound1 = smartSoundInfo.ResponseData.Data[index];
			ShowDelectDialog(smartSound1);
			};

			//跳转到控制内容界面 FrameRowControl
			row.frameTable.ButtonClickEvent += (sender, e) =>
			{
			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();
			};
			}

			row.InitControl();
			row.btnDelect.AddTag("index", i);
			row.btnRename.AddTag("index", i);
			row.frameTable.AddTag("index", i);

			//重命名
			row.btnRename.ButtonClickEvent += (sender, e) =>
			catch (Exception e)
			{
			int index = (int)((NormalViewControl)sender).GetTagByKey("index");
			var smartSound1 = smartSoundInfo.ResponseData.Data[index];
			ShowRenameDialog(row, smartSound1);
			};

			// 解除绑定
			row.btnDelect.ButtonClickEvent += (sender, e) =>
			{
			int index = (int)(((NormalViewControl)sender).GetTagByKey("index"));
			ShowDelectDialog(index);
			};

			//跳转到控制内容界面 FrameRowControl
			row.frameTable.ButtonClickEvent += (sender, e) =>
			{
			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();
			};
			this.ShowMassage(ShowMsgType.Tip, e.Message);
			}
			}
			}

			/// <summary>
			/// 解除绑定弹窗
			/// </summary>
			private void ShowDelectDialog(int index)
			private void ShowDelectDialog(SmartSoundInfo.SoundInfo smartSound)
			{
			//生成一个弹窗画面
			var dialogForm = new TextDialog("解除绑定需要到第三方 APP 进行操作", "跳转至小度");
			@@ -235,8 +239,36 @@
			//按下确认按钮
			dialogForm.ComfirmClickEvent += () =>
			{
			//画面关闭
			dialogForm.CloseDialog();
			HdlThreadLogic.Current.RunThread(() =>
			{
			this.ShowProgressBar("删除服务器记录...");

			DelectSmartSound(smartSound);

			HdlThreadLogic.Current.RunMainInThread(() =>
			{
			//画面关闭
			dialogForm.CloseDialog();
			bool bol = false;
			try
			{
			#if Android
			bol = HDLUtils.OpenAppWithPackageName("com.baidu.duer.superapp");
			#else
			HDLUtils.OpenApp("xiaoduapp://");
			#endif
			}
			catch (Exception e)
			{
			string error = e.Message;
			bol = false;
			}
			if (!bol)
			{
			this.ShowMassage(ShowMsgType.Tip, "打开APP失败");
			}
			});
			});
			};
			}
			/// <summary>
			@@ -264,7 +296,7 @@
			if (str == "SUCCESS")
			{
			smartSound.Remark = remark;
			soundRowLayout.btnRemark.Text = textValue;
			soundRowLayout.btnRemark.Text = "小度" + "(" + textValue + ")";
			}
			else
			{
			@@ -276,8 +308,29 @@

			#endregion

			/// <summary>
			/// 删除数据
			/// </summary>
			/// <param name="soundInfo"></param>
			/// <returns></returns>
			private string DelectSmartSound(SmartSoundInfo.SoundInfo soundInfo)
			{
			if (soundInfo == null)
			return "";

			#region ■ 界面重新激活事件___________________
			string url = "https://developer.hdlcontrol.com/zigbeespeakerservice/Auth";
			string json = "{" +
			"\"AuthID\":" + "\"" + soundInfo.Id + "\"" + "," +
			"\"UserID\":" + "\"" + soundInfo.UserID + "\"" + "," +
			"\"HomeID\":" + "\"" + soundInfo.HomeID + "\"" + "}";

			string response_str = MyHttpWebResponse.DeleteWebRequest(url, json, Encoding.UTF8);
			JObject jObject = JObject.Parse(response_str);

			return jObject["StateCode"].ToString();
			}

			#region ■ 界面重新激活事件___________________

			/// <summary>
			/// 自身的上层界面关闭后,它自身处于最上层时,触发的事件
			@@ -287,9 +340,9 @@
			return 1;
			}

			#endregion
			#endregion

			#region ■ 关闭界面___________________________
			#region ■ 关闭界面___________________________

			/// <summary>
			/// 画面关闭
			@@ -299,7 +352,7 @@
			base.CloseFormBefore();
			}

			#endregion

			#endregion

			}
			}