From b4912454b001d3287932463b9119dcdfb68e8ba4 Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期三, 10 六月 2020 15:54:02 +0800
Subject: [PATCH] Merge branch 'lss' of http://172.16.1.23:6688/r/~xm/HomeApp into lss
---
/dev/null | 305 --------------------------------------------------
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 1
ZigbeeApp/.vs/GateWay/xs/.DS_Store | 0
ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs | 45 +++++++
4 files changed, 45 insertions(+), 306 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/.DS_Store b/ZigbeeApp/.vs/GateWay/xs/.DS_Store
new file mode 100644
index 0000000..f8d277d
--- /dev/null
+++ b/ZigbeeApp/.vs/GateWay/xs/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
deleted file mode 100644
index d2e43c2..0000000
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
- <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.2400788643044815020f" />
- <MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.0F3EFA59-22A1-4A3A-A991-0B8D4D01A5D5" />
- <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Device/DeviceListMainForm.cs">
- <Files>
- <File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundContentForDeviceChange.cs" Line="233" Column="34" />
- <File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundControlForm.cs" Line="79" Column="1" />
- <File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundControlContentForm.cs" Line="218" Column="67" />
- <File FileName="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs" Line="17" Column="16" />
- <File FileName="Shared/Phone/UserCenter/Device/DeviceListMainForm.cs" Line="91" Column="32" />
- </Files>
- <Pads>
- <Pad Id="ProjectPad">
- <State name="__root__">
- <Node name="GateWay" expanded="True">
- <Node name="Shared" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="Phone" expanded="True">
- <Node name="UserCenter" expanded="True">
- <Node name="Device" expanded="True">
- <Node name="DeviceListMainForm.cs" selected="True" />
- </Node>
- <Node name="SmartSound" expanded="True">
- <Node name="Forms" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- </Node>
- </State>
- </Pad>
- </Pads>
- </MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.DebuggingService.PinnedWatches>
- <Watch file="../../../Shared/Phone/UserCenter/SmartSound/Util/MyHttpWebResponse.cs" line="77" column="18" endLine="77" endColumn="32" offsetX="-1" offsetY="-1" expression="ex" liveUpdate="False" />
- </MonoDevelop.Ide.DebuggingService.PinnedWatches>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/hdl/Desktop/HDL/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundControlContentForm.cs" relfile="Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundControlContentForm.cs" line="75" column="1" />
- </BreakpointStore>
- </MonoDevelop.Ide.DebuggingService.Breakpoints>
- <MultiItemStartupConfigurations />
-</Properties>
\ No newline at end of file
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 0b84d58..447e1cb 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -2,7 +2,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs
deleted file mode 100644
index 46835de..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-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
-{
- //鏅鸿兘闊崇鍒楄〃鐣岄潰
- public class SmartSoundListForm : EditorCommonForm
- {
- public SmartSoundListForm()
- {
- }
-
- private SmartSoundInfo smartSoundInfo = null;
-
- /// <summary>
- /// 鍒楄〃鎺т欢
- /// </summary>
- private VerticalListRefreshControl listView = null;
- /// <summary>
- /// 鍓嶄竴娆℃樉绀哄嚭宸︽粦鑿滃崟鐨凴owLayout
- /// </summary>
- private RowLayoutControl oldShowRightMuneRow = null;
-
- private static string dataString = "";
-
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
- {
-
- this.ScrollEnabled = false;
-
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText("鏅鸿兘闊崇");
- Dictionary<string, string> floorDictionary = Config.Instance.Home.FloorDics;//妤煎眰鍒楄〃
-
- var helpBtn = new MyButton();
- helpBtn.TextColor = UserCenterColor.Current.TextOrangeColor;
- helpBtn.Text = "甯姪";
- helpBtn.Gravity = Gravity.CenterRight;
- helpBtn.TextAlignment = TextAlignment.CenterRight;
- topFrameLayout.AddChidren(helpBtn);
- helpBtn.X -= Application.GetRealWidth(58);
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
-
- helpBtn.MouseUpEventHandler += (sernder, e) =>
- {
- //鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new TextDialog("缁戝畾鏅鸿兘闊崇鍒扮涓夋柟 APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴�");
- dialogForm.SetTitleText("甯姪");
-
- //鎸変笅纭鎸夐挳
- dialogForm.ComfirmClickEvent += () =>
- {
- //鐢婚潰鍏抽棴
- dialogForm.CloseDialog();
- };
- };
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�(澶栭儴鍙互璋冪敤)
- /// </summary>
- /// <param name="i_reGetDeviceOnlineStatu">閲嶆柊鑾峰彇璁惧鐨勫湪绾跨姸鎬�</param>
- public void InitMiddleFrame()
- {
- this.ClearBodyFrame();
-
- var frame = new FrameLayout();
- this.bodyFrameLayout.AddChidren(frame);
- frame.BackgroundColor = UserCenterColor.Current.White;
- frame.Y = 0;
- frame.Height = this.bodyFrameLayout.Height;
-
- // 鍒濆鍖� lisetView
- listView = new VerticalListRefreshControl(29);
- listView.Y = 0;
- listView.Height = bodyFrameLayout.Height;
- frame.AddChidren(listView);
- listView.BeginHeaderRefreshingAction += () =>
- {
- HdlThreadLogic.Current.RunThread(() =>
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- //闅愯棌涓嬫媺鍒锋柊鐗规晥
- listView.EndHeaderRefreshing();
- this.InitMiddleFrame();
- });
- });
- };
-
- HdlThreadLogic.Current.RunThread(async () =>
- {
- this.ShowProgressBar();
- await getData();
-
- HdlThreadLogic.Current.RunMainInThread(() =>
- {
- iniView();
-
- if (smartSoundInfo == null || smartSoundInfo.ResponseData == null || smartSoundInfo.ResponseData.RowCount == 0)
- {
- // show鍑烘病鏈夎澶囩殑鍥炬爣鏂囧瓧鎻愮ず
- this.ShowNotDataImage(bodyFrameLayout, new string[] { "杩樻病鏈夐煶绠卞摝锛�", "缁戝畾鏅鸿兘闊崇璇峰墠寰�绗笁鏂� APP 杩涜鎿嶄綔" });
- }
-
- 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 = "";
- 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);
-
- }
-
- /// <summary>
- /// 璁剧疆澶囨敞
- /// </summary>
- /// <param name="soundInfo"></param>
- /// <param name="new_remark"></param>
- /// <returns></returns>
- private async Task<string> setRemark(SmartSoundInfo.SoundInfo soundInfo, string new_remark)
- {
-
- if (soundInfo == null)
- return "";
-
- string url = "https://developer.hdlcontrol.com/zigbeespeakerservice/Auth";
- string json = "{" +
- "\"AuthID\":" + "\"" + soundInfo.Id + "\"" + "," +
- "\"Remark\":" + "\"" + new_remark + "\"" + "," +
- "\"UserID\":" + "\"" + soundInfo.UserID + "\"" + "," +
- "\"HomeID\":" + "\"" + soundInfo.HomeID + "\"" + "}";
-
- string response_str = await MyHttpWebResponse.PutWebRequest(url, json, Encoding.UTF8);
- JObject jObject = JObject.Parse(response_str);
-
- return jObject["StateCode"].ToString();
- }
-
- private void iniView()
- {
- //
- listView.RemoveAll();
-
- if (smartSoundInfo == null)
- return;
-
- 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")
- {
- row.Account = "灏忓害锛�" + smartSound.UserName;
- row.ImagePath = "SmartSound/Xiaodu.png";
- row.Remark = smartSound.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 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) =>
- {
- 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();
- };
- }
- }
-
- /// <summary>
- /// 瑙ｉ櫎缁戝畾寮圭獥
- /// </summary>
- private void ShowDelectDialog(int index)
- {
- //鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new TextDialog("瑙ｉ櫎缁戝畾闇�瑕佸埌绗笁鏂� APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴�");
- dialogForm.SetTitleText("瑙ｉ櫎缁戝畾");
-
- //鎸変笅纭鎸夐挳
- dialogForm.ComfirmClickEvent += () =>
- {
- //鐢婚潰鍏抽棴
- dialogForm.CloseDialog();
- };
- }
- /// <summary>
- /// 閲嶅懡鍚嶅脊绐�
- /// </summary>
- /// <returns></returns>
- private void ShowRenameDialog(SoundRowLayout soundRowLayout, SmartSoundInfo.SoundInfo smartSound)
- {
- //鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputControl();
- //娣诲姞澶囦唤
- dialogForm.SetTitleText("閲嶅懡鍚�");
- //璇疯緭鍏ュ浠藉悕绉�
- dialogForm.SetTipText(smartSound.Remark);
-
- //鎸変笅纭鎸夐挳
- dialogForm.ComfirmClickEvent += (async (textValue) =>
- {
-
- //鐢婚潰鍏抽棴
- dialogForm.CloseDialog();
-
- string remark = textValue;
- string str = await setRemark(smartSound, remark); //涓婁紶澶囦唤
- if (str == "SUCCESS")
- {
- smartSound.Remark = remark;
- soundRowLayout.btnRemark.Text = textValue;
- }
- else
- {
- //閿欒寮圭獥鎻愮ず
- ShowMassage(ShowMsgType.Tip, "淇敼澶囨敞涓嶆垚鍔燂紒", null, "纭");
- }
- });
- }
-
- #endregion
-
-
- #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
-
- /// <summary>
- /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
- /// </summary>
- public override int FormActionAgainEvent()
- {
- return 1;
- }
-
- #endregion
-
- #region 鈻� 鍏抽棴鐣岄潰___________________________
-
- /// <summary>
- /// 鐢婚潰鍏抽棴
- /// </summary>
- public override void CloseFormBefore()
- {
- base.CloseFormBefore();
- }
-
- #endregion
-
- }
-}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
index 631c349..81625cc 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
@@ -13,6 +13,7 @@
{
}
+<<<<<<< HEAD
public string StateCode { get; set; }
public string ErrorInfo { get; set; }
public Info ResponseData { get; set; }
@@ -24,10 +25,24 @@
public int RowCount { get; set; }
public int PageTotal { get; set; }
public List<SoundInfo> Data { get; set; }
+=======
+ public string StateCode = "";
+ public string ErrorInfo = "";
+ public Info ResponseData = new Info();
+
+ public class Info
+ {
+ public int PageSize = 0;
+ public int PageIndex = 0;
+ public int RowCount = 0;
+ public int PageTotal = 0;
+ public List<SoundInfo> Data = new List<SoundInfo>();
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
}
public class SoundInfo
{
+<<<<<<< HEAD
public string UserID { get; set; }
public string AuthCode { get; set; }
public string Token { get; set; }
@@ -49,13 +64,43 @@
/// 鏅鸿兘闊崇鐨勭敤鎴峰悕锛堝皬搴︼細123456@qq.com锛�
/// </summary>
public string UserName { get; set; } = "123456@qq.com";
+=======
+
+ public string UserID = "";
+ public string AuthCode = "";
+ public string Token = "";
+ public string RefreshToken = "";
+ /// <summary>
+ /// Baidu
+ /// </summary>
+ public string Platform = "Baidu";
+ public string HomeID = "";
+ public string OpenUID = "";
+ /// <summary>
+ /// 鏅鸿兘闊崇澶囨敞
+ /// </summary>
+ public string Remark = "";
+ public string Id = "";
+ public bool IsDeleted = false;
+ public string CreatedOnUtc = "";
+ /// <summary>
+ /// 鏅鸿兘闊崇鐨勭敤鎴峰悕锛堝皬搴︼細123456@qq.com锛�
+ /// </summary>
+ public string UserName;
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
}
public class Auth
{
+<<<<<<< HEAD
public string Platform { get; set; }
public string UserID { get; set; }
public string HomeID { get; set; }
+=======
+ public string Platform = "";
+ public string UserID = "";
+ public string HomeID = "";
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
public PageSetting PageSetting { get; set; }
public Auth()
--
Gitblit v1.8.0