From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 188 +++++-----
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 21 +
ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 321 +++++++++---------
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs | 4
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 36 +
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 77 ++-
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 239 +++++++------
ZigbeeApp/Shared/Phone/UserCenter/DoorLock.zip | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs | 14
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs | 24
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 36 +
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind.zip | 0
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 14
17 files changed, 542 insertions(+), 456 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index e594d9a..1386467 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,28 +2,34 @@
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.GateWay.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.a8099274022ed2dc56ddf73bdd3a308ad9575ec5" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.5c86e4357d63" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs">
<Files>
- <File FileName="Shared/Phone/ZigBee/Device/BindObj.cs" Line="316" Column="9" />
- <File FileName="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs" Line="597" Column="63" />
- <File FileName="Shared/Phone/UserCenter/Device/Bind/BindInfo.cs" Line="92" Column="64" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="119" Column="63" />
+ <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs" Line="1" Column="1" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="75" Column="8" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="GateWay.Droid" expanded="True" />
+ <Node name="GateWay.Droid" expanded="True">
+ <Node name="Assets" expanded="True" />
+ </Node>
<Node name="Shared" expanded="True">
<Node name="Phone" expanded="True">
<Node name="UserCenter" expanded="True">
- <Node name="CommonBase" expanded="True" />
- <Node name="Device" expanded="True">
- <Node name="Bind" expanded="True">
- <Node name="BindTargetsPage.cs" selected="True" />
- </Node>
+ <Node name="CommonBase" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="Logic" expanded="True" />
</Node>
- <Node name="DoorLock" expanded="True" />
+ <Node name="Device" expanded="True">
+ <Node name="Bind" expanded="True" />
+ </Node>
+ <Node name="DoorLock" expanded="True">
+ <Node name="EntryStatusPage.cs" selected="True" />
+ </Node>
</Node>
<Node name="ZigBee" expanded="True">
<Node name="Device" expanded="True" />
@@ -33,6 +39,12 @@
</Node>
</State>
</Pad>
+ <Pad Id="MonoDevelop.Debugger.WatchPad">
+ <State>
+ <Value>curAccountObj.SubAccountDistributedMark</Value>
+ <Value>curDoorLockUser.ConnectedAccount</Value>
+ </State>
+ </Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 4d1e5b3..7c697b0 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 8724e0e..115f6f3 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -23,24 +23,24 @@
17=璇烽�夋嫨妯″紡
18=鏈懡鍚�
19=妯″紡绫诲瀷
-20=缁戝畾璁惧
-21=缁戝畾鍦烘櫙
-22=淇濆瓨
-23=绉婚櫎鎴愬姛
-24=绉婚櫎澶辫触
-25=妯″紡閰嶇疆澶辫触
-26=璇峰厛閰嶇疆鎸夐敭妯″紡
-28=鍒犻櫎
-29=妯″紡璁剧疆澶辫触
-30=澶辫触锛岃妭鐐硅澶囨垨鍦烘櫙涓嶅瓨鍦�
-31=缁戝畾宸茬粡瀛樺湪
-32=缁戝畾澶辫触
-33=澶辫触锛屾帶鍒惰澶囩殑缁戝畾鍒楄〃宸叉弧
+20=缁戝畾璁惧
+21=缁戝畾鍦烘櫙
+22=淇濆瓨
+23=绉婚櫎鎴愬姛
+24=绉婚櫎澶辫触
+25=妯″紡閰嶇疆澶辫触
+26=璇峰厛閰嶇疆鎸夐敭妯″紡
+28=鍒犻櫎
+29=妯″紡璁剧疆澶辫触
+30=澶辫触锛岃妭鐐硅澶囨垨鍦烘櫙涓嶅瓨鍦�
+31=缁戝畾宸茬粡瀛樺湪
+32=缁戝畾澶辫触
+33=澶辫触锛屾帶鍒惰澶囩殑缁戝畾鍒楄〃宸叉弧
34=鑾峰彇鏁版嵁澶辫触锛岃妫�鏌ヨ澶囨槸鍚﹀湪绾�
-35=褰撳墠宸茬粡瀛樺湪鍦烘櫙锛岀‘瀹氳鏇挎崲鍚楋紵
-36=鍒囨崲鍦烘櫙澶辫触锛岃妫�鏌ヨ澶囨槸鍚﹀湪绾�
-37=璇ユ寜閿凡缁忓瓨鍦ㄥ満鏅紝璇峰垹闄ゅ綋鍓嶅満鏅悗鍐嶉噸鏂扮粦瀹�
-38=鎸夐敭涓凡瀛樺湪璁惧锛岃鍒犻櫎褰撳墠琚粦瀹氱殑璁惧鍚庢墠鑳芥坊鍔犲満鏅�� (鐐圭‘瀹氭寜閽墠寰�鍦烘櫙缂栬緫锛屽皢褰撳墠鐨勭粦瀹氳澶囨坊鍔犲埌鍦烘櫙涓�)
+35=褰撳墠宸茬粡瀛樺湪鍦烘櫙锛岀‘瀹氳鏇挎崲鍚楋紵
+36=鍒囨崲鍦烘櫙澶辫触锛岃妫�鏌ヨ澶囨槸鍚﹀湪绾�
+37=璇ユ寜閿凡缁忓瓨鍦ㄥ満鏅紝璇峰垹闄ゅ綋鍓嶅満鏅悗鍐嶉噸鏂扮粦瀹�
+38=鎸夐敭涓凡瀛樺湪璁惧锛岃鍒犻櫎褰撳墠琚粦瀹氱殑璁惧鍚庢墠鑳芥坊鍔犲満鏅�� (鐐圭‘瀹氭寜閽墠寰�鍦烘櫙缂栬緫锛屽皢褰撳墠鐨勭粦瀹氳澶囨坊鍔犲埌鍦烘櫙涓�)
39=璇ョ粦瀹氬凡缁忓瓨鍦�
40=褰撳墠鎸夐敭娌℃湁鏀寔鐨勬ā寮�
41=鍦烘櫙瑙﹀彂
@@ -71,7 +71,7 @@
66=璇峰皢IC鍗℃斁鍦ㄦ劅搴斿尯鍩熶笂
67=褰曞叆鐘舵��
68=瀵嗙爜褰曞叆鎴愬姛
-69=瀵嗙爜澶囨敞锛�
+69=瀵嗙爜澶囨敞:
70=閰嶅瀹㈡埛
71=鏃�
72=鎴愬憳绠＄悊
@@ -290,7 +290,7 @@
609=寮�閿侊細
610=鎶ヨ锛�
611=寮�閿侀�氱煡
-612=淇℃伅鏇存敼
+612=淇℃伅鏇存敼
614=鍙�夊満鏅�
615=鍦烘櫙涓病鏈夌洰鏍囷紝鎺у埗澶辫触
616=鐩爣閰嶇疆涓�
@@ -966,7 +966,7 @@
15224=缂栬緫澶囦唤
15225=澶囨敞
15226=璇疯緭鍏ュ娉ㄥ悕绉�
-15227=鎭㈠鏂囦欢鎴愬姛
+15227=鎭㈠鏂囦欢鎴愬姛
15246=鎶ヨ鐩爣璁剧疆
15247=褰撹闃插尯鎶ヨ鏃讹紝浠ヤ笅鐩爣灏嗕細鍝嶅簲
15248=鎺ㄩ�侀�氱煡
@@ -1667,80 +1667,80 @@
15976=纭鍒犻櫎鍏ㄩ儴娑堟伅?
15977=纭鏍囪鍏ㄩ儴娑堟伅涓哄凡璇�?
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
-18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
-18005=鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
-18006=璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
-18009=鎿嶄綔鏉冮檺涓嶈冻
-18010=琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
-18011=鎿嶄綔鐨勫瓙璐﹀彿涓嶅瓨鍦�
-18012=瑙ｉ櫎缁戝畾鐨勫瓙璐﹀彿涓嶅瓨鍦�
-18013=楠岃瘉鐮佸彂閫佸け璐�
-18015=璐﹀彿宸茬粡瀛樺湪
-18016=楠岃瘉鐮侀敊璇�
-18017=鏈彂閫侀獙璇佺爜鍒版璐﹀彿
-18018=缁戝畾鐨勮处鍙蜂笉瀛樺湪
-18019=鎸囧畾璐﹀彿宸插瓨鍦�
-18022=楠岃瘉鐮佸彂閫佸け璐�
-18024=鎸囧畾璐﹀彿涓嶅瓨鍦�
-18025=鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
-18026=鍘熷瘑鐮侀敊璇�
-18034=璐﹀彿鏈敞鍐�
-18035=璇锋眰鍙傛暟閿欒
-18036=鏃犳晥鐨勭櫥褰曞瘑鍖�
-18039=褰撳墠缂栬緫鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
-18040=褰撳墠娣诲姞鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
-18041=鎸囧畾鐨勪綇瀹呬笉瀛樺湪
-18042=褰撳墠澶囦唤涓嶅睘浜庢偍褰撳墠鐨勪綇瀹�
-18043=澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛�
-18044=鎸囧畾鐨勭綉鍏矷D骞朵笉瀛樺湪
-18045=褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
-18046=褰撳墠浣忓畢杩樺瓨鍦ㄧ潃鏈В闄ょ粦瀹氱殑缃戝叧
-18047=鍏变韩鏁版嵁涓嶅瓨鍦�
-18048=鍒嗕韩鐨勭洰鏍囪处鍙蜂笉瀛樺湪
-18049=鍒嗕韩鏁版嵁鎿嶄綔澶辫触
-18050=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
-18051=涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
-
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
-;鏅鸿兘闂ㄩ攣鍏ョ綉鎿嶄綔鎸囩ず
-21000=鍞ら啋闂ㄩ攣锛岃緭鍏モ��*鈥濄�佲��#鈥濄�佲�滅鐞嗗憳瀵嗙爜鈥漿0}鎸夎闊虫彁绀猴紝杈撳叆鈥�4鈥濋�夋嫨鍔熻兘鑿滃崟{0}杈撳叆鈥�1鈥濓紝纭璁惧鍏ョ綉
-;3璺户鐢靛櫒鍏ョ綉鎿嶄綔鎸囩ず
-21001=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;1璺皟鍏夊櫒灏忔ā鍧楀叆缃戞搷浣滄寚绀�
-21002=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;浜屾寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21003=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21004=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;鍥涙寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21005=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
-21006=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
-;Zigbee鏅鸿兘绠＄姸鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
-21007=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
-;绾㈠浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21008=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;闂ㄧ獥浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21009=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鐕冩皵浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21010=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鐑熼浘浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21011=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;姘存蹈浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21012=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;绌烘皵寮�鍏冲叆缃戞搷浣滄寚绀�
-21013=鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
-;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
-21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
-;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
-21015=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
-
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
-30000=绱ф�ユ寜閽�
-30001=鐕冩皵浼犳劅鍣�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
+18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
+18005=鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
+18006=璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
+18009=鎿嶄綔鏉冮檺涓嶈冻
+18010=琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
+18011=鎿嶄綔鐨勫瓙璐﹀彿涓嶅瓨鍦�
+18012=瑙ｉ櫎缁戝畾鐨勫瓙璐﹀彿涓嶅瓨鍦�
+18013=楠岃瘉鐮佸彂閫佸け璐�
+18015=璐﹀彿宸茬粡瀛樺湪
+18016=楠岃瘉鐮侀敊璇�
+18017=鏈彂閫侀獙璇佺爜鍒版璐﹀彿
+18018=缁戝畾鐨勮处鍙蜂笉瀛樺湪
+18019=鎸囧畾璐﹀彿宸插瓨鍦�
+18022=楠岃瘉鐮佸彂閫佸け璐�
+18024=鎸囧畾璐﹀彿涓嶅瓨鍦�
+18025=鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
+18026=鍘熷瘑鐮侀敊璇�
+18034=璐﹀彿鏈敞鍐�
+18035=璇锋眰鍙傛暟閿欒
+18036=鏃犳晥鐨勭櫥褰曞瘑鍖�
+18039=褰撳墠缂栬緫鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
+18040=褰撳墠娣诲姞鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
+18041=鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+18042=褰撳墠澶囦唤涓嶅睘浜庢偍褰撳墠鐨勪綇瀹�
+18043=澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛�
+18044=鎸囧畾鐨勭綉鍏矷D骞朵笉瀛樺湪
+18045=褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
+18046=褰撳墠浣忓畢杩樺瓨鍦ㄧ潃鏈В闄ょ粦瀹氱殑缃戝叧
+18047=鍏变韩鏁版嵁涓嶅瓨鍦�
+18048=鍒嗕韩鐨勭洰鏍囪处鍙蜂笉瀛樺湪
+18049=鍒嗕韩鏁版嵁鎿嶄綔澶辫触
+18050=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
+18051=涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
+
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
+;鏅鸿兘闂ㄩ攣鍏ョ綉鎿嶄綔鎸囩ず
+21000=鍞ら啋闂ㄩ攣锛岃緭鍏モ��*鈥濄�佲��#鈥濄�佲�滅鐞嗗憳瀵嗙爜鈥漿0}鎸夎闊虫彁绀猴紝杈撳叆鈥�4鈥濋�夋嫨鍔熻兘鑿滃崟{0}杈撳叆鈥�1鈥濓紝纭璁惧鍏ョ綉
+;3璺户鐢靛櫒鍏ョ綉鎿嶄綔鎸囩ず
+21001=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;1璺皟鍏夊櫒灏忔ā鍧楀叆缃戞搷浣滄寚绀�
+21002=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;浜屾寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21003=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21004=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;鍥涙寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21005=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
+21006=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+;Zigbee鏅鸿兘绠＄姸鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
+21007=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+;绾㈠浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21008=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;闂ㄧ獥浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21009=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐕冩皵浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21010=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐑熼浘浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21011=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;姘存蹈浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21012=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;绌烘皵寮�鍏冲叆缃戞搷浣滄寚绀�
+21013=鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
+;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
+21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
+;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
+21015=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+30000=绱ф�ユ寜閽�
+30001=鐕冩皵浼犳劅鍣�
30002=鐑熼浘浼犳劅鍣�
30003=姘翠镜浼犳劅鍣�
30004=閽ュ寵鎵�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind.zip b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind.zip
new file mode 100644
index 0000000..3afdcb5
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind.zip
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index 7dadc52..c6c03c8 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -1072,137 +1072,144 @@
CommonPage.Loading.Start("");
var delResult = new DelDeviceBindResponseAllData();
delResult = await currentKey.DelDeviceBindAsync(delDevice);
- if (delResult != null)
- {
- if (delResult.removeBindResultResponseData != null)
- {
- if (delResult.removeBindResultResponseData.Result == 0)
- {
- currentKey.bindList.Remove(bindDevice);
- RefreshList();
- return 0;
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
- }
- }
- else if (delResult.delDeviceBindResponseData != null)
- {
- foreach (var remTarget in delResult.delDeviceBindResponseData.RemoveBindList)
- {
- if (remTarget.Result == 0)
- {
- currentKey.bindList.Remove(bindDevice);
- RefreshList();
- //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
- currentKey.RoomId = "";
- currentKey.ReSave();
- return 0;
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
- }
- }
- }
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
- }
-
- //if (delResult.delDeviceBindResponseData?.RemoveBindList != null)
+ //if (delResult != null)
//{
- // foreach (var re in delResult.delDeviceBindResponseData.RemoveBindList)
+ // if (delResult.removeBindResultResponseData != null)
// {
- // switch (re.Result)
+ // if (delResult.removeBindResultResponseData.Result == 0)
// {
- // case 0:
+ // currentKey.bindList.Remove(bindDevice);
+ // RefreshList();
+ // return 0;
+ // }
+ // else
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ // }
+ // }
+ // else if (delResult.delDeviceBindResponseData != null)
+ // {
+ // foreach (var remTarget in delResult.delDeviceBindResponseData.RemoveBindList)
+ // {
+ // if (remTarget.Result == 0)
+ // {
// currentKey.bindList.Remove(bindDevice);
// RefreshList();
// //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
// currentKey.RoomId = "";
// currentKey.ReSave();
// return 0;
- // break;
- // case 1:
- // currentKey.bindList.Clear();
- // try
- // {
- // CommonPage.Loading.Start("");
-
- // var getBindList = await currentKey.GetDeviceBindAsync();
- // var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
- // var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
- // if (getBindList != null)
- // {
- // if (getBindList.getAllBindResponseData != null)
- // {
- // foreach (var b in getBindList.getAllBindResponseData.BindList)
- // {
- // if (b.BindCluster == currentClusterID)
- // {
- // if (b.BindCluster == 6)
- // {
-
- // if (b.BindType == 2)
- // {
- // bindSceneListTemp.Add(b);
- // }
- // else
- // {
- // bindDeviceListTemp.Add(b);
- // }
- // }
- // else
- // {
- // currentKey.bindList.Add(b);
- // }
- // }
- // }
- // }
- // }
- // if (currentKey.panelMode == 1)
- // {
- // currentKey.bindList = bindSceneListTemp;
- // }
- // else if (currentKey.panelMode == 100 || currentKey.panelMode == 101 || currentKey.panelMode == 102)
- // {
- // currentKey.bindList = bindDeviceListTemp;
- // }
- // }
- // catch { }
- // finally
- // {
- // RefreshList();
- // CommonPage.Loading.Hide();
- // }
- // break;
- // case 4:
- // if (delResult.removeBindResultResponseData != null)
- // {
- // if (delResult.removeBindResultResponseData.Result == 0)
- // {
- // currentKey.bindList.Remove(bindDevice);
- // RefreshList();
- // return 0;
- // }
- // else
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
- // }
- // }
- // break;
- // default:
- // break;
+ // }
+ // else
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ // }
// }
// }
//}
//else
//{
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
//}
+
+ if (delResult != null && delResult.removeBindResultResponseData != null)
+ {
+ if (delResult.delDeviceBindResponseData?.RemoveBindList != null)
+ {
+ foreach (var re in delResult.delDeviceBindResponseData.RemoveBindList)
+ {
+ switch (re.Result)
+ {
+ case 0:
+ currentKey.bindList.Remove(bindDevice);
+ RefreshList();
+ //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
+ currentKey.RoomId = "";
+ currentKey.ReSave();
+ return 0;
+ break;
+ case 1:
+ currentKey.bindList.Clear();
+ try
+ {
+ CommonPage.Loading.Start("");
+
+ var getBindList = await currentKey.GetDeviceBindAsync();
+ var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
+ var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
+ if (getBindList != null)
+ {
+ if (getBindList.getAllBindResponseData != null)
+ {
+ foreach (var b in getBindList.getAllBindResponseData.BindList)
+ {
+ if (b.BindCluster == currentClusterID)
+ {
+ if (b.BindCluster == 6)
+ {
+
+ if (b.BindType == 2)
+ {
+ bindSceneListTemp.Add(b);
+ }
+ else
+ {
+ bindDeviceListTemp.Add(b);
+ }
+ }
+ else
+ {
+ currentKey.bindList.Add(b);
+ }
+ }
+ }
+ }
+ }
+ if (currentKey.panelMode == 1)
+ {
+ currentKey.bindList = bindSceneListTemp;
+ }
+ else if (currentKey.panelMode == 100 || currentKey.panelMode == 101 || currentKey.panelMode == 102)
+ {
+ currentKey.bindList = bindDeviceListTemp;
+ }
+ }
+ catch { }
+ finally
+ {
+ RefreshList();
+ CommonPage.Loading.Hide();
+ }
+ break;
+ case 2:
+ if (delResult.removeBindResultResponseData != null)
+ {
+ if (delResult.removeBindResultResponseData.Result == 0)
+ {
+ currentKey.bindList.Remove(bindDevice);
+ RefreshList();
+ return 0;
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ }
}
catch { }
finally
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock.zip b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock.zip
new file mode 100644
index 0000000..0e279a0
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock.zip
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index 9ea0ffd..7c33e57 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -64,7 +64,7 @@
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(101),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
#endregion
@@ -424,9 +424,8 @@
var dialog = new Dialog { };
var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
doorDialog.Show();
- doorDialog.dialogMidFraFrameLayout.Width = Application.GetRealWidth(415);
doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(190);
+ doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
@@ -529,12 +528,12 @@
var dialog3 = new Dialog { };
var doorDialog3 = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog3, Language.StringByID(R.MyInternationalizationString.UnlockRequest));
doorDialog3.Show();
- doorDialog3.dialogMidFraFrameLayout.Width = Application.GetRealWidth(415);
doorDialog3.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- doorDialog3.dialogMidFraFrameLayout.X = Application.GetRealWidth(228);
+ doorDialog3.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
doorDialog3.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
doorDialog3.dialogMidFraFrameLayout.AddChidren(doorDialog3.dialogMidText);
doorDialog3.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToOpenDoorLock);
+ doorDialog3.dialogMidText.TextAlignment = TextAlignment.Center;
doorDialog3.dialogMidFraFrameLayout.AddChidren(doorDialog3.dialogMidText);
doorDialog3.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.Confrim);
doorDialog3.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs
index 0c6c44e..0ef19e2 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs
@@ -48,7 +48,6 @@
/// </summary>
public FrameLayout dialogMidFraFrameLayout = new FrameLayout
{
- Width = Application.GetRealWidth(415),
Height = Application.GetRealHeight(58),
X = Application.GetRealWidth(190),
Y = Application.GetRealHeight(202),
@@ -60,6 +59,8 @@
public Button dialogMidText = new Button
{
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextSize = 14,
+ TextAlignment = TextAlignment.Center,
};
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
old mode 100755
new mode 100644
index d8c9401..5361754
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -131,7 +131,7 @@
var btnLine = new FrameLayout()
{
Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(5),
+ Height = 1,
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(81 + 127),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
@@ -152,7 +152,7 @@
Width = Application.GetRealWidth(222),
Height = Application.GetRealHeight(58),
Y = Application.GetRealHeight(35),
- Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
+ Text = Language.StringByID(R.MyInternationalizationString.MatchPerson) + ":",
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
@@ -171,6 +171,16 @@
};
personRemarkRemarkFrameLayout.AddChidren(btnMatchPersonContent);
+ var btnLine1 = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(965),
+ Height = 1,
+ X = Application.GetRealWidth(58),
+ Y = Application.GetRealHeight(81 + 127 + 12 + 127),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+ bottomFrameLayout.AddChidren(btnLine1);
+
var completeBtn = new Button
{
X = Application.GetRealWidth(86),
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index 0fbe09b..0d18c15 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -163,10 +163,9 @@
if (i == 0)
{
bottomRowLayout.Y = Application.GetRealHeight(220);
- btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm);
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
- btnNext.Text = doorLock.DeviceName;
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm) + ":";
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(233 + 20);
var btnDeviceNameEditText = new EditText()
{
X = Application.GetRealWidth(46),
@@ -239,9 +238,8 @@
{
bottomRowLayout.Y = Application.GetRealHeight(481);
btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongModel) + ":";
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
-
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(253);
btnNext.TextAlignment = TextAlignment.CenterLeft;
btnNext.Height = Application.GetRealHeight(58);
btnNext.Text = doorLock.DeviceName;
@@ -286,7 +284,7 @@
btnName.Text = Language.StringByID(R.MyInternationalizationString.DoorLockTime);
btnNextFrameLayout.Y = btnName.Y;
btnNext.UnSelectedImagePath = "DoorLock/RightIcon.png";
- btnLine.Visible = false;
+ btnLine.Visible = true;
btnLine.Y = Application.GetRealHeight(992);
}
int currentIndex = i;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
old mode 100755
new mode 100644
index 03a5d1a..10be4e8
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
@@ -145,10 +145,9 @@
if (i == 0)
{
bottomRowLayout.Y = Application.GetRealHeight(220);
- btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm);
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
- btnNext.Text = doorLock.DeviceName;
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm) + ":";
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(233 + 20);
var btnDeviceNameEditText = new EditText()
{
X = Application.GetRealWidth(46),
@@ -220,9 +219,8 @@
{
bottomRowLayout.Y = Application.GetRealHeight(481);
btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongModel) + ":";
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
-
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(253);
btnNext.TextAlignment = TextAlignment.CenterLeft;
btnNext.Height = Application.GetRealHeight(58);
btnNext.Text = doorLock.DeviceName;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
index 0676dc9..2a71d4b 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -227,10 +227,23 @@
}
}
};
- btnRightFrameLayout.MouseUpEventHandler += eHandler;
- btnRight.MouseUpEventHandler += eHandler;
- RowView.MouseUpEventHandler += eHandler;
- btnText.MouseUpEventHandler += eHandler;
+ if (i == 0)
+ {
+ btnRightFrameLayout.MouseUpEventHandler += eHandler;
+ btnRight.MouseUpEventHandler += eHandler;
+ RowView.MouseUpEventHandler += eHandler;
+ btnText.MouseUpEventHandler += eHandler;
+ }
+ else if (i == 1)
+ {
+ btnRightFrameLayout.MouseUpEventHandler += eHandler;
+ btnRight.MouseUpEventHandler += eHandler;
+ }
+ else if (i == 2)
+ {
+ btnRightFrameLayout.MouseUpEventHandler += eHandler;
+ btnRight.MouseUpEventHandler += eHandler;
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
old mode 100755
new mode 100644
index b65da79..bd30cea
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
@@ -350,7 +350,7 @@
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(101),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
this.bottomRadiusFrameLayout.AddChidren(btnOk);
@@ -522,7 +522,7 @@
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(101),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
this.bottomRadiusFrameLayout.AddChidren(btnOk);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index 74cbb04..c78f4f1 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -46,17 +46,20 @@
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
- ZigBee.Device.DoorLock doorLock;
- VerticalRefreshLayout bodyView;
+ ZigBee.Device.DoorLock doorLock;//褰撳墠闂ㄩ攣
+ VerticalRefreshLayout bodyView;//鍒锋柊View
Button currentMethod;// 褰撳墠閫夋嫨鐨勬柟寮�
- Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
+ Shared.Phone.UserCenter.MemberInfoRes curAccountObj;//褰撳墠璐︽埛
Button entryStatusPic;
Button btnPicTip;
Button btnPicTip1;
- bool isSecondDel;
- FrameLayout blankFrameLayout;
+ bool isSecondDel;//鏄惁浜屾鍒犻櫎
+ FrameLayout blankFrameLayout;//绌烘暟鎹樉绀哄竷灞�
#endregion
+ /// <summary>
+ /// 璇诲彇闂ㄩ攣瀛樺偍鐨勬渶鏂版暟鎹�
+ /// </summary>
void ReadDoorLockUserInfo()
{
System.Threading.Tasks.Task.Run(async () =>
@@ -238,6 +241,9 @@
BlankPicUI();
}
+ /// <summary>
+ /// 绌烘暟鎹甎I鏄剧ず
+ /// </summary>
void BlankPicUI()
{
blankFrameLayout = new FrameLayout
@@ -334,6 +340,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
};
bodyView.AddChidren(frameLayoutRow);
+
int i = 0;
foreach (var curUserId in curAccountDoorLockUserList.Keys)
{
@@ -655,6 +662,20 @@
#endregion
i++;
}
+
+ //閬尅RowLayout澶氫綑鐨勭嚎鏉�
+ for (int j = 0; j < curAccountDoorLockUserList.Keys.Count; j++)
+ {
+ var frameLayoutRowLineHide = new FrameLayout()
+ {
+ Height = 10,
+ Width = Application.GetRealWidth(173),
+ X = Application.GetRealWidth(58),
+ Y = (j + 1) * Application.GetRealHeight(145),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ };
+ frameLayoutRow.AddChidren(frameLayoutRowLineHide);
+ }
frameLayoutRow.Height = i * Application.GetRealHeight(150);
}
}
@@ -697,6 +718,8 @@
var rowFrameLayout = new RowLayout()
{
Height = Application.GetRealHeight(150),
+ LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ X = Application.GetRealWidth(81),
};
sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
@@ -704,7 +727,6 @@
{
Width = Application.GetRealWidth(81),
Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(81),
Y = Application.GetRealHeight(55),
};
rowFrameLayout.AddChidren(btnAllMethod);
@@ -713,7 +735,7 @@
{
Width = Application.GetRealWidth(311),
Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(173),
+ X = Application.GetRealWidth(92),
Y = Application.GetRealHeight(69),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 14,
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
old mode 100755
new mode 100644
index a0f8318..2e9298d
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using Android.Views;
using Shared.Common;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
@@ -249,7 +250,7 @@
var line2 = new Button()
{
Y = rowFrameLayout.Height - 1,
- X = Application.GetRealWidth(58),
+ X = Application.GetRealWidth(176),
Width = Application.GetRealWidth(965),
Height = 1,
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
@@ -364,33 +365,35 @@
var btnMatchUser = new Button
{
- X = Application.GetRealWidth(446),
+ X = Application.GetRealWidth(159),
Y = Application.GetRealHeight(35),
Height = Application.GetRealHeight(63),
- Width = Application.GetRealWidth(284),
+ Width = Application.GetRealWidth(762),
Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 16,
+ TextAlignment = TextAlignment.Center,
};
matchUsersFrameLayout.AddChidren(btnMatchUser);
var btnFinish = new Button
{
- X = Application.GetRealWidth(919),
+ X = Application.GetRealWidth(921),
Y = Application.GetRealHeight(40),
Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(101),
+ Width = Application.GetRealWidth(101 + 81),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
+ TextAlignment = TextAlignment.CenterLeft,
};
matchUsersFrameLayout.AddChidren(btnFinish);
var btnTopLine = new FrameLayout()
{
- Height = Application.GetRealHeight(5),
+ Height = 1,
Y = Application.GetRealHeight(138),
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
};
bottomFrameLayout2.AddChidren(btnTopLine);
@@ -644,6 +647,8 @@
var rowFrameLayout = new RowLayout()
{
Height = Application.GetRealHeight(150),
+ LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ X = Application.GetRealWidth(81),
};
sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
@@ -651,7 +656,6 @@
{
Width = Application.GetRealWidth(81),
Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(81),
Y = Application.GetRealHeight(55),
};
rowFrameLayout.AddChidren(btnAllMethod);
@@ -660,7 +664,7 @@
{
Width = Application.GetRealWidth(311),
Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(173),
+ X = Application.GetRealWidth(92),
Y = Application.GetRealHeight(69),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 14,
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
old mode 100755
new mode 100644
index 675be01..028d6f1
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -117,6 +117,7 @@
Height = Application.GetRealHeight(1238),
Width = Application.GetRealWidth(965),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ Radius = 6,
};
this.midFrameLayout.AddChidren(midTopFrameLayout);
@@ -286,12 +287,22 @@
};
closeFrameLayout.AddChidren(btnDoorClosePic);
+ var btnCurrentTopFrameLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ Width = Application.GetRealWidth(965),
+ BackgroundColor = ZigbeeColor.Current.XMBlack,
+ Y = Application.GetRealHeight(1100),
+ };
+ midTopFrameLayout.AddChidren(btnCurrentTopFrameLayout);
+
var btnCurrentFrameLayout = new FrameLayout()
{
Width = Application.GetRealWidth(965),
Height = Application.GetRealHeight(138),
Y = Application.GetRealHeight(1100),
BackgroundColor = ZigbeeColor.Current.XMBlack,
+ Radius = 6,
};
midTopFrameLayout.AddChidren(btnCurrentFrameLayout);
@@ -320,17 +331,19 @@
#endregion
EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
- {
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
- if (result == false)
- {
- var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
- if (result1 == true)
- {
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
- devicNameSecAction += (deviceRename) =>
+ {
+ openFrameLayout.Enable = false;
+ btnDoorOpenPic.Enable = false;
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result == false)
+ {
+ var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result1 == true)
+ {
+ RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
+ devicNameSecAction += (deviceRename) =>
{
if (!string.IsNullOrEmpty(deviceRename))
{
@@ -340,21 +353,27 @@
deviceUI.CommonDevice.ReSave();
}
};
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- }
- else
- {
- RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
- devicNameSecAction += (deviceRename) =>
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ }
+ else
+ {
+ RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
+ devicNameSecAction += (deviceRename) =>
{
if (!string.IsNullOrEmpty(deviceRename))
{
@@ -364,8 +383,10 @@
deviceUI.CommonDevice.ReSave();
}
};
- }
- };
+ openFrameLayout.Enable = true;
+ btnDoorOpenPic.Enable = true;
+ }
+ };
openFrameLayout.MouseUpEventHandler += hander1;
btnDoorOpenPic.MouseUpEventHandler += hander1;
EventHandler<MouseEventArgs> hander2 = (sender, e) =>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index 79e9351..ebed365 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -317,134 +317,15 @@
/// <summary>
/// 瑙ｉ櫎缁戝畾
/// </summary>
- public async System.Threading.Tasks.Task<DelDeviceBindResponseAllData> DelDeviceBindAsync(DelDeviceBindData delDeviceBindData)
- {
- return await System.Threading.Tasks.Task.Run(async () =>
- {
- DelDeviceBindResponseAllData responseData = null;
- var mainGateway = ZbGateway.MainGateWay;
- if (mainGateway == null)
- {
- responseData = new DelDeviceBindResponseAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
- }
-
- Action<string, string> action = (topic, message) =>
- {
- var gatewayID = topic.Split('/')[0];
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
-
- if (topic == gatewayID + "/" + "Error_Respon")
- {
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- if (temp == null)
- {
- responseData = new DelDeviceBindResponseAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- }
- else
- {
- responseData = new DelDeviceBindResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- }
- }
- //鍦烘櫙绉婚櫎
- if (topic == gatewayID + "/" + "Bind/RemoveBind_Respon")
- {
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelDeviceBindResponseData>(jobject["Data"].ToString());
-
- if (tempData == null)
- {
- responseData = new DelDeviceBindResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
- }
- else
- {
- responseData = new DelDeviceBindResponseAllData { delDeviceBindResponseData = tempData };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- }
- }
- //璁惧绉婚櫎
- if (topic == gatewayID + "/" + "Bind/RemoveBindResult")
- {
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveBindResultResponseData>(jobject["Data"].ToString());
-
- if (tempData != null)
- {
- responseData = new DelDeviceBindResponseAllData { removeBindResultResponseData = tempData };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- }
- }
- };
- mainGateway.Actions += action;
- System.Console.WriteLine("DeviceBind/DelBind_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
- try
- {
- if (delDeviceBindData != null)
- {
- var jObject = new JObject { { "DeviceAddr", delDeviceBindData.DeviceAddr }, { "Epoint", delDeviceBindData.Epoint }, { "Cluster_ID", 0 }, { "Command", 5003 } };
- var removeBindList = new JArray { };
- foreach (var removeBindInfo in delDeviceBindData.RemoveBindList)
- {
- if (removeBindInfo.BindType == 0)
- {
- var dInfo = new JObject{
- { "BindMacAddr",removeBindInfo.BindMacAddr},
- { "BindEpoint", removeBindInfo.BindEpoint} ,
- { "BindCluster", removeBindInfo.BindCluster} ,
- { "BindType",removeBindInfo.BindType}
- };
- removeBindList.Add(dInfo);
- }
- else if (removeBindInfo.BindType == 1)
- {
- var dInfo = new JObject{
- { "BindCluster", removeBindInfo.BindCluster} ,
- { "BindType",removeBindInfo.BindType},
- { "BindScenesId", removeBindInfo.BindScenesId}
- };
- removeBindList.Add(dInfo);
- }
- }
- var data = new JObject {
- {"RemoveBindList",removeBindList}
- };
- jObject.Add("Data", data);
- mainGateway.Send("Bind/RemoveBind", jObject.ToString());
- }
- }
- catch { }
-
- var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
- {
- await System.Threading.Tasks.Task.Delay(10);
- if (responseData != null)
- {
- break;
- }
- }
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
- {
- responseData = new DelDeviceBindResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- }
- mainGateway.Actions -= action;
- System.Console.WriteLine("DeviceBind/DelBind_Actions 閫�鍑�" + System.DateTime.Now.ToString());
- return responseData;
- });
- }
-
- //涔嬪墠2绉嶆柟寮忓弽棣堢粨鏋�
//public async System.Threading.Tasks.Task<DelDeviceBindResponseAllData> DelDeviceBindAsync(DelDeviceBindData delDeviceBindData)
//{
// return await System.Threading.Tasks.Task.Run(async () =>
// {
- // var responseData = new DelDeviceBindResponseAllData();
+ // DelDeviceBindResponseAllData responseData = null;
// var mainGateway = ZbGateway.MainGateWay;
// if (mainGateway == null)
// {
- // responseData.errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�";
- // return responseData;
+ // responseData = new DelDeviceBindResponseAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
// }
// Action<string, string> action = (topic, message) =>
@@ -459,15 +340,14 @@
// if (temp == null)
// {
- // responseData.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
+ // responseData = new DelDeviceBindResponseAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
// }
// else
// {
- // responseData.errorResponData = temp;
- // responseData.errorMessageBase = ErrorMess(temp.Error);
+ // responseData = new DelDeviceBindResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
// }
// }
-
+ // //鍦烘櫙绉婚櫎
// if (topic == gatewayID + "/" + "Bind/RemoveBind_Respon")
// {
// var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
@@ -475,16 +355,15 @@
// if (tempData == null)
// {
- // responseData.errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�";
-
+ // responseData = new DelDeviceBindResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
// }
// else
// {
- // responseData.delDeviceBindResponseData = tempData;
+ // responseData = new DelDeviceBindResponseAllData { delDeviceBindResponseData = tempData };
// System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
// }
// }
-
+ // //璁惧绉婚櫎
// if (topic == gatewayID + "/" + "Bind/RemoveBindResult")
// {
// var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
@@ -492,7 +371,7 @@
// if (tempData != null)
// {
- // responseData.removeBindResultResponseData = tempData;
+ // responseData = new DelDeviceBindResponseAllData { removeBindResultResponseData = tempData };
// System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
// }
// }
@@ -531,7 +410,6 @@
// {"RemoveBindList",removeBindList}
// };
// jObject.Add("Data", data);
- // //ZbGateway.MainGateWay.CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo?.gwID;
// mainGateway.Send("Bind/RemoveBind", jObject.ToString());
// }
// }
@@ -540,46 +418,168 @@
// var dateTime = DateTime.Now;
// while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
// {
- // await System.Threading.Tasks.Task.Delay(100);
- // if (responseData == null || responseData.delDeviceBindResponseData == null)
- // {
- // continue;
- // }
- // if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 1).Count)
- // {
- // if (responseData.removeBindResultResponseData != null)
- // {
- // break;
- // }
- // }
- // else if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 3).Count)
- // {
- // if (responseData.removeBindResultResponseData != null)
- // {
- // break;
- // }
- // }
- // else if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 4).Count)
- // {
- // if (responseData.removeBindResultResponseData != null)
- // {
- // break;
- // }
- // }
- // else
+ // await System.Threading.Tasks.Task.Delay(10);
+ // if (responseData != null)
// {
// break;
// }
// }
// if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
// {
- // responseData.errorMessageBase = "鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔";
+ // responseData = new DelDeviceBindResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
// }
// mainGateway.Actions -= action;
// System.Console.WriteLine("DeviceBind/DelBind_Actions 閫�鍑�" + System.DateTime.Now.ToString());
// return responseData;
// });
//}
+
+ //涔嬪墠2绉嶆柟寮忓弽棣堢粨鏋�
+ public async System.Threading.Tasks.Task<DelDeviceBindResponseAllData> DelDeviceBindAsync(DelDeviceBindData delDeviceBindData)
+ {
+ return await System.Threading.Tasks.Task.Run(async () =>
+ {
+ var responseData = new DelDeviceBindResponseAllData();
+ var mainGateway = ZbGateway.MainGateWay;
+ if (mainGateway == null)
+ {
+ responseData.errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�";
+ return responseData;
+ }
+
+ Action<string, string> action = (topic, message) =>
+ {
+ var gatewayID = topic.Split('/')[0];
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
+
+ if (topic == gatewayID + "/" + "Error_Respon")
+ {
+ var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+
+ if (temp == null)
+ {
+ responseData.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
+ }
+ else
+ {
+ responseData.errorResponData = temp;
+ responseData.errorMessageBase = ErrorMess(temp.Error);
+ }
+ }
+
+ if (topic == gatewayID + "/" + "Bind/RemoveBind_Respon")
+ {
+ var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
+ var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelDeviceBindResponseData>(jobject["Data"].ToString());
+
+ if (tempData == null)
+ {
+ responseData.errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�";
+
+ }
+ else
+ {
+ responseData.delDeviceBindResponseData = tempData;
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
+ }
+ }
+
+ if (topic == gatewayID + "/" + "Bind/RemoveBindResult")
+ {
+ var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
+ var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveBindResultResponseData>(jobject["Data"].ToString());
+
+ if (tempData != null)
+ {
+ responseData.removeBindResultResponseData = tempData;
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
+ }
+ }
+ };
+ mainGateway.Actions += action;
+ System.Console.WriteLine("DeviceBind/DelBind_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
+ try
+ {
+ if (delDeviceBindData != null)
+ {
+ var jObject = new JObject { { "DeviceAddr", delDeviceBindData.DeviceAddr }, { "Epoint", delDeviceBindData.Epoint }, { "Cluster_ID", 0 }, { "Command", 5003 } };
+ var removeBindList = new JArray { };
+ foreach (var removeBindInfo in delDeviceBindData.RemoveBindList)
+ {
+ if (removeBindInfo.BindType == 0)
+ {
+ var dInfo = new JObject{
+ { "BindMacAddr",removeBindInfo.BindMacAddr},
+ { "BindEpoint", removeBindInfo.BindEpoint} ,
+ { "BindCluster", removeBindInfo.BindCluster} ,
+ { "BindType",removeBindInfo.BindType}
+ };
+ removeBindList.Add(dInfo);
+ }
+ else if (removeBindInfo.BindType == 1)
+ {
+ var dInfo = new JObject{
+ { "BindCluster", removeBindInfo.BindCluster} ,
+ { "BindType",removeBindInfo.BindType},
+ { "BindScenesId", removeBindInfo.BindScenesId}
+ };
+ removeBindList.Add(dInfo);
+ }
+ }
+ var data = new JObject {
+ {"RemoveBindList",removeBindList}
+ };
+ jObject.Add("Data", data);
+ //ZbGateway.MainGateWay.CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo?.gwID;
+ mainGateway.Send("Bind/RemoveBind", jObject.ToString());
+ }
+ }
+ catch { }
+
+ var dateTime = DateTime.Now;
+ while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
+ {
+ await System.Threading.Tasks.Task.Delay(100);
+ if (responseData == null || responseData.delDeviceBindResponseData == null)
+ {
+ continue;
+ }
+ if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 1).Count)
+ {
+ if (responseData.removeBindResultResponseData != null)
+ {
+ break;
+ }
+ }
+ else if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 3).Count)
+ {
+ if (responseData.removeBindResultResponseData != null)
+ {
+ break;
+ }
+ }
+ else if (0 < responseData.delDeviceBindResponseData.RemoveBindList.FindAll((obj) => obj.BindType == 0 && obj.Result == 2).Count)
+ {
+ if (responseData.removeBindResultResponseData != null)
+ {
+ break;
+ }
+ }
+ else
+ {
+ break;
+ }
+ }
+ if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
+ {
+ responseData.errorMessageBase = "鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔";
+ }
+ mainGateway.Actions -= action;
+ System.Console.WriteLine("DeviceBind/DelBind_Actions 閫�鍑�" + System.DateTime.Now.ToString());
+ return responseData;
+ });
+ }
/// <summary>
///瑙ｉ櫎缁戝畾鏁版嵁,缃戝叧鍙嶉淇℃伅
@@ -1123,7 +1123,8 @@
break;
}
}
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
+ //涓�閿竻闄ょ洰鏍囷紝浼氬洜涓虹洰鏍囨暟閲忓鑰屽姞闀挎椂闂达紝鐩墠鏆傚畾10绉�
+ if ((DateTime.Now - dateTime).TotalMilliseconds > 10 * 1000)
{
d = new ClearBindInfoResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
--
Gitblit v1.8.0