From 3bedb23993745f97e5870eca160c9f00c053c44c Mon Sep 17 00:00:00 2001
From: JLChen <jlchen@JLChendeMac.local>
Date: 星期五, 14 五月 2021 18:55:30 +0800
Subject: [PATCH] 实现门锁的UI
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 29 ++++++
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Screen.png | 0
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs | 8 +-
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Mute.png | 0
HDL-ON_iOS/Resources/Phone/Public/BatteryEnough.png | 0
HDL-ON_iOS/Resources/Language.ini | 124 ++++++++++++++++++++++++++++++
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/CrearPswBackgroud.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Hide.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnConnect.png | 0
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs | 4
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockManager.png | 0
HDL-ON_iOS/Resources/Phone/Public/BatteryNot.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue1.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Delete.png | 0
HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs | 2
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/More.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon1.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/LockPictrue1.png | 0
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs | 13 +-
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon3.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Voice.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Connect.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/History.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/BindScene.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/LockPictrue2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/DoorLock.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Editor.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue3.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 12 ---
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Shard.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Redistribution.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs | 1
34 files changed, 162 insertions(+), 31 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 79a3830..4e14c8e 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -55,7 +55,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-<CodesignProvision>On+Dev-20210510-1</CodesignProvision>
+<CodesignProvision>On+Dev-20210428-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -934,7 +934,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\ComfortableModeSelect.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud4.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" />
@@ -1239,6 +1238,32 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
+ <BundleResource Include="Resources\Phone\Public\BatteryEnough.png" />
+ <BundleResource Include="Resources\Phone\Public\BatteryNot.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 85aeb23..2ec7e95 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -74,7 +74,7 @@
73=Floor Management
74=Room Management
75=Administrator migration
-76=Privilege Migration
+76=Administrator privilege migration
77=Debugging privilege
78=The administrator is migrated to other user.
79=All of the data for the residence is migrated to new user.
@@ -441,7 +441,6 @@
454=Deployment information
455=The name can not be blank.
-
1000=Room Humidity
1001=V-chip
1002=Anion
@@ -530,6 +529,63 @@
1084=1st Gear
1085=2nd Gear
1086=3rd Gear
+1087=Unlock
+1088=Temp. Password
+1089=Connected
+1090=Disconnected
+1091=Generate
+1092=Effective time
+1093=Expire time
+1094=Select time
+1095=Select Date
+1096=Generate
+1097=Temporary password has been copied
+1098=Clear Password?
+1099=The expire time must be later than the effective time
+1100=Unlock Method
+1101=It'll synchronize with actual lock, confirm to delete?
+1102=Delete
+1103=Remark
+1104=The remark can not be blank.
+1105=Assign to
+1106=Target Scene Not Exist
+1107=Select Scene
+1108=Unlock
+1109=Always On
+1110=Setting
+1111=Automation
+1112=Turn on "Always On" Mode
+1113=Turn off "Always On" Mode
+1114=Edit
+1115=Always On will be off at {0}
+1116=Condition
+1117=Motion
+1118=Always On
+1119=Lock
+1120=User
+1121=Unlock Method
+1122=Fingerprint
+1123=Card
+1124=Key
+1125=Information
+1126=Unlock
+1127=Alarm
+1128=Offline
+1129=For first user, Please bind lock password
+1130=Please enter admin password
+1131=Bind Successfully
+1132=Skip to personal password for unlock
+1133=Skip
+1134=Please draw your pattern
+1135=Lock will be always on after setting, confirm to proceed
+1136=Confirm
+1137=Expire
+1138=Always On will expire after {0} hours
+1139=Please enter expire time
+1140=Expire time should not be more than 72 hours
+1141=Expire time should not be less than 1 hour
+1142=Fail to set, please try again
+
5000=Music
5001=Group
@@ -1326,7 +1382,69 @@
1084=椋庨��1妗�
1085=椋庨��2妗�
1086=椋庨��3妗�
-
+1087=涓�閿紑閿�
+1087=Unlock
+1088=涓存椂瀵嗙爜寮�閿�
+1088=Temp. Password
+1089=宸茶繛鎺�
+1089=Connected
+1090=鏈繛鎺�
+1090=Disconnected
+1091=鐢熸垚涓存椂瀵嗙爜
+1091=Generate
+1092=鐢熸晥鏃堕棿
+1092=Effective time
+1093=澶辨晥鏃堕棿
+1093=
+1094=閫夋嫨鏃堕棿
+1095=閫夋嫨鏃ユ湡
+1096=Generate
+1097=涓存椂瀵嗙爜宸茬粡澶嶅埗
+1098=娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
+1099=鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
+1100=寮�閿佹柟寮忕鐞�
+1101=鍒犻櫎鎿嶄綔灏嗚鍚屾浜庡疄浣撻攣涓妠0}鏄惁杩橀渶瑕佸垹闄わ紵
+1102=纭鍒犻櫎
+1103=淇敼澶囨敞鍚嶇О
+1104=澶囨敞鍚嶇О涓嶈兘涓虹┖
+1105=鍒嗛厤鑷�
+1106=妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勫満鏅�
+1107=閫夋嫨鍦烘櫙
+1108=閿佸凡鎵撳紑
+1109=甯稿紑
+1110=鏃舵晥鎬у父寮�璁剧疆
+1111=甯稿紑鑷姩鍖�
+1112=鎵撳紑甯稿紑妯″紡
+1113=鍏抽棴甯稿紑妯″紡
+1114=缂栬緫
+1115=甯稿紑妯″紡灏嗕簬{0}鍏抽棴
+1116=鏉′欢
+1117=鍔ㄤ綔
+1118=甯稿紑妯″紡
+1119=閿�
+1120=鐢ㄦ埛
+1121=寮�閿佹柟寮�
+1122=鎸囩汗
+1123=鍗�
+1124=閽ュ寵
+1125=淇℃伅绫诲瀷
+1126=寮�閿佷俊鎭�
+1127=鎶ヨ绫讳俊鎭�
+1128=璁惧涓嶅湪绾�
+1129=绗竴娆′娇鐢紝璇峰厛缁戝畾闂ㄩ攣瀵嗙爜
+1130=璇疯緭鍏ラ棬閿佺鐞嗗憳瀵嗙爜
+1131=闂ㄩ攣缁戝畾鎴愬姛
+1132=涓轰簡瀹夊叏锛岃璺宠浆鑷充釜浜轰腑蹇儃0}璁剧疆涓汉瀵嗙爜锛屽苟搴旂敤浜庨棬閿佸紑閿�
+1133=璺宠浆
+1134=璇风粯鍒跺浘妗�
+1135=璁剧疆甯稿紑妯″紡鍚巤0}鎮ㄧ殑闂ㄩ攣灏嗗浜庢墦寮�鐘舵�亄0}鏄惁缁х画寮�鍚�
+1136=纭寮�鍚�
+1137=澶辨晥璁剧疆
+1138=甯稿紑妯″紡灏嗕簬{0}灏忔椂鍚庡け鏁�
+1139=璇疯緭鍏ュけ鏁堟椂闂�
+1140=澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
+1141=澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
+1142=甯稿紑妯″紡鍏抽棴璁剧疆澶辨晥锛岃閲嶈瘯
4000=鍙瀵硅
4001=閫氳瘽璁板綍
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/BindScene.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/BindScene.png
new file mode 100644
index 0000000..73984f3
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/BindScene.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Connect.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Connect.png
new file mode 100644
index 0000000..c997b80
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Connect.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/CrearPswBackgroud.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/CrearPswBackgroud.png
new file mode 100644
index 0000000..89acd31
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/CrearPswBackgroud.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Delete.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Delete.png
new file mode 100644
index 0000000..54feadf
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Delete.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/DoorLock.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/DoorLock.png
new file mode 100644
index 0000000..fb3ce93
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/DoorLock.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Editor.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Editor.png
new file mode 100644
index 0000000..40b7bf2
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Editor.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Hide.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Hide.png
new file mode 100644
index 0000000..da7c1ff
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Hide.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/History.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/History.png
new file mode 100644
index 0000000..7609540
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/History.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/LockPictrue1.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/LockPictrue1.png
new file mode 100644
index 0000000..432dd20
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/LockPictrue1.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/LockPictrue2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/LockPictrue2.png
new file mode 100644
index 0000000..1318d0a
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/LockPictrue2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/More.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/More.png
new file mode 100644
index 0000000..f594679
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/More.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Mute.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Mute.png
new file mode 100644
index 0000000..99b6161
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Mute.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon1.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon1.png
new file mode 100644
index 0000000..1a57f38
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon1.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon2.png
new file mode 100644
index 0000000..cc2772b
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon3.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon3.png
new file mode 100644
index 0000000..468f743
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/NormallyOpenIcon3.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Redistribution.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Redistribution.png
new file mode 100644
index 0000000..8d41a7f
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Redistribution.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Screen.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Screen.png
new file mode 100644
index 0000000..8f157cd
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Screen.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Shard.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Shard.png
new file mode 100644
index 0000000..acf5640
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Shard.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnConnect.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnConnect.png
new file mode 100644
index 0000000..15fbdd4
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnConnect.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockManager.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockManager.png
new file mode 100644
index 0000000..ccdfed2
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockManager.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue1.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue1.png
new file mode 100644
index 0000000..31166b8
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue1.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue2.png
new file mode 100644
index 0000000..4aa4888
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue3.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue3.png
new file mode 100644
index 0000000..34d16f9
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLockPictrue3.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Voice.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Voice.png
new file mode 100644
index 0000000..b7f4449
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Voice.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/WeepRobot/Battery.png b/HDL-ON_iOS/Resources/Phone/Public/BatteryEnough.png
similarity index 100%
rename from HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/WeepRobot/Battery.png
rename to HDL-ON_iOS/Resources/Phone/Public/BatteryEnough.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Public/BatteryNot.png b/HDL-ON_iOS/Resources/Phone/Public/BatteryNot.png
new file mode 100644
index 0000000..65a7b71
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/Public/BatteryNot.png
Binary files differ
diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index f67503e..ccceeed 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -313,7 +313,7 @@
topFrameLayout.AddChidren(btnSetting);
//濡傛灉鏄垚鍛樻病鏈夊姛鑳�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
{
btnSetting.Visible = false;
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 556b5e7..7390c4d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -342,18 +342,6 @@
== false ? StringId.Administrators : StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
- btnUserTypeName.MouseUpEventHandler += (sender, e) =>
- {
- var form = new DoorLockListPage();
- var listDevice = new System.Collections.Generic.List<Function>();
- listDevice.Add(new Function { name = "娴嬭瘯璁惧1", sid = "1111", spk = "door.sone" });
- listDevice.Add(new Function { name = "娴嬭瘯璁惧2", sid = "2222", spk = "door.sone" });
- listDevice.Add(new Function { name = "娴嬭瘯璁惧3", sid = "3333", spk = "door.sone" });
- listDevice.Add(new Function { name = "娴嬭瘯璁惧4", sid = "4444", spk = "door.sone" });
- listDevice.Add(new Function { name = "娴嬭瘯璁惧5", sid = "5555", spk = "door.sone" });
- listDevice.Add(new Function { name = "娴嬭瘯璁惧6", sid = "6666", spk = "door.sone" });
- form.AddForm(listDevice);
- };
#endregion
#region 浣忓畢绠＄悊
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index 1f26b8b..489d1a5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -24,7 +24,6 @@
Action backAction;
public AppUnlockGesturePage(string pw, Action action)
{
- MainPage.BasePageView.ScrollEnabled = false;
bodyView = this;
bodyView.Tag = "unlockpage";
oldPasswrod = pw;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs
index f1b4371..3db55fd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs
@@ -313,13 +313,14 @@
{
var form = new UI2.Intelligence.Automation.InputPushText();
MainPage.BasePageView.AddChidren(form);
- form.Show(this.automationInfo.PushSettion);
+ //form.Show(this.automationInfo.PushSettion);
+ form.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- form.action += (pushInfo) =>
- {
- //璧嬪��
- this.automationInfo.PushSettion = pushInfo;
- };
+ //form.action += (pushInfo) =>
+ //{
+ // //璧嬪��
+ // this.automationInfo.PushSettion = pushInfo;
+ //};
};
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs
index 44db3a1..0deeb41 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs
@@ -121,7 +121,7 @@
if (this.listMember != null) { return true; }
//涓昏处鍙烽渶瑕佸幓鑾峰彇鎴愬憳鍒楄〃,鑰屽瓙璐﹀彿鍙兘浠栬嚜宸�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
{
//鑾峰彇鎴愬憳鍒楄〃
var responePack = new DAL.Server.HttpServerRequest().GetResidenceMemberAccount();
@@ -146,7 +146,7 @@
//鑷韩鍔犺繘鍘�,鑷繁浣嶄簬棣栦綅
var info = new ResidenceMemberInfo();
info.childAccountId = OnAppConfig.Instance.LastLoginUserId;
- info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false ? "ADMIN" : "ORDINARY";
+ info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false ? "ADMIN" : "ORDINARY";
info.nickName = UserInfo.Current.userName;
this.listMember.Insert(0, info);
if (string.IsNullOrEmpty(info.nickName))
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index a3b5cbf..ab1f308 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -226,7 +226,7 @@
private void InitUnLockMenuControl()
{
//濡傛灉鏄垚鍛�,鍒欏彧鏈変竴閿紑閿�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
{
//涓�閿紑閿�
var btnOneKey = new NormalViewControl(100, 25, true);
@@ -444,7 +444,7 @@
private void InitBottomMenuIconControl()
{
//濡傛灉鏄垚鍛�,鍒欏彧鏈夊紑閿佹柟寮忕鐞�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
{
//寮�閿佹柟寮忕鐞嗗浘鏍�
var btnManagerIcon = new IconViewControl(40);
@@ -849,7 +849,7 @@
if (this.listMember != null) { return true; }
//涓昏处鍙烽渶瑕佸幓鑾峰彇鎴愬憳鍒楄〃,鑰屽瓙璐﹀彿鍙兘浠栬嚜宸�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
{
//鑾峰彇鎴愬憳鍒楄〃
var responePack = new DAL.Server.HttpServerRequest().GetResidenceMemberAccount();
@@ -874,7 +874,7 @@
//鑷韩鍔犺繘鍘�,鑷繁浣嶄簬棣栦綅
var info = new ResidenceMemberInfo();
info.childAccountId = OnAppConfig.Instance.LastLoginUserId;
- info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false ? "ADMIN" : "ORDINARY";
+ info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false ? "ADMIN" : "ORDINARY";
info.nickName = UserInfo.Current.userName;
this.listMember.Insert(0, info);
if (string.IsNullOrEmpty(info.nickName))
--
Gitblit v1.8.0