From e1bfa1d3bf3819bbae18228eb10eacc2f6912d14 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 17:49:23 +0800
Subject: [PATCH] 2019-12-20-2
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 9 ++-
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 2
ZigbeeApp/Home.Ios/Resources/Language.ini | 9 ++-
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 32 ++++++++--
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 21 +++---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 29 +++++----
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 6 +-
ZigbeeApp/Shared/R.cs | 5 +
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 40 ++++++------
9 files changed, 90 insertions(+), 63 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index df01f5e..6d56c5b 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,28 +1,31 @@
锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/MemberList.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2098" Column="37" />
- <File FileName="Shared/Common/ZigbeeColor.cs" Line="312" Column="60" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="2029" Column="21" />
- <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="130" Column="6" />
+ <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2094" Column="22" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="2098" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1433" Column="54" />
+ <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="624" Column="307" />
+ <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="12" Column="16" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
<Node name="GateWay.Droid" expanded="True">
+ <Node name="Assets" expanded="True" />
+ </Node>
+ <Node name="Home.IOS" expanded="True">
<Node name="Resources" expanded="True" />
</Node>
- <Node name="Home.IOS" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
<Node name="DoorLockLogic" expanded="True" />
- <Node name="LogicIfon.cs" selected="True" />
+ <Node name="MemberList.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -36,9 +39,7 @@
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore>
- <Breakpoint file="/Users/hdl/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs" relfile="Shared/Phone/Device/Logic/LogicIfon.cs" line="130" column="1" />
- </BreakpointStore>
+ <BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 5b3b596..6e78af9 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -372,8 +372,8 @@
5105=璇烽�夋嫨鏃堕棿
5106=鍦扮悊鍥存爮
5107=浣嶇疆妯″紡
-5108=绂诲
-5109=鍦ㄥ
+5108=绂诲紑鍦扮偣
+5109=鍒拌揪鍦扮偣
5110=澶╂皵鏉′欢
5111=鍦扮悊浣嶇疆
5112=鎶ヨ
@@ -394,7 +394,7 @@
5127=宸叉湁鑷姩鍖栨潯浠�
5128=寮�濮嬫椂闂�
5129=鎻愮ず
-5130=寮�濮嬫椂闂村ぇ浜庣粨鏉熸椂闂达紝閲嶆柊璁剧疆鏃堕棿鏃犳晥
+5130=寮�濮嬫椂闂村ぇ浜庣粨鏉熸椂闂达紝璇烽噸鏂拌缃椂闂�.
5131=缁撴潫鏃堕棿
5132=璇锋牴鎹綘鐨勯渶瑕佽缃棩绋�
5133=鏃堕棿
@@ -608,6 +608,9 @@
5371=璇烽�夋嫨鍦烘櫙锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
5372=璇烽�夋嫨瀹夐槻妯″紡锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
5373=鑷姩鍖栧凡鎵ц.
+5374=娣诲姞浼犳劅鍣�
+5375=娣诲姞寮�鍏�/鐏厜
+5376=搴旂敤
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 2ec9073..3633ba7 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -372,8 +372,8 @@
5105=璇烽�夋嫨鏃堕棿
5106=鍦扮悊鍥存爮
5107=浣嶇疆妯″紡
-5108=绂诲
-5109=鍦ㄥ
+5108=绂诲紑鍦扮偣
+5109=鍒拌揪鍦扮偣
5110=澶╂皵鏉′欢
5111=鍦扮悊浣嶇疆
5112=鎶ヨ
@@ -394,7 +394,7 @@
5127=宸叉湁鑷姩鍖栨潯浠�
5128=寮�濮嬫椂闂�
5129=鎻愮ず
-5130=寮�濮嬫椂闂村ぇ浜庣粨鏉熸椂闂达紝閲嶆柊璁剧疆鏃堕棿鏃犳晥
+5130=寮�濮嬫椂闂村ぇ浜庣粨鏉熸椂闂达紝璇烽噸鏂拌缃椂闂�.
5131=缁撴潫鏃堕棿
5132=璇锋牴鎹綘鐨勯渶瑕佽缃棩绋�
5133=鏃堕棿
@@ -608,6 +608,9 @@
5371=璇烽�夋嫨鍦烘櫙锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
5372=璇烽�夋嫨瀹夐槻妯″紡锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
5373=鑷姩鍖栧凡鎵ц.
+5374=娣诲姞浼犳劅鍣�
+5375=娣诲姞寮�鍏�/鐏厜
+5376=搴旂敤
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index b44fd18..320f184 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -783,7 +783,7 @@
#endregion
#region ------鍦ㄥ 绂诲
- #region ------鍦ㄥ
+ #region ------鍦ㄥ
var athomeFrameLayout = new FrameLayout
{
@@ -879,14 +879,18 @@
leavehomeSelected.MouseUpEventHandler += leavehomeclick;
leavehomeRowLayout.MouseUpEventHandler += leavehomeclick;
leavehomeFrameLayout.MouseUpEventHandler += leavehomeclick;
-
+ double latitude = Config.Instance.Home.Latitude;//绾害
+ double longitude = Config.Instance.Home.Longitude;//缁忓害
+ int r = 500;//鍗婂緞
if (edit)
{
+ string guid = "";
foreach (var Locationifon in Common.Logic.CurrentLogic.Conditions)
{
if (Locationifon["Type"] == "7")
{
+ guid = Locationifon["WhoSiteUId"];
if (Locationifon["AtHome"] == "0")
{
strname = btnleavehome.Text;
@@ -903,6 +907,18 @@
btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
btnathome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
}
+ break;
+ }
+ }
+
+ foreach (var accounts in Common.Logic.CurrentLogic.Accounts)
+ {
+
+ if (accounts["Type"] == "7" && accounts["Account"] == guid)
+ {
+ latitude = Convert.ToDouble(accounts["Latitude"])/1000000.0;
+ longitude = Convert.ToDouble(accounts["Longitude"]) / 1000000.0;
+ r = int.Parse(accounts["Radius"]);
break;
}
}
@@ -948,14 +964,14 @@
}
LocationConditionsInfo.Add("AtHome", "1");
}
- double a1 = Config.Instance.Home.Latitude, a2 = Config.Instance.Home.Longitude;
+
//璋冪敤鏂规硶锛岃烦杞〉闈�
GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
{
//鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
- var latitud = (int)Math.Truncate(mLatitude * 1000000);
- var longitude = (int)Math.Truncate(mLongitude * 1000000);
+ var latitudW = (int)Math.Truncate(mLatitude * 1000000);
+ var longitudeH = (int)Math.Truncate(mLongitude * 1000000);
Dictionary<string, string> accounts = new Dictionary<string, string>();
if (accounts.ContainsKey("Account"))
{
@@ -979,8 +995,8 @@
}
accounts.Add("Account", Config.Instance.Guid);
accounts.Add("Type", "7");
- accounts.Add("Latitude", latitud.ToString());
- accounts.Add("Longitude", longitude.ToString());
+ accounts.Add("Latitude", latitudW.ToString());
+ accounts.Add("Longitude", longitudeH.ToString());
accounts.Add("Radius", mRadius.ToString());
LogicIfon.Addaccounts(accounts);
LogicIfon.AddLocationconditions(LocationConditionsInfo);
@@ -988,7 +1004,7 @@
UserView.HomePage.Instance.AddChidren(logicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
- }, strname, true, a1, a2, 500);
+ }, strname, true, latitude, longitude, r);
};
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 2b0054e..709e32d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -1005,23 +1005,11 @@
Gravity = Gravity.CenterVertical,
};
pushswitchRowlayout.AddChidren(btnswitch);
- btnswitch.MouseUpEventHandler += (sender1, e1) =>
- {
- btnswitch.IsSelected = !btnswitch.IsSelected;
- if (btnswitch.IsSelected)
- {
-
- }
- else
- {
-
- }
- };
-
+
var custompushFrameLayout = new FrameLayout
{
- Height = Application.GetRealHeight(160),
+ Height = Application.GetRealHeight(0),
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(custompushFrameLayout);
@@ -1072,7 +1060,20 @@
#endregion
+ btnswitch.MouseUpEventHandler += (sender1, e1) =>
+ {
+ btnswitch.IsSelected = !btnswitch.IsSelected;
+ if (btnswitch.IsSelected)
+ {
+ custompushFrameLayout.Height = Application.GetRealHeight(160);
+ }
+ else
+ {
+ custompushFrameLayout.Height = Application.GetRealHeight(0);
+ }
+ };
+
var saveFrameLayout = new FrameLayout
{
Y = middle.Bottom,
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index a8167b2..7844d53 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -621,19 +621,19 @@
int second = int.Parse(conditions["IgnoreTime"]) % 60;
if (minute != 0 && second != 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
else
{
if (minute == 0 && second != 0)
{
- devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
if (minute != 0 && second == 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index e82a359..bc6810c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -708,7 +708,7 @@
});
}
// <summary>
- /// 閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+ /// 閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
/// </summary>
/// <param name="btnregionname">Btnregionname.</param>
/// <param name="device">Device.</param>
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index 5ee0d16..0bb6882 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -301,7 +301,7 @@
Width = Application.GetRealWidth(300),
Y = Application.GetRealHeight(45 + 30),
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- TextID = MyInternationalizationString.addconditions,
+ TextID = MyInternationalizationString.addsensor,
X = Application.GetRealWidth(390),
TextSize = 14,
};
@@ -444,19 +444,19 @@
int second = int.Parse(conditions["IgnoreTime"]) % 60;
if (minute != 0 && second != 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
else
{
if (minute == 0 && second != 0)
{
- devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
if (minute != 0 && second == 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
@@ -615,7 +615,7 @@
Width = Application.GetRealWidth(300),
Y = Application.GetRealHeight(45 + 30),
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- TextID = MyInternationalizationString.addfunction,
+ TextID = MyInternationalizationString.addlighting,
X = Application.GetRealWidth(390),
TextSize = 14,
};
@@ -1139,23 +1139,12 @@
Gravity = Gravity.CenterVertical,
};
pushswitchRowlayout.AddChidren(btnswitch);
- btnswitch.MouseUpEventHandler += (sender1, e1) =>
- {
- btnswitch.IsSelected = !btnswitch.IsSelected;
- if (btnswitch.IsSelected)
- {
-
- }
- else
- {
-
- }
- };
+
var custompushFrameLayout = new FrameLayout
{
- Height = Application.GetRealHeight(160),
+ Height = Application.GetRealHeight(0),
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(custompushFrameLayout);
@@ -1206,7 +1195,18 @@
#endregion
-
+ btnswitch.MouseUpEventHandler += (sender1, e1) =>
+ {
+ btnswitch.IsSelected = !btnswitch.IsSelected;
+ if (btnswitch.IsSelected)
+ {
+ custompushFrameLayout.Height = Application.GetRealHeight(160);
+ }
+ else
+ {
+ custompushFrameLayout.Height = Application.GetRealHeight(0);
+ }
+ };
var saveFrameLayout = new FrameLayout
{
Y = middle.Bottom,
@@ -1222,7 +1222,7 @@
Width = Application.GetRealWidth(910),
Radius = (uint)Application.GetRealHeight(60),
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
- TextID = MyInternationalizationString.Save,
+ TextID = MyInternationalizationString.application,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
saveFrameLayout.AddChidren(btnsave);
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 6d23c75..16a17fa 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -17,7 +17,7 @@
public readonly static int Category = 2;
/// <summary>
/// Me.
- /// </summary>
+ /// </summary>5307
public readonly static int Me = 3;
/// <summary>
/// 鎸夐敭閰嶇疆
@@ -578,6 +578,9 @@
public readonly static int scenetip = 5371;
public readonly static int securitytip = 5372;
public readonly static int defaulttext = 5373;
+ public readonly static int addsensor = 5374;
+ public readonly static int addlighting = 5375;
+ public readonly static int application = 5376;
#region 鐧诲綍娉ㄥ唽
/// <summary>
--
Gitblit v1.8.0