From 52005ed57f3f7bc796fdd1a878e4f298a126f1e8 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 16:48:47 +0800
Subject: [PATCH] 2019.10.29-3
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 4
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 35 ++++++--
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 134 +++++++++++++++++++++++++++++++--
ZigbeeApp/Shared/R.cs | 13 +++
5 files changed, 165 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 780161d..8027133 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,22 +2,37 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/R.cs">
<Files>
- <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1351" Column="26" />
+ <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1135" Column="48" />
<File FileName="Shared/Phone/UserView/UserHomeView.cs" />
<File FileName="Shared/Common/SceneUI.cs" />
- <File FileName="Shared/Common/ZigbeeColor.cs" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" />
- <File FileName="Shared/R.cs" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" />
- <File FileName="Shared/Common/Logic.cs" />
+ <File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" Line="484" Column="51" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="1" Column="1" />
+ <File FileName="Shared/R.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="GateWay.Droid" expanded="True" selected="True" />
+ <Node name="GateWay.Droid" expanded="True">
+ <Node name="Assets" expanded="True" />
+ <Node name="Resources" expanded="True" />
+ </Node>
+ <Node name="Shared" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="Device" expanded="True">
+ <Node name="Category" expanded="True" />
+ <Node name="Light" expanded="True" />
+ <Node name="Logic" expanded="True" />
+ </Node>
+ <Node name="UserCenter" expanded="True">
+ <Node name="DoorLock" expanded="True" />
+ </Node>
+ <Node name="UserView" expanded="True" />
+ </Node>
+ <Node name="R.cs" selected="True" />
+ </Node>
</Node>
</State>
</Pad>
@@ -26,7 +41,9 @@
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs" relfile="Shared/Phone/Device/Light/LightControl.cs" line="190" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 0d3002d..0c94de6 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 1de9da3..0d21cfa 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -652,7 +652,9 @@
13143=鍔熻兘绫诲瀷
13144=澶辫触锛岃閲嶈瘯
13145=鎴愬姛
-
+13146=榛樿鍥惧簱
+13147=鎷嶇収
+13148=鎴戠殑鐩稿唽
15000=瀵嗙爜闀垮害涓簕0}涓瓧绗�
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index a4366b0..376a148 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -463,16 +463,129 @@
return;
}
- var localPic = new CategorySceneSelectImgByLocal();
- Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- localPic.Show();
- localPic.action = (imgPath) =>
+ int selectRow_Height = 150;
+ int selectRow_Width = 1034;
+ var selectFL = new FrameLayout()
{
- IconPathType = 0;
- backGround.UnSelectedImagePath = imgPath;
+ BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
+ };
+ AddChidren(selectFL);
+
+ var itemFL = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(1276),
+ Height = Application.GetRealHeight(450),
+ Width = Application.GetRealWidth(selectRow_Width),
+ Gravity = Gravity.CenterHorizontal,
+ Radius = (uint)Application.GetRealHeight(17),
+ BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
+ };
+ selectFL.AddChidren(itemFL);
+ itemFL.Animate = Animate.DownToUp;
+
+ var selectLocalPicture = new Button()
+ {
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.LocalPicture,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
+ };
+ itemFL.AddChidren(selectLocalPicture);
+ var selectLocalLine = new Button()
+ {
+ Y = selectLocalPicture.Bottom,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCLineColor
+ };
+ itemFL.AddChidren(selectLocalLine);
+
+ var selectPhotographBtn = new Button()
+ {
+ Y = selectLocalLine.Bottom,
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.Photograph,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
+ };
+ itemFL.AddChidren(selectPhotographBtn);
+ var selectPhotographLine = new Button()
+ {
+ Y = selectPhotographBtn.Bottom,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCLineColor,
+ };
+ itemFL.AddChidren(selectPhotographLine);
+
+ var selectAblumsBtn = new Button()
+ {
+ Y = selectPhotographLine.Bottom,
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.MyAblums,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4
+ };
+ itemFL.AddChidren(selectAblumsBtn);
+
+ var cancelBtn = new Button()
+ {
+ Y = Application.GetRealHeight(1742),
+ Height = Application.GetRealHeight(selectRow_Height),
+ Width = Application.GetRealWidth(selectRow_Width),
+ Gravity = Gravity.CenterHorizontal,
+ TextID = R.MyInternationalizationString.Cancel,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor,
+ Radius = (uint)Application.GetRealHeight(17)
+ };
+ selectFL.AddChidren(cancelBtn);
+
+ selectLocalPicture.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var localPic = new CategorySceneSelectImgByLocal();
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ localPic.Show();
+ localPic.action = (imgPath) =>
+ {
+ IconPathType = 0;
+ backGround.UnSelectedImagePath = imgPath;
+ };
+ };
+ selectPhotographBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var sceneView = new SelectScene();
+ UserView.HomePage.Instance.AddChidren(sceneView);
+ UserView.HomePage.Instance.PageIndex += 1;
+ sceneView.beforeSceneTargetDeviceUIs = sceneTargetDevicesList;
+ sceneView.Show();
+ sceneView.selectedAction = (selectedScene) =>
+ {
+ sceneTargetDevicesList.Add(selectedScene);
+ RefreshTargetListView();
+ };
+
+ };
+ selectAblumsBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var delayTimeView = new SelectDelayTime();
+ UserView.HomePage.Instance.AddChidren(delayTimeView);
+ UserView.HomePage.Instance.PageIndex += 1;
+ delayTimeView.Show();
+ delayTimeView.selectedTimeAction = (second) =>
+ {
+ sceneTargetDevicesList.Add(second);
+ RefreshTargetListView();
+ };
};
+ cancelBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ };
+ selectFL.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ };
};
backGround.MouseUpEventHandler += backGroundIMGHander;
@@ -561,6 +674,7 @@
BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
};
selectFL.AddChidren(itemFL);
+ itemFL.Animate = Animate.DownToUp;
var selectedFunctionBtn = new Button()
{
@@ -737,7 +851,8 @@
{
}
-
+ modifySceneUI.IconPath = backGround.UnSelectedImagePath;
+
CommonPage.Loading.Start();
var memberDataList = new List<ZigBee.Device.Scene.AddSceneMemberData>();
for (int i = 0; i < sceneTargetDevicesList.Count; i++)
@@ -835,6 +950,7 @@
{
if (modifyRoom != curRoom)
{
+
modifyRoom.SceneUIList.Remove(modifySceneUI);
modifyRoom.SceneUIFilePathList.Remove(modifySceneUI.FileName);
curRoom.SceneUIList.Add(modifySceneUI);
@@ -969,7 +1085,5 @@
}
#endregion
-
-
}
}
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index e50d6ac..ab458ce 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -999,7 +999,18 @@
/// 鎴愬姛
/// </summary>
public const int Success = 13145;
-
+ /// <summary>
+ /// 榛樿鍥惧簱
+ /// </summary>
+ public const int LocalPicture = 13146;
+ /// <summary>
+ /// 鎷嶇収
+ /// </summary>
+ public const int Photograph = 13147;
+ /// <summary>
+ /// 鎴戠殑鐩稿唽
+ /// </summary>
+ public const int MyAblums = 13148;
#endregion
--
Gitblit v1.8.0