From 163777d8a2cb7cfa469f54a7042528870ebc10a3 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 09 十二月 2019 17:46:20 +0800
Subject: [PATCH] 一个新版本
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 12
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs | 3
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 44 +
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs | 1
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs | 5
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 69 --
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 3
ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs | 5
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs | 11
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 21
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswGestureInputControl.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs | 1
ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs | 77 ++
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs | 5
ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs | 13
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs | 83 ---
ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs | 6
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs | 6
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 18
ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs | 19
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs | 1
ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs | 60 ++
ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs | 22
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 2
ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll | 0
ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomMenuSelectForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs | 1
ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs | 17
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/NumberPswInputDialogForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 15
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs | 2
ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs | 1
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 13
ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 2
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs | 1
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs | 133 ++----
ZigbeeApp/Shared/Common/CommonPage.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs | 3
ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomRightClickButton.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs | 2
ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs | 2
ZigbeeApp/Shared/Common/SceneUI.cs | 6
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs | 3
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs | 68 +-
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs | 39 +
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 10
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 13
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs | 1
ZigbeeApp/Home.Ios/Resources/Language.ini | 12
ZigbeeApp/Home.Ios/Home.IOS.csproj | 2
ZigbeeApp/Shared/R.cs | 25
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomLeftClickButton.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs | 2
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 17
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomClickButton.cs | 1
ZigbeeApp/Shared/Common/Device.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 82 ++-
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs | 6
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor0.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor0.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs | 120 ----
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs | 7
ZigbeeApp/Shared/Common/Room.cs | 8
117 files changed, 663 insertions(+), 638 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
old mode 100644
new mode 100755
index d6e2069..25d3bc8
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -541,8 +541,8 @@
5274=妫�娴嬫棤婕忔按
5275=妫�娴嬪埌鐕冩皵
5276=妫�娴嬫棤鐕冩皵
-5277=妫�娴嬪埌鐑熷箷
-5278=妫�娴嬫棤鐑熷箷
+5277=妫�娴嬪埌鐑熼浘
+5278=妫�娴嬫棤鐑熼浘
5279=娣诲姞瀹夐槻
5280=绔嬪嵆鎵ц
5281=鏃堕棿鑼冨洿
@@ -626,10 +626,10 @@
10113=璇峰啀娆¤緭鍏ュ瘑鐮�
10114=鍙戦�侀獙璇佺爜鎴愬姛锛岃娉ㄦ剰鏌ユ敹
10115=纭畾
-10116=璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍
+10116=璇ョ敤鎴峰凡瀛樺湪锛屽彲鐩存帴鐧诲綍
10117=鎻愪緵鐨勫弬鏁伴敊璇�
-10118=涓ゆ瀵嗙爜涓嶄竴鑷�
-10119=楠岃瘉鐮侀敊璇�
+10118=纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
+10119=楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
10120=璇锋眰鏈嶅姟鍣ㄥけ璐�
10121=鎭枩娉ㄥ唽鎴愬姛锛�
10122=鍗冲皢鑷姩鐧诲綍
@@ -650,8 +650,10 @@
10137=浣忓畢鍚嶇О涓虹┖
10138=閭閿欒锛岃閲嶆柊杈撳叆
10139=鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
+10140=璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
10141=浣犲凡琚己鍒朵笅绾匡紒
+
10150=鏀规埧闂村悕绉板凡瀛樺湪
10151=鍦烘櫙鍚嶄笉鑳戒负绌�
10152=鎺у埗鍦烘櫙澶辫触
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png
new file mode 100755
index 0000000..34fd2c1
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor0.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor0.png
new file mode 100755
index 0000000..2de7965
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor0.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 5f603fa..64dab1f 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -1290,6 +1290,12 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Scene\Background.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\selectedsensor0.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\ZigeeLogic\sensor0.png" />
+ </ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index f97a88d..7d85765 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019120501" android:installLocation="auto" android:versionName="1.0.19120501">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019120901" android:installLocation="auto" android:versionName="1.0.19120901">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 5eb3467..a0742ca 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -486,6 +486,7 @@
<BundleResource Include="Resources\Phone\Item\InputAccountIconSelected.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\deviceselectedbackgroundcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\add.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\sensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor13.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicbj1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\dimmableLight.png" />
@@ -542,6 +543,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor40.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\deviceunselectedbackgroundcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor21.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\next.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\security.png" />
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
old mode 100644
new mode 100755
index d6e2069..25d3bc8
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -541,8 +541,8 @@
5274=妫�娴嬫棤婕忔按
5275=妫�娴嬪埌鐕冩皵
5276=妫�娴嬫棤鐕冩皵
-5277=妫�娴嬪埌鐑熷箷
-5278=妫�娴嬫棤鐑熷箷
+5277=妫�娴嬪埌鐑熼浘
+5278=妫�娴嬫棤鐑熼浘
5279=娣诲姞瀹夐槻
5280=绔嬪嵆鎵ц
5281=鏃堕棿鑼冨洿
@@ -626,10 +626,10 @@
10113=璇峰啀娆¤緭鍏ュ瘑鐮�
10114=鍙戦�侀獙璇佺爜鎴愬姛锛岃娉ㄦ剰鏌ユ敹
10115=纭畾
-10116=璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍
+10116=璇ョ敤鎴峰凡瀛樺湪锛屽彲鐩存帴鐧诲綍
10117=鎻愪緵鐨勫弬鏁伴敊璇�
-10118=涓ゆ瀵嗙爜涓嶄竴鑷�
-10119=楠岃瘉鐮侀敊璇�
+10118=纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
+10119=楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
10120=璇锋眰鏈嶅姟鍣ㄥけ璐�
10121=鎭枩娉ㄥ唽鎴愬姛锛�
10122=鍗冲皢鑷姩鐧诲綍
@@ -650,8 +650,10 @@
10137=浣忓畢鍚嶇О涓虹┖
10138=閭閿欒锛岃閲嶆柊杈撳叆
10139=鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
+10140=璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
10141=浣犲凡琚己鍒朵笅绾匡紒
+
10150=鏀规埧闂村悕绉板凡瀛樺湪
10151=鍦烘櫙鍚嶄笉鑳戒负绌�
10152=鎺у埗鍦烘櫙澶辫触
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png
new file mode 100755
index 0000000..34fd2c1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor0.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor0.png
new file mode 100755
index 0000000..2de7965
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor0.png
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 4300bdc..6464ae9 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -45,7 +45,7 @@
Phone.UserView.HomePage.Instance.InitPage();
var roomList = new Shared.Phone.Device.Room.RoomManagement();
-
+
Instance.AddLeftView(roomList);
roomList.Show();
}
@@ -62,7 +62,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.0.19120501";
+ public static string CodeIDString = "1.0.19120901";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
@@ -391,7 +391,7 @@
}
var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponseEntity.ApkInfoRes>(result.ResponseData.ToString());
- if (responeData == null || responeData.pageData == null || responeData.pageData.Count==0)
+ if (responeData == null || responeData.pageData == null || responeData.pageData.Count == 0)
{
return null;
}
@@ -538,7 +538,7 @@
{
try
{
- Application.RunOnMainThread( () =>
+ Application.RunOnMainThread(() =>
{
//璁惧畾涓�涓椂闂�
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 1362810..d732082 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -1397,7 +1397,7 @@
temperatrue = true;
}
//婀垮害浼犳劅鍣�
- else if(((TemperatureSensor)device).SensorDiv == 2)
+ else if (((TemperatureSensor)device).SensorDiv == 2)
{
humidity = true;
}
@@ -1943,7 +1943,7 @@
}
}
//濡傛灉鏄皟鍏夊櫒
- else if (mainDevice.Type == DeviceType.DimmableLight )
+ else if (mainDevice.Type == DeviceType.DimmableLight)
{
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
if (mainDevice.IsCustomizeImage == false)
@@ -1952,7 +1952,7 @@
}
}
//濡傛灉鏄僵鐏殑璇�
- else if ( mainDevice.Type == DeviceType.ColorDimmableLight)
+ else if (mainDevice.Type == DeviceType.ColorDimmableLight)
{
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
if (mainDevice.IsCustomizeImage == false)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index 495100a..b11598c 100755
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -589,9 +589,9 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public List<Room> GetRoomsByFloorId(string id)
+ public List<Room> GetRoomsByFloorId(string id)
{
- return Lists.FindAll((obj) => obj.FloorId==id);
+ return Lists.FindAll((obj) => obj.FloorId == id);
}
/// <summary>
/// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂村悕绉�
@@ -989,7 +989,7 @@
return -1;
}
}
-
+
var getSceneIdAllData = await ZigBee.Device.Scene.GetSceneNewIdAsync(sceneName);
if (getSceneIdAllData == null || getSceneIdAllData.getSceneIdData == null)
{
@@ -1474,6 +1474,6 @@
}
#endregion
-
+
}
}
diff --git a/ZigbeeApp/Shared/Common/SceneUI.cs b/ZigbeeApp/Shared/Common/SceneUI.cs
index eee86e6..8c937cb 100755
--- a/ZigbeeApp/Shared/Common/SceneUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneUI.cs
@@ -39,7 +39,7 @@
/// </summary>
public string IconPath = "Scene/SceneDefault.png";
/// <summary>
- /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
+ /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
/// </summary>
public int IconPathType = 0;
@@ -151,7 +151,7 @@
if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
{
-
+
if (Shared.Common.Room.AllRoomDeviceUIList.Count == 0)
{
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ThisSceneHaveNoDevice);
@@ -161,7 +161,7 @@
if (sceneDeviceList.getSceneDeviceListInfo != null)
{
var deviceList = sceneDeviceList.getSceneDeviceListInfo.DeviceList;
-
+
if (deviceList != null && Room.AllRoomDeviceUIList.Count != 0)
{
foreach (var sceneDev in deviceList)
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index 9fba2ee..0a92ff2 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
index e0c512c..fd78fa1 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index 16b41e8..51bc9e8 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
index fcb1103..42759c0 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index 75a3412..25e449c 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
index 02f4c26..14601b1 100755
--- a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
@@ -568,7 +568,7 @@
Text = ACControlBase.GetModeNameByModeId(ac.currentSystemMode)
};
itemView.AddChidren(currentModeBtn);
-
+
reduceTemperatureBtn = new Button()
{
X = Application.GetRealWidth(268),
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
index 2a07059..9a7efab 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs
@@ -282,6 +282,23 @@
/// <param name="mouseEventArgs"></param>
private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
{
+ if (CheckAccount(account) == false)
+ {
+ return;
+ }
+ //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
+ if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
+ {
+ errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
+ return;
+ }
+
+ if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
+ {
+ errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
+ return;
+ }
+
(sender as Button).Enable = (sender as Button).IsSelected = false;
CommonPage.Loading.Start();
try
@@ -347,6 +364,35 @@
CommonPage.Loading.Hide();
}
}
+
+
+ /// <summary>
+ /// CheckAccount
+ /// </summary>
+ /// <param name="accountStr"></param>
+ /// <returns></returns>
+ private bool CheckAccount(string accountStr)
+ {
+ errorBtn.Text = string.Empty;
+ if (phoneEmailForm.SelectedEmail.IsSelected)
+ {
+ if (AccountLogic.Instance.CheckEmail(accountStr) == false)
+ {
+ errorBtn.TextID = R.MyInternationalizationString.TheEmailError;
+ return false;
+ }
+ }
+ else
+ {
+ if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false)
+ {
+ errorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
+ return false;
+ }
+ }
+ return true;
+ }
+
#endregion
#region 鈼� 纭淇敼__________________________
@@ -358,13 +404,23 @@
/// <param name="mouseEventArgs"></param>
private async void Reset(object sender,MouseEventArgs mouseEventArgs)
{
+
+ if (CheckAccount(account) == false)
+ {
+ return;
+ }
//鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
{
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.TwoPasswordInconsistency), Language.StringByID(R.MyInternationalizationString.Confrim));
- alert.Show();
+ errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
return;
}
+ if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
+ {
+ errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
+ return;
+ }
+
CommonPage.Loading.Start();
try
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs
index 5199260..534233a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs
@@ -64,9 +64,9 @@
/// <param name="phone">鎵嬫満鍙�</param>
/// <param name="zoneCode">鍖哄彿</param>
/// <returns></returns>
- public bool CheckPhoneWithZone(string phone,string zoneCode)
+ public bool CheckPhoneWithZone(string phone, string zoneCode)
{
- if(zoneCode=="86")
+ if (zoneCode == "86")
{
var regex = new Regex(CommonPage.PhoneRegexStr);
return regex.IsMatch(phone);
@@ -79,5 +79,23 @@
}
#endregion
+
+ #region 鈼� 瀵嗙爜____________________________
+
+ /// <summary>
+ /// 妫�鏌ュ瘑鐮侀暱搴﹀悎娉曟��
+ /// </summary>
+ /// <param name="password"></param>
+ /// <returns></returns>
+ public bool CheckPwdLength(string password)
+ {
+ if (password.Trim().Length >= 6 && password.Trim().Length <= 13)
+ {
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
index 3cab11a..6bdec6f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs
@@ -394,11 +394,12 @@
Config.Instance.Save();
var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
- var homes = await House.GetHomeLists();
+ var homes = await House.GetHomeLists();
+ //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+ await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
- //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+
Shared.Common.Room.InitAllRoom();
Application.RunOnMainThread(() =>
{
@@ -543,11 +544,11 @@
HomePage.Instance.ShowLoginLoadView();
});
var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
- var homes = await House.GetHomeLists();
+ var homes = await House.GetHomeLists();
+ //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+ await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
- //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
Shared.Common.Room.InitAllRoom();
Application.RunOnMainThread(() =>
{
@@ -675,13 +676,13 @@
Config.Instance.Save();
return true;
}
- else
+ else
{
return false;
}
}
-
+
/// <summary>
/// phone/email 閫夋嫨
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
index 3cb3282..d5ee032 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs
@@ -319,10 +319,11 @@
Config.Instance.Save();
var resultRegID = await CommonPage.Instance.PushRegID();
var homes = await House.GetHomeLists();
+
+ //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+ await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
- //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
Shared.Common.Room.InitAllRoom();
Application.RunOnMainThread(() =>
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
index ff9b5c3..da5814b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs
@@ -82,7 +82,6 @@
//AddBody
AddBodyView();
-
//bind
BindEvent();
}
@@ -225,11 +224,11 @@
}
pwdRow = new PwdRowForm();
pwdRow.Init(accountCodeFrameLayout, 29, 196);
- //pwdRow.PasswrodET.TextChangeEventHandler += Account_TextChange;
+ pwdRow.PasswrodET.TextChangeEventHandler += Code_TextChange;
pwdComfireRow = new PwdRowForm();
pwdComfireRow.Init(accountCodeFrameLayout, 29, 363);
- //pwdComfireRow.PasswrodET.TextChangeEventHandler += Account_TextChange;
+ pwdComfireRow.PasswrodET.TextChangeEventHandler += Code_TextChange;
pwdComfireRow.SetPlaceholdText(Language.StringByID(R.MyInternationalizationString.PleaseComfirePWD));
codeRow = new CodeForRegisterRowForm();
@@ -251,6 +250,7 @@
phoneEmailForm.SelectedEmail.MouseUpEventHandler += SelectPhoneOrEmail_MouseUpEvent;
registerBtn.MouseUpEventHandler += Register;
loginByAccountPWDBtn.MouseUpEventHandler += LoginByPWD;
+ codeRow.VerificationCodeET.TextChangeEventHandler += Code_TextChange;
}
#endregion
@@ -262,6 +262,23 @@
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
private async void Register(object sender, MouseEventArgs mouseEventArgs)
{
+ if (CheckAccount(account) == false)
+ {
+ return;
+ }
+ //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
+ if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
+ {
+ errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
+ return;
+ }
+
+ if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
+ {
+ errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
+ return;
+ }
+
CommonPage.Loading.Start();
try
{
@@ -350,12 +367,10 @@
errorBtn.Text = string.Empty;
if ((sender as EditText).Text.Trim().Length > 0)
{
- //IsRightAccount = true;
codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
}
else
{
- //IsRightAccount = false;
codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
}
account = (sender as EditText).Text.Trim();
@@ -369,7 +384,7 @@
private void Code_TextChange(object sender, string mouseEventArgs)
{
errorBtn.Text = string.Empty;
- if ((sender as EditText).Text.Trim().Length > 0)
+ if (codeRow.VerificationCodeET.Text.Trim().Length > 0 && account.Trim().Length > 0 && pwdRow.PasswrodET.Text.Trim().Length > 0 && pwdComfireRow.PasswrodET.Text.Trim().Length > 0)
{
registerBtn.Enable = registerBtn.IsSelected = true;
}
@@ -389,15 +404,23 @@
/// <param name="mouseEventArgs"></param>
private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
{
- (sender as Button).Enable = (sender as Button).IsSelected = false;
- //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
- if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
- {
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.TwoPasswordInconsistency), Language.StringByID(R.MyInternationalizationString.Confrim));
- alert.Show();
- codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
+ if (CheckAccount(account) == false)
+ {
return;
}
+ //鍏堝垽鏂�2娆″瘑鐮佽緭鍏ユ槸鍚︿竴鑷�
+ if (pwdRow.PasswrodET.Text.Trim() != pwdComfireRow.PasswrodET.Text.Trim())
+ {
+ errorBtn.TextID = R.MyInternationalizationString.TwoPasswordInconsistency;
+ return;
+ }
+
+ if (AccountLogic.Instance.CheckPwdLength(pwdRow.PasswrodET.Text.Trim()) == false)
+ {
+ errorBtn.TextID = R.MyInternationalizationString.ThePWDLengthError;
+ return;
+ }
+
CommonPage.Loading.Start();
(sender as Button).Enable = (sender as Button).IsSelected = false;
try
@@ -465,6 +488,34 @@
CommonPage.Loading.Hide();
}
}
+
+ /// <summary>
+ /// CheckAccount
+ /// </summary>
+ /// <param name="accountStr"></param>
+ /// <returns></returns>
+ private bool CheckAccount(string accountStr)
+ {
+ errorBtn.Text = string.Empty;
+ if (phoneEmailForm.SelectedEmail.IsSelected)
+ {
+ if (AccountLogic.Instance.CheckEmail(accountStr) == false)
+ {
+ errorBtn.TextID = R.MyInternationalizationString.TheEmailError;
+ return false;
+ }
+ }
+ else
+ {
+ if (AccountLogic.Instance.CheckPhoneWithZone(accountStr, CommonPage.PhoneZoneStr) == false)
+ {
+ errorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
+ return false;
+ }
+ }
+ return true;
+ }
+
#endregion
}
}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
index dba9a55..3c52135 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs
@@ -118,9 +118,11 @@
}
//鐧诲綍鎴愬姛
var homes = await House.GetHomeLists();
- ZigBee.Common.Application.Init();
+
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ //鍚姩ZigBee
+ ZigBee.Common.Application.Init();
Shared.Common.Room.InitAllRoom();
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
index 38eabe4..110e270 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs
@@ -290,7 +290,7 @@
AccountET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(700),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -313,6 +313,7 @@
accountFL.AddChidren(accountLine);
}
}
+
public class EmailLoginRowForm : FrameLayout
{
@@ -354,7 +355,7 @@
AccountET = new EditText()
{
- X = Application.GetRealWidth(193),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(700),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -481,7 +482,7 @@
VerificationCodeET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(350),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
@@ -870,7 +871,7 @@
VerificationCodeET = new EditText()
{
- X = Application.GetRealWidth(236),
+ X = Application.GetRealWidth(222),
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(Button_Height),
Gravity = Gravity.CenterVertical,
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 89cc2bb..4aaf309 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -1742,11 +1742,11 @@
#endregion
#region 鈼� 鑷姩鍖朹_________________________
-
+
/// <summary>
- /// 鑷姩鍖�
+ /// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
/// </summary>
- private async void ShowAutotion()
+ private void ShowAutotion()
{
functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
@@ -1760,7 +1760,7 @@
Y = Application.GetRealHeight(30),
};
functionSceneAutoBodyView.AddChidren(bjFrameLayout);
- bjFrameLayout.SetCornerWithSameRadius(25, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
var sigBtn = new Button
{
Width = Application.GetMinRealAverage(84),
@@ -1781,7 +1781,7 @@
TextID = MyInternationalizationString.logictemplate,
Gravity = Gravity.CenterVertical,
TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
- TextSize=15,
+ TextSize = 15,
};
bjFrameLayout.AddChidren(recommendtextBtn);
@@ -1806,7 +1806,7 @@
};
functionSceneAutoBodyView.AddChidren(scenehorizontalScrol);
- var logicScrolView = new VerticalScrolViewLayout
+ var logicScrolView = new VerticalRefreshLayout//VerticalScrolViewLayout
{
Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
@@ -1815,8 +1815,7 @@
Y = scenehorizontalScrol.Bottom,
};
functionSceneAutoBodyView.AddChidren(logicScrolView);
- logicScrolView.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
-
+ logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -1907,14 +1906,31 @@
logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
Automationview(logicScrolView);
};
+ logicScrolView.BeginHeaderRefreshingAction += () =>
+ {
+ //閲嶆柊鍒锋柊logic鍒楄〃
+ Common.Logic.LogicList.Clear();
+ Read(logicScrolView);
+ //鍏抽棴鍒锋柊View锛�
+ logicScrolView.EndHeaderRefreshing();
+ };
+
+ Read(logicScrolView);
+ }
+ /// <summary>
+ /// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
+ /// </summary>
+ /// <param name="logicScrolView"></param>
+ private async void Read(VerticalRefreshLayout logicScrolView)
+ {
CommonPage.Loading.Start();
if (Common.Logic.LogicList.Count == 0)
{
var Idlist = await Logic.Send.GetLogicId(0);
if (Idlist.Count != 0)
{
- var listlogic = await Logic.Send.ReadList(Idlist.Count,0);
+ var listlogic = await Logic.Send.ReadList(Idlist.Count, 0);
//foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆�
for (int j = 0; j < listlogic.Count; j++)
{
@@ -1930,14 +1946,13 @@
//鑷姩鍖�
Automationview(logicScrolView);
CommonPage.Loading.Hide();
-
- }
+ }
/// <summary>
- /// 鑷姩鍖栧垪琛ㄧ晫闈�
+ /// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
/// <param name="refresview">Refresview.</param>
- private async void Automationview(VerticalScrolViewLayout refresview)
+ private async void Automationview(VerticalRefreshLayout refresview)
{
refresview.RemoveAll();
foreach (var logic in Common.Logic.LogicList)
@@ -2066,7 +2081,7 @@
}
/// <summary>
- /// 鏄剧ず鍥炬爣鐨勯鑹�
+ /// 鏄剧ず鑷姩鍖栬緭鍑哄姛鑳芥ā鍧楀浘鏍囩殑棰滆壊
/// </summary>
/// <param name="logic"></param>
/// <param name="logicRowlayout"></param>
@@ -2465,6 +2480,7 @@
}
}
}
+
#endregion
#region 鈼� 鎺у埗鐘舵�乢________________________
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index 9781c78..e1661ef 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -36,7 +36,7 @@
/// </summary>
private string ImagePath="SceneIcon/1.png";
/// <summary>
- /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
+ /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
/// </summary>
public int IconPathType = 0;
/// <summary>
@@ -159,7 +159,7 @@
targetRow.SetNameText(devNameText);
targetRow.SetZoneText(targetDevice.SceneUI.GetZone());
}
-
+
var editBtn = new Button()
{
BackgroundColor = ZigbeeColor.Current.GXCEditBackGroundColor,
@@ -251,7 +251,7 @@
}
}
-
+
}
}
}
@@ -275,7 +275,7 @@
/// </summary>
private void Init()
{
-
+
}
/// <summary>
@@ -567,10 +567,10 @@
backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
backGround.ImagePath = imagePath;
System.IO.File.Delete(imagePath);
-
+
}, fileName, 2, 1);
};
-
+
selectAblumsBtn.MouseUpEventHandler += (send, ee) =>
{
selectFL.RemoveFromParent();
@@ -776,7 +776,7 @@
sceneTargetDevicesList.Add(selectedScene);
RefreshTargetListView();
};
-
+
};
//娣诲姞鏃堕棿闂撮殧
selectedTimerBtn.MouseUpEventHandler += (send, ee) =>
@@ -972,7 +972,6 @@
{
if (modifyRoom != curRoom)
{
-
modifyRoom.SceneUIList.Remove(modifySceneUI);
modifyRoom.SceneUIFilePathList.Remove(modifySceneUI.FileName);
curRoom.SceneUIList.Add(modifySceneUI);
@@ -1109,7 +1108,7 @@
}
}
-
+
};
#endregion
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
index 96c797f..da0dedc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
@@ -302,6 +302,7 @@
};
functionSceneBodyView.AddChidren(deviceListScrolView);
tempFunctionTypeBtn = new FunctionButton();
+ tempFunctionTypeBtn.Init("","");
EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
{
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 50deba0..7ed1c76 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -182,7 +182,7 @@
if (string.IsNullOrEmpty(room.HumidityDevice) == false)
{
HdlGatewayReceiveLogic.Current.RemoveEvent("HumidityDevice");
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("HumidityDevice", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);
if (room.HumidityDevice != mainKeys)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index d712314..788b4f4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -17,9 +17,8 @@
Tag = "Logic";
}
- public void Show(int isInt=0, bool edit=false)
+ public void Show(int isInt = 0, bool edit = false)
{
-
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
var topRowLayout = new RowLayout
@@ -79,7 +78,6 @@
};
this.AddChidren(middle);
-
var blancolor = new FrameLayout
{
Width = Application.GetMinRealAverage(200),
@@ -115,7 +113,7 @@
Height = Application.GetMinRealAverage(60),
X = Application.GetRealWidth(300),
Y = blancolor.Bottom + Application.GetRealHeight(50),
- TextID =MyInternationalizationString.createtimetext,
+ TextID = MyInternationalizationString.createtimetext,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextSize = 15,
@@ -130,7 +128,6 @@
};
middle.AddChidren(PickerViewfra);
PickerViewfra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
-
var mUIPickerView = new UIPickerView
{
@@ -163,7 +160,7 @@
int value = 0;
if (edit)
{
-
+
timevalue = int.Parse(Common.Logic.CurrentLogic.Actions[isInt]["DelayTime"].ToString());
if (timevalue > 3600)
{
@@ -172,11 +169,13 @@
}
else
{
+
var minutevalue1 = timevalue / 60;
var secondvalue1 = timevalue % 60;
//鏇存柊鏈�鏂扮姸鎬�
mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
}
+
value = timevalue;
}
string selectde = "";
@@ -188,7 +187,6 @@
selectde = "yes";
};
-
var btnsave = new Button
{
@@ -210,7 +208,7 @@
{
return;
}
- if (selectde != ""|| timevalue==5)
+ if (selectde != "" || timevalue == 5)
{
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 7);
@@ -242,6 +240,7 @@
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
};
+
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
old mode 100755
new mode 100644
index f63c328..311d957
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -24,9 +24,10 @@
Button clickbutton = new Button();
Button clicktextcolcrbutton = new Button();
- public void Show()
+ public void Show()
{
+
UserView.HomePage.Instance.ScrollEnabled = false;
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
@@ -1238,6 +1239,7 @@
Width = Application.GetRealWidth(600),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize=14,
};
timeoutrowlayout.AddChidren(btntimeout);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index fa4eb0b..36a7fc5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -86,6 +86,7 @@
{
///浠庡垪琛ㄧЩ闄ゅ綋鍓嶉棬閿佸叏閮ㄧ殑鏃ф暟鎹紱
Send.LockList.Remove(Send.LockList[i]);
+ i--;
}
}
Read();
@@ -125,7 +126,7 @@
/// </summary>
public void UserAllView(string macport)
{
-
+ middle.RemoveAll();
for (int i = 0; i < Send.LockList.Count; i++)
{
var user = Send.LockList[i];
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 36ea833..cff085e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -632,7 +632,6 @@
case 21:
case 22:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/doormagnetism.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.logicopen;
@@ -664,7 +663,6 @@
break;
case 40:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/smoke.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.smokescreen;
@@ -674,7 +672,6 @@
break;
case 42:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.waterleakage;
@@ -687,7 +684,6 @@
break;
case 43:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/gas.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.gas;
@@ -697,7 +693,6 @@
break;
case 277:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.callthepolice;
@@ -707,7 +702,6 @@
break;
default:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/infraredsensor.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.callthepolice;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index c387b1c..2ac86ac 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -18,7 +18,6 @@
VerticalRefreshLayout middle;
CommonDevice common;
Dictionary<string, string> editdeviceConditionsInfo;
-
public void Show(CommonDevice commondevice, Dictionary<string, string> editdeviceConditions = null)
{
common = commondevice;
@@ -92,6 +91,7 @@
{
///浠庡垪琛ㄧЩ闄ゅ綋鍓嶉棬閿佸叏閮ㄧ殑鏃ф暟鎹紱
Send.LockList.Remove(Send.LockList[i]);
+ i--;
}
}
Read();
@@ -133,7 +133,7 @@
/// <param name="macport"></param>
public void UserList(string macport)
{
-
+ middle.RemoveAll();
foreach (var user in Send.LockList)
{
if (user.DoorLockMacPort != macport)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index df581f4..f9eb44b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -186,7 +186,7 @@
}
};
}
-
+
var temperatureRow = new DeviceInfoRow(446);
temperatureRow.Init();
temperatureRow.SetTipTitle(R.MyInternationalizationString.Temperature);
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
index 55a51f1..fca2cd7 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -278,6 +278,7 @@
tempFunctionTypeBtn = new FunctionButton();
+ tempFunctionTypeBtn.Init("", "");
foreach (var deviceType in Common.Room.AllRoomDeviceTypeList)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index c2fa340..9a2a54d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -481,7 +481,7 @@
//璇锋眰鍙傛暟閿欒
dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
//楠岃瘉鐮佸彂閫佸け璐�
- dic["SendFail "] = R.MyInternationalizationString.RegisterSendVerCode_SendFail;
+ dic["SendFail"] = R.MyInternationalizationString.RegisterSendVerCode_SendFail;
//鎿嶄綔澶辫触锛岃閲嶈瘯
dic["Fail"] = R.MyInternationalizationString.uOperationFailed;
//璐﹀彿涓嶅瓨鍦�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 42798c2..7c86b24 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -30,20 +30,18 @@
else { this.SetClickStatu(); }
}
}
-
/// <summary>
- /// 鏄惁鏄暱鎸夌姸鎬�
+ /// 鍦嗚搴�
/// </summary>
- private bool isLongClick = false;
+ public int RadiusEx
+ {
+ set { this.Radius = (uint)Application.GetRealHeight(value); }
+ }
/// <summary>
/// 鎺т欢鐨勭偣鍑讳簨浠�(鑷畾涔夊皝瑁呬簨浠�,姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽寜涓嬩簨浠�,鍙桟anClick灞炴�ф帶鍒�)
/// </summary>
public Action<Button, MouseEventArgs> ButtonClickEvent = null;
- /// <summary>
- /// (鈽呭綋鍓嶄笉瑕佷娇鐢ㄢ槄)鎺т欢鐨勯暱鎸変簨浠�,褰撲簨浠朵负null鏃�,浠ｈ〃闀挎寜缁撴潫(鑷畾涔夊皝瑁呬簨浠�,姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽暱鎸変簨浠�,鍙桟anClick灞炴�ф帶鍒�)
- /// </summary>
- public Action<Button, MouseEventArgs> ButtonLongClickEvent = null;
/// <summary>
/// 鎺т欢鐨勬寜涓嬩簨浠�(鑷畾涔夊皝瑁呬簨浠�,姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽寜涓嬩簨浠�,鍙桟anClick灞炴�ф帶鍒�)
/// </summary>
@@ -68,8 +66,6 @@
this.MouseUpEventHandler += ButtonBase_MouseUpEventHandler;
//鎸変笅浜嬩欢
this.MouseDownEventHandler += ButtonBase_MouseDownEventHandler;
- //闀挎寜浜嬩欢
- this.MouseLongEventHandler += ButtonBase_MouseLongEventHandler;
}
/// <summary>
@@ -146,15 +142,7 @@
try
{
- if (this.isLongClick == false)
- {
- this.ButtonClickEvent(this, e);
- }
- else if (ButtonLongClickEvent != null)
- {
- //闀挎寜缁撴潫
- this.ButtonLongClickEvent(this, null);
- }
+ this.ButtonClickEvent(this, e);
}
catch (Exception ex)
{
@@ -165,8 +153,6 @@
HdlLogLogic.Current.WriteLog(ex);
}
}
- //鐘舵�佽繕鍘�
- this.isLongClick = false;
}
#endregion
@@ -180,9 +166,6 @@
/// <param name="e"></param>
private void ButtonBase_MouseDownEventHandler(object sender, MouseEventArgs e)
{
- //杩樺師鐘舵��
- this.isLongClick = false;
-
if (CanClick == false || this.ButtonDownClickEvent == null)
{
//涓嶈兘鐐瑰嚮
@@ -200,45 +183,6 @@
alert.Show();
//Log鍑哄姏
HdlLogLogic.Current.WriteLog(ex);
- }
- }
-
- #endregion
-
- #region 鈻� 闀挎寜浜嬩欢___________________________
-
- /// <summary>
- /// 闀挎寜浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ButtonBase_MouseLongEventHandler(object sender, MouseEventArgs e)
- {
- //闀挎寜鐘舵��
- this.isLongClick = true;
-
- if (ButtonLongClickEvent == null)
- {
- this.MouseLongEventHandler -= ButtonBase_MouseLongEventHandler;
- return;
- }
- if (CanClick == true)
- {
- //Log鍑哄姏
- this.WriteLog(1);
-
- try
- {
- this.ButtonLongClickEvent(this, e);
- }
- catch (Exception ex)
- {
- //鍑虹幇鏈煡閿欒
- var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
- alert.Show();
- //Log鍑哄姏
- HdlLogLogic.Current.WriteLog(ex);
- }
}
}
@@ -271,7 +215,6 @@
{
ButtonClickEvent = null;
ButtonDownClickEvent = null;
- ButtonLongClickEvent = null;
base.RemoveFromParent();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomClickButton.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomClickButton.cs
index 5b99972..855c674 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomClickButton.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomClickButton.cs
@@ -29,6 +29,7 @@
this.Gravity = Gravity.CenterHorizontal;
this.Radius = (uint)Application.GetRealHeight(128) / 2;
this.TextSize = 16;
+ this.IsBold = true;
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomLeftClickButton.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomLeftClickButton.cs
index c9f3365..7754ffb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomLeftClickButton.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomLeftClickButton.cs
@@ -42,14 +42,14 @@
/// <param name="i_width">瀹藉害,鐪熷疄鍊�</param>
/// <param name="i_height">楂樺害,鐪熷疄鍊�</param>
/// <param name="i_radius">鍦嗚搴�(鍙瀹夊崜鏈夋晥)</param>
- public BottomLeftClickButton(int i_width, int i_height, uint i_radius = 8)
+ public BottomLeftClickButton(int i_width, int i_height, int i_radius = 17)
{
this.Height = i_height;
this.Width = i_width;
this.Gravity = Gravity.BottomLeft;
#if Android
- this.Radius = i_radius;
+ this.RadiusEx = i_radius;
#endif
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomRightClickButton.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomRightClickButton.cs
index 5bc2d3d..3e47a2b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomRightClickButton.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomRightClickButton.cs
@@ -42,14 +42,14 @@
/// <param name="i_width">瀹藉害,鐪熷疄鍊�</param>
/// <param name="i_height">楂樺害,鐪熷疄鍊�</param>
/// <param name="i_radius">鍦嗚搴�(鍙瀹夊崜鏈夋晥)</param>
- public BottomRightClickButton(int i_width, int i_height, uint i_radius = 8)
+ public BottomRightClickButton(int i_width, int i_height, int i_radius = 17)
{
this.Height = i_height;
this.Width = i_width;
this.Gravity = Gravity.BottomRight;
#if Android
- this.Radius = i_radius;
+ this.RadiusEx = i_radius;
#endif
}
@@ -72,6 +72,7 @@
this.AddChidren(btnBomTemp, ChidrenBindMode.BindEventOnly);
//纭鎸夐挳
this.btnConfirm = new NormalViewControl(this.Width - Application.GetRealWidth(10), Application.GetRealHeight(60), false);
+ btnConfirm.IsBold = true;
btnConfirm.Gravity = Gravity.Center;
btnConfirm.TextColor = UserCenterColor.Current.White;
btnConfirm.Text = i_text;
@@ -100,6 +101,7 @@
#if iOS
//纭鎸夐挳
this.btnConfirm = new NormalClickButton(this.Width, this.Height, false);
+ btnConfirm.IsBold = true;
btnConfirm.Gravity = Gravity.BottomRight;
btnConfirm.TextColor = UserCenterColor.Current.White;
btnConfirm.Text = i_text;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
index a1e6520..22d6a8f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
@@ -94,7 +94,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Y = Application.GetRealHeight(683);
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//杩涘害鏄剧ず鏂囨湰
@@ -116,7 +116,6 @@
this.btnProgressBar = new FrameLayout();
btnProgressBar.Width = 0;
btnProgressBar.Height = btnProRow.Height;
- btnProgressBar.Radius = btnProRow.Radius;
btnProgressBar.BackgroundColor = 0xfffb744a;
btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;
btnProRow.AddChidren(btnProgressBar);
@@ -131,7 +130,7 @@
var btnProgressPic = new PicViewControl(84, 60);
btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";
frameProgress.AddChidren(btnProgressPic);
- this.btnProgressView = new NormalViewControl(84, 32, true);
+ this.btnProgressView = new NormalViewControl(84, 45, true);
btnProgressView.TextSize = 10;
btnProgressView.TextAlignment = TextAlignment.Center;
btnProgressView.Text = "0%";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswGestureInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswGestureInputControl.cs
index 487f079..50147ed 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswGestureInputControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswGestureInputControl.cs
@@ -49,6 +49,7 @@
btnTitle.TextAlignment = TextAlignment.Center;
btnTitle.TextSize = 18;
btnTitle.Text = i_title;
+ btnTitle.IsBold = true;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
index 711cbee..cf840fd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs
@@ -83,6 +83,7 @@
this.Height = Application.GetMinRealAverage(NumberSize * 4 + NumberTopButtomSpace * 3) + Application.GetRealHeight(368);
this.btnTitle = new NormalViewControl(Application.CurrentWidth, Application.GetRealWidth(75), false);
btnTitle.Text = i_title;
+ btnTitle.IsBold = true;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
index 8bf882e..1ec9341 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
@@ -53,7 +53,7 @@
{
this.frameTable = new FrameLayout();
frameTable.Gravity = Gravity.CenterHorizontal;
- frameTable.Radius = 8;
+ frameTable.Radius = (uint)Application.GetRealHeight(17);
frameTable.Height= Application.GetRealHeight(260);
frameTable.Width = Application.GetRealWidth(968);
frameTable.BackgroundColor = UserCenterColor.Current.White;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index abc30df..e5428f4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
@@ -54,21 +54,21 @@
this.frameTable = new FrameLayout();
frameTable.Height = this.Height;
frameTable.Width = this.Width;
- frameTable.Radius = 20;
+ frameTable.Radius = (uint)Application.GetRealHeight(58);
frameTable.BackgroundColor = UserCenterColor.Current.White;
this.AddChidren(frameTable);
//鍙充笂鍦嗚鑳屾櫙
var btnTopRight = new NormalViewControl(150, 60, true);
btnTopRight.BackgroundColor = UserCenterColor.Current.White;
- btnTopRight.Radius = 6;
+ btnTopRight.RadiusEx = 17;
this.AddChidren(btnTopRight);
btnTopRight.X = this.Width - btnTopRight.Width;
//宸︿笅鍦嗚鑳屾櫙
var btnBottomRight = new NormalViewControl(150, 60, true);
btnBottomRight.BackgroundColor = UserCenterColor.Current.White;
- btnBottomRight.Radius = 6;
+ btnBottomRight.RadiusEx = 17;
this.AddChidren(btnBottomRight);
btnBottomRight.Y = this.Height - btnBottomRight.Height;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
index f19dd48..176cc98 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
@@ -38,7 +38,7 @@
this.Width = Application.GetRealWidth(968);
this.Gravity = Gravity.CenterHorizontal;
this.BackgroundColor = UserCenterColor.Current.White;
- this.Radius = 8;
+ this.Radius = (uint)Application.GetRealHeight(17);
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
index eba5ae8..da3d79b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
@@ -56,6 +56,7 @@
var btnScene = new NormalViewControl(frameScene.Width, Application.GetRealHeight(63), false);
btnScene.Text = btnTemp.Text;
btnScene.TextSize = 16;
+ btnScene.IsBold = true;
btnScene.TextColor = UserCenterColor.Current.TextColor2;
frameScene.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);
//搴曠嚎
@@ -98,8 +99,10 @@
this.m_nowSelectIndex = 1;
btnScene.TextSize = 16;
+ btnScene.IsBold = true;
btnScene.TextColor = UserCenterColor.Current.TextColor2;
btnFunc.TextSize = 14;
+ btnFunc.IsBold = false;
btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSceneLine.Visible = true;
btnFuncLine.Visible = false;
@@ -117,8 +120,10 @@
this.m_nowSelectIndex = 2;
btnScene.TextSize = 14;
+ btnScene.IsBold = false;
btnScene.TextColor = UserCenterColor.Current.TextGrayColor3;
btnFunc.TextSize = 16;
+ btnFunc.IsBold = true;
btnFunc.TextColor = UserCenterColor.Current.TextColor2;
btnFuncLine.Visible = true;
btnSceneLine.Visible = false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs
index 42f91dc..20b5552 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs
@@ -60,7 +60,7 @@
this.Width = Application.GetRealWidth(width);
this.Height = Application.GetRealHeight(height);
this.Gravity = Gravity.CenterHorizontal;
- this.Radius = 6;
+ this.Radius = (uint)Application.GetRealHeight(17);
this.BackgroundColor = 0xfff8f7f7;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
index 20b11a9..b1caac1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
@@ -79,7 +79,7 @@
frameTable.Height = Application.GetRealHeight(RowHeight * rowCount);
frameTable.BackgroundColor = UserCenterColor.Current.White;
frameTable.BorderColor = UserCenterColor.Current.Transparent;
- frameTable.Radius = 6;
+ frameTable.Radius = (uint)Application.GetRealHeight(17);
this.AddChidren(frameTable);
if (titleText != null)
@@ -104,7 +104,7 @@
//鎷ユ湁鏍囬
listView.Y = Application.GetRealHeight(RowHeight);
}
- listView.Radius = frameTable.Radius;
+ listView.Radius = (uint)Application.GetRealHeight(17);
frameTable.AddChidren(listView);
//涓夎褰㈠浘鏍�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
index 99c76e4..02e26e4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
@@ -64,7 +64,7 @@
frameCode.X = i * Application.GetRealWidth(115 + 49);
frameCode.Width = Application.GetRealWidth(115);
frameCode.Height = Application.GetRealHeight(104);
- frameCode.Radius = 6;
+ frameCode.Radius = (uint)Application.GetRealHeight(17);
frameCode.BorderWidth = 1;
frameCode.BorderColor = UserCenterColor.Current.TextFrameColor;
this.AddChidren(frameCode);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
index 3d6dcec..127b3ac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
@@ -94,7 +94,6 @@
btnDeviceRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
btnDeviceRoom.TextSize = 12;
btnDeviceRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnDeviceRoom.Text = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);
frameTable.AddChidren(btnDeviceRoom, ChidrenBindMode.BindEventOnly);
//搴曠嚎
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
index e4f7202..bab9c6a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
@@ -39,6 +39,13 @@
/// 瀛愭帶浠禮杞村亸绉婚噺(鍏遍�氬畾涔夎�屽凡)
/// </summary>
public int chidrenYaxis = 0;
+ /// <summary>
+ /// 鍦嗚搴�
+ /// </summary>
+ public int RadiusEx
+ {
+ set { this.Radius = (uint)Application.GetRealHeight(value); }
+ }
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
index fb1b67c..0276263 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
@@ -104,7 +104,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Y = Application.GetRealHeight(706);
frameBack.Gravity = Gravity.CenterHorizontal;
- frameBack.Radius = 8;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
frameMain.AddChidren(frameBack);
//鏍囬
var btnTitle = new NormalViewControl(frameBack.Width, Application.GetRealHeight(65), false);
@@ -193,7 +193,7 @@
frameConfirm.Height = Application.GetRealHeight(127);
frameConfirm.Width = frameBack.Width;
frameConfirm.Gravity = Gravity.BottomCenter;
- frameConfirm.Radius = 8;
+ frameConfirm.RadiusEx = 17;
frameConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
frameBack.AddChidren(frameConfirm);
//鎶婁笂鍦嗚瑕嗙洊涓烘柟瑙�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs
index 5f89c79..6d9f680 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs
@@ -68,7 +68,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Y = Application.GetRealHeight(691);
frameBack.Gravity = Gravity.CenterHorizontal;
- frameBack.Radius = 8;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
this.AddChidren(frameBack);
//鏍囬淇℃伅
this.btnTitle = new NormalViewControl(frameBack.Width, Application.GetRealHeight(65), false);
@@ -86,7 +86,7 @@
frameText.Gravity = Gravity.CenterHorizontal;
frameText.BorderColor = 0xff676767;
frameText.BorderWidth = 1;
- frameText.Radius = 8;
+ frameText.Radius = (uint)Application.GetRealHeight(17);
frameBack.AddChidren(frameText);
//杈撳叆妗�
this.txtInput = new TextInputControl(frameText.Width - Application.GetRealWidth(20), frameText.Height, false);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
index b00607f..a3a4704 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
@@ -50,7 +50,7 @@
var frameBack = new FrameLayout();
frameBack.Width = Application.GetRealWidth(850);
frameBack.Height = Application.GetRealHeight(1342);
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Y = Application.GetRealHeight(328);
@@ -59,7 +59,7 @@
this.listView = new VerticalListControl(3);
listView.Y = Application.GetRealHeight(164 - 11);
listView.Height = frameBack.Height - Application.GetRealHeight(164 - 11);
- listView.Radius = frameBack.Radius;
+ listView.Radius = (uint)Application.GetRealHeight(17);
frameBack.AddChidren(listView);
//璇烽�夋嫨鍖哄彿
@@ -300,7 +300,7 @@
//妗屽竷鎺т欢
this.Width = Application.GetRealWidth(458);
this.Height = Application.GetRealHeight(104);
- this.Radius = 6;
+ this.Radius = (uint)Application.GetRealHeight(17);
this.BorderColor = 0xffbfc1c2;
this.BorderWidth = (uint)Application.GetMinRealAverage(3);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
index 18859f5..6cc2460 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
@@ -103,6 +103,8 @@
//鏍囬
var txttitle = new TopLayoutTitleControl();
topFrameLayout.AddChidren(txttitle);
+ //绮椾綋
+ txttitle.IsBold = true;
topFrameLayout.AddTag("txtTitle", txttitle);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomMenuSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomMenuSelectForm.cs
index 1a9f925..71f8de2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomMenuSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomMenuSelectForm.cs
@@ -59,7 +59,7 @@
//鑿滃崟鐨勬甯冩帶浠�
this.frameMenuTable = new FrameLayout();
frameMenuTable.Gravity = Gravity.CenterHorizontal;
- frameMenuTable.Radius = 12;
+ frameMenuTable.Radius = (uint)Application.GetRealHeight(35);
frameMenuTable.Width = Application.GetRealWidth(1034);
frameMenuTable.Height = this.menuHeight * menuCount;
frameMenuTable.BackgroundColor = UserCenterColor.Current.White;
@@ -69,7 +69,7 @@
var frameCancel = new FrameLayout();
frameCancel.Y = frameAnimateTable.Height - this.menuHeight - Application.GetRealHeight(23);
frameCancel.Gravity = Gravity.CenterHorizontal;
- frameCancel.Radius = 12;
+ frameCancel.Radius = (uint)Application.GetRealHeight(35);
frameCancel.Width = Application.GetRealWidth(1034);
frameCancel.Height = this.menuHeight;
frameCancel.BackgroundColor = UserCenterColor.Current.White;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/NumberPswInputDialogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/NumberPswInputDialogForm.cs
index c140919..66e2d4c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/NumberPswInputDialogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/NumberPswInputDialogForm.cs
@@ -48,7 +48,7 @@
frameBack.Width = Application.GetRealWidth(965);
frameBack.Height = Application.GetRealHeight(1584);
frameBack.BackgroundColor = UserCenterColor.Current.White;
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//瀵嗙爜杈撳叆鎺т欢
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs
index e002904..f7d274e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs
@@ -43,7 +43,7 @@
frameBack.Width = Application.GetRealWidth(965);
frameBack.Height = Application.GetRealHeight(1486);
frameBack.BackgroundColor = UserCenterColor.Current.White;
- frameBack.Radius = 8;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//鎵嬪娍楠岃瘉鎺т欢
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
index e626f06..f04784f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
@@ -43,7 +43,7 @@
frameBack.Width = Application.GetRealWidth(965);
frameBack.Height = Application.GetRealHeight(1711);
frameBack.BackgroundColor = UserCenterColor.Current.White;
- frameBack.Radius = 8;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//瀵嗙爜杈撳叆鎺т欢
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index 4c0144d..cafdac5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -639,12 +639,15 @@
return false;
}
- if (listFile.Contains(DirNameResourse.ShowOptionMenuFile) == true)
+ //妫�娴�
+ string checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.ShowOptionMenuFile + UserCenterResourse.UserInfo.Account);
+ if (listFile.Contains(checkKeys) == true)
{
//鏄剧ず涓婚〉闅愯棌鑿滃崟(Debug鐢�)
UserCenterResourse.HideOption.CenterHideMenu = 1;
}
- if (listFile.Contains(DirNameResourse.DetailedLogFile) == true)
+ checkKeys = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, DirNameResourse.DetailedLogFile + UserCenterResourse.UserInfo.Account);
+ if (listFile.Contains(checkKeys) == true)
{
//鍑哄姏璇︾粏Log(Debug鐢�)
UserCenterResourse.HideOption.DetailedLog = 1;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
index c2f7d13..9e23559 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
@@ -223,7 +223,7 @@
foreach (var data in result.delDeviceBindResponseData.RemoveBindList)
{
//0:鎴愬姛 1:璁惧涓嶅湪缁戝畾鍒楄〃涓� 锛屼篃鍙互浠ｈ〃鎴愬姛
- if (data.Result == 0 || data.Result == 1)
+ if (data.Result == 0 || data.Result == 1 || data.Result == 5)
{
return true;
}
@@ -235,8 +235,8 @@
this.ShowErrorMsg(msg);
return false;
}
- //4锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
- else if (data.Result == 4)
+ //2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
+ else if (data.Result == 2)
{
if (result.removeBindResultResponseData == null)
{
@@ -329,8 +329,8 @@
msg += Language.StringByID(R.MyInternationalizationString.uOtherBindTargetsIsDelettingPleaseWait);
this.ShowErrorMsg(msg);
}
- //4锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
- else if (data.Result == 4)
+ //2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
+ else if (data.Result == 2)
{
if (result.removeBindResultResponseData == null)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
index e07d3bc..dee93fc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
@@ -58,29 +58,29 @@
}
//淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅
- bool result = this.SaveNVFile(realGateway);
- if (result == false)
- {
- //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
- await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
- return;
- }
+ //bool result = this.SaveNVFile(realGateway);
+ //if (result == false)
+ //{
+ // //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
+ // await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
+ // //鍏抽棴杩涘害鏉�
+ // ProgressFormBar.Current.Close();
+ // return;
+ //}
//鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
- result = this.OpenZbMsComSend(realGateway);
- if (result == false)
- {
- //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
- await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
- return;
- }
+ //result = this.OpenZbMsComSend(realGateway);
+ //if (result == false)
+ //{
+ // //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
+ // await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
+ // //鍏抽棴杩涘害鏉�
+ // ProgressFormBar.Current.Close();
+ // return;
+ //}
//寮�濮嬩笂浼犳暟鎹�
- result = this.StartUpLoadData(realGateway, backupClassId);
+ bool result = this.StartUpLoadData(realGateway, backupClassId);
if (result == false)
{
//濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
@@ -342,23 +342,23 @@
return false;
}
- //鎭㈠鍗忚皟鍣╪v鍒嗗尯鐨勭粍缃戜俊鎭�
- result = this.RestoreGatewayNV(realGateway);
- if (result == false)
- {
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
- return false;
- }
+ ////鎭㈠鍗忚皟鍣╪v鍒嗗尯鐨勭粍缃戜俊鎭�
+ //result = this.RestoreGatewayNV(realGateway);
+ //if (result == false)
+ //{
+ // //鍏抽棴杩涘害鏉�
+ // ProgressFormBar.Current.Close();
+ // return false;
+ //}
//鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
- result = this.OpenZbMsComSend(realGateway);
- if (result == false)
- {
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
- return false;
- }
+ //result = this.OpenZbMsComSend(realGateway);
+ //if (result == false)
+ //{
+ // //鍏抽棴杩涘害鏉�
+ // ProgressFormBar.Current.Close();
+ // return false;
+ //}
//閲嶅惎缃戝叧绯荤粺
result = this.GatewayReboot(realGateway);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 5a8c34a..0993102 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -693,15 +693,15 @@
bool result = await this.SetHomeIdToGateway(realWay, string.Empty);
if (result == false)
{
- //缃戝叧瑙ｇ粦澶辫触
+ //缃戝叧瑙ｇ粦澶辫触 涓嶇悊瀹�,鍥犱负缃戝叧鍙互鎸夋寜閿己鍒舵悳绱㈠緱鍒�
string msg = Language.StringByID(R.MyInternationalizationString.uGatewayUnBindFail);
- this.ShowErrorMsg(msg);
- return false;
+ //this.ShowErrorMsg(msg);
+ //return false;
}
}
//鍒犻櫎浜戠鐨勭綉鍏�
- await Phone.UserCenter.HdlGatewayLogic.Current.DeleteDataBaseGateway(zbGatewayID);
+ await this.DeleteDataBaseGateway(zbGatewayID);
//鍒犻櫎缃戝叧鏂囦欢
this.DeleteGatewayFile(zbGatewayID);
@@ -2245,7 +2245,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord" };
+ List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotSetAgain" };
bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);
if (result == false)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
index bccf1e7..f1b5642 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
@@ -101,7 +101,7 @@
{
fileName += "Log";
}
- fileName = UserCenterLogic.EncryptPassword("4^Olh_3f", fileName);
+ fileName = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, fileName);
return fileName;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
old mode 100755
new mode 100644
index 046b3fa..d34f704
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -54,9 +54,14 @@
public string SSID
{
get
- {
+ {
#if iOS
- return string.Empty;
+ string ssiD = Shared.WiimuUPnP.SSID;
+ if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))
+ {
+ ssiD = ssiD.Substring(1, ssiD.Length - 2);
+ }
+ return ssiD;
#endif
#if Android
string ssiD = null;
@@ -278,10 +283,10 @@
{
if (hdlWiFi == null)
{
- Com.Mediatek.Elian.ElianNative.LoadLib();
+ var result2 = Com.Mediatek.Elian.ElianNative.LoadLib();
//鍒濆鍖朩i-Fi閰嶇綉
this.hdlWiFi = new Com.Mediatek.Elian.ElianNative();
- var value = hdlWiFi.InitSmartConnection(null, 1, 0);
+ var value = hdlWiFi.InitSmartConnection(null, 1, 1);
}
//寮�濮媁i-Fi閰嶇綉
var result = hdlWiFi.StartSmartConnection(wifiName, wifiPsw, p2);
@@ -297,6 +302,7 @@
{
//鍋滄Wi-Fi閰嶇綉
var result = hdlWiFi.StopSmartConnection();
+ hdlWiFi = null;
}
}
#endif
@@ -308,10 +314,10 @@
/// <param name="wifiPsw">wifi瀵嗙爜</param>
/// <param name="p2">鎴戜篃涓嶇煡閬撹繖涓槸浠�涔堜笢瑗�</param>
/// <returns></returns>
- public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "1")
+ public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "")
{
//鍒濆鍖朩i-Fi杩炴帴
- Com.Mediatek.Elian.ElianNative.InitSmartConnection(null, 1, 1);
+ Com.Mediatek.Elian.ElianNative.InitSmartConnection("1", 1, 1);
//寮�濮媁i-Fi杩炴帴
var result = Com.Mediatek.Elian.ElianNative.StartSmartConnection(wifiName, wifiPsw, p2);
return true;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index ebed985..41f14f5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -1231,24 +1231,28 @@
/// <returns></returns>
public static string EncryptPassword(string keys, string strPsw)
{
- if (strPsw == string.Empty)
+ try
{
- return strPsw;
+ if (strPsw == string.Empty)
+ {
+ return strPsw;
+ }
+ var des = new System.Security.Cryptography.DESCryptoServiceProvider();
+ byte[] inputByteArray = Encoding.Default.GetBytes(strPsw);
+ des.Key = ASCIIEncoding.ASCII.GetBytes(keys);
+ des.IV = ASCIIEncoding.ASCII.GetBytes(keys);
+ var ms = new System.IO.MemoryStream();
+ var cs = new System.Security.Cryptography.CryptoStream(ms, des.CreateEncryptor(), System.Security.Cryptography.CryptoStreamMode.Write);
+ cs.Write(inputByteArray, 0, inputByteArray.Length);
+ cs.FlushFinalBlock();
+ StringBuilder ret = new StringBuilder();
+ foreach (byte b in ms.ToArray())
+ {
+ ret.AppendFormat("{0:X2}", b);
+ }
+ return ret.ToString().ToLower();
}
- var des = new System.Security.Cryptography.DESCryptoServiceProvider();
- byte[] inputByteArray = Encoding.Default.GetBytes(strPsw);
- des.Key = ASCIIEncoding.ASCII.GetBytes(keys);
- des.IV = ASCIIEncoding.ASCII.GetBytes(keys);
- var ms = new System.IO.MemoryStream();
- var cs = new System.Security.Cryptography.CryptoStream(ms, des.CreateEncryptor(), System.Security.Cryptography.CryptoStreamMode.Write);
- cs.Write(inputByteArray, 0, inputByteArray.Length);
- cs.FlushFinalBlock();
- StringBuilder ret = new StringBuilder();
- foreach (byte b in ms.ToArray())
- {
- ret.AppendFormat("{0:X2}", b);
- }
- return ret.ToString();
+ catch { return strPsw; }
}
/// <summary>
@@ -1258,29 +1262,33 @@
/// <returns></returns>
public static string DecryptPassword(string keys, string strPsw)
{
- if (strPsw == string.Empty)
+ try
{
- return strPsw;
+ if (strPsw == string.Empty)
+ {
+ return strPsw;
+ }
+ var des = new System.Security.Cryptography.DESCryptoServiceProvider();
+
+ byte[] inputByteArray = new byte[strPsw.Length / 2];
+ for (int x = 0; x < strPsw.Length / 2; x++)
+ {
+ int i = (Convert.ToInt32(strPsw.Substring(x * 2, 2), 16));
+ inputByteArray[x] = (byte)i;
+ }
+
+ des.Key = ASCIIEncoding.ASCII.GetBytes(keys);
+ des.IV = ASCIIEncoding.ASCII.GetBytes(keys);
+ var ms = new System.IO.MemoryStream();
+ var cs = new System.Security.Cryptography.CryptoStream(ms, des.CreateDecryptor(), System.Security.Cryptography.CryptoStreamMode.Write);
+ cs.Write(inputByteArray, 0, inputByteArray.Length);
+ cs.FlushFinalBlock();
+
+ StringBuilder ret = new StringBuilder();
+
+ return System.Text.Encoding.Default.GetString(ms.ToArray());
}
- var des = new System.Security.Cryptography.DESCryptoServiceProvider();
-
- byte[] inputByteArray = new byte[strPsw.Length / 2];
- for (int x = 0; x < strPsw.Length / 2; x++)
- {
- int i = (Convert.ToInt32(strPsw.Substring(x * 2, 2), 16));
- inputByteArray[x] = (byte)i;
- }
-
- des.Key = ASCIIEncoding.ASCII.GetBytes(keys);
- des.IV = ASCIIEncoding.ASCII.GetBytes(keys);
- var ms = new System.IO.MemoryStream();
- var cs = new System.Security.Cryptography.CryptoStream(ms, des.CreateDecryptor(), System.Security.Cryptography.CryptoStreamMode.Write);
- cs.Write(inputByteArray, 0, inputByteArray.Length);
- cs.FlushFinalBlock();
-
- StringBuilder ret = new StringBuilder();
-
- return System.Text.Encoding.Default.GetString(ms.ToArray());
+ catch { return strPsw; }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
index f507655..9ef0dc2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
@@ -122,11 +122,11 @@
/// <summary>
/// 鏄剧ず鍔熻兘鑿滃崟鐨勩�愭爣璇嗘枃浠躲��
/// </summary>
- public const string ShowOptionMenuFile = "eaf5efcca1be2f4cb0ff3dea79df755f5886beb3bf7aed1b";
+ public const string ShowOptionMenuFile = "ShowOptionMenuFile";
/// <summary>
/// 璇︾粏Log澶勭悊鐨勩�愭爣璇嗘枃浠躲��
/// </summary>
- public const string DetailedLogFile = "ceec8cfdbe5e8112755cba32c1b081f9";
+ public const string DetailedLogFile = "DetailedLogFile";
/// <summary>
/// 鍔熻兘澶囦唤鐨勫悕瀛� 杩欎釜涓滆タ涓嶅姞瀵�
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
index 7b2a875..064fea3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
@@ -39,5 +39,9 @@
/// 闅愬尶閰嶇疆
/// </summary>
public static HideOptionInfo HideOption = new HideOptionInfo();
+ /// <summary>
+ /// 鏂囦欢鍔犲瘑绉橀挜
+ /// </summary>
+ public const string FileEncryptKey = "4^Olh_3f";
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
index c168dc1..afe6c49 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
@@ -51,7 +51,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Y = Application.GetRealHeight(683);
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//杩涘害鏄剧ず鏂囨湰
@@ -74,7 +74,6 @@
var btnProgressBar = new FrameLayout();
btnProgressBar.Width = 0;
btnProgressBar.Height = btnProRow.Height;
- btnProgressBar.Radius = btnProRow.Radius;
btnProgressBar.BackgroundColor = 0xfffb744a;
btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;
btnProRow.AddChidren(btnProgressBar);
@@ -89,7 +88,7 @@
var btnProgressPic = new PicViewControl(84, 60);
btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";
frameProgress.AddChidren(btnProgressPic);
- var btnProgressView = new NormalViewControl(84, 32, true);
+ var btnProgressView = new NormalViewControl(84, 45, true);
btnProgressView.TextSize = 10;
btnProgressView.TextAlignment = TextAlignment.Center;
btnProgressView.Text = "0%";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index f9561e4..ce2046e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -118,7 +118,6 @@
this.btnProgressBar = new FrameLayout();
btnProgressBar.Width = 0;
btnProgressBar.Height = btnProRow.Height;
- btnProgressBar.Radius = btnProRow.Radius;
btnProgressBar.BackgroundColor = 0xfffb744a;
btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;
btnProRow.AddChidren(btnProgressBar);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
index 996b9ef..d60f161 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
@@ -306,7 +306,7 @@
private NormalViewControl InitUserSelectButton(bool select)
{
var btnContr = new NormalViewControl(207, 63, true);
- btnContr.Radius = 6;
+ btnContr.RadiusEx = 17;
btnContr.TextAlignment = TextAlignment.Center;
if (select == false)
{
@@ -367,7 +367,7 @@
private NormalViewControl InitLockSelectButton(bool select)
{
var btnContr = new NormalViewControl(207, 63, true);
- btnContr.Radius = 6;
+ btnContr.RadiusEx = 17;
btnContr.TextAlignment = TextAlignment.Center;
if (select == false)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index bdacca4..a7e1804 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -513,13 +513,14 @@
}
//鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
- this.CloseProgressBar();
if (result == false)
{
+ this.CloseProgressBar();
return;
}
//璁剧疆鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅
result = await HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
+ this.CloseProgressBar();
if (result == false)
{
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
index 4745c8f..b67b23e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
@@ -374,7 +374,7 @@
var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
btnIcon.Name = "btn" + device.DeviceEpoint;
btnIcon.Gravity = Gravity.Center;
- btnIcon.Radius = 6;
+ btnIcon.RadiusEx = 16;
btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
index 4ccf131..dadd52b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
@@ -181,7 +181,7 @@
var btnIcon = new IconViewControl(60);
btnIcon.Gravity = Gravity.Center;
- btnIcon.Radius = (uint)btnIcon.IconSize;
+ btnIcon.Radius = (uint)btnIcon.IconSize / 2;
btnFrame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
if (dataColor != null)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
index d10b69d..6ae3938 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs
@@ -433,7 +433,7 @@
var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
btnIcon.Name = "btn" + device.DeviceEpoint;
btnIcon.Gravity = Gravity.Center;
- btnIcon.Radius = 6;
+ btnIcon.RadiusEx = 16;
btnIcon.BorderWidth = 2;
btnIcon.BorderColor = 0xff979797;
frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
index e7de8fc..27c3faf 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
@@ -66,10 +66,6 @@
var frameBack = new FrameLayout();
frameBack.Height = Application.GetRealHeight(204);
bodyFrameLayout.AddChidren(frameBack);
- var scrolContr = new HorizontalScrolViewLayout();
- scrolContr.Gravity = Gravity.CenterVertical;
- scrolContr.Height = frameBack.Height;
- frameBack.AddChidren(scrolContr);
//妗屽竷鎺т欢
this.frameTable = new FrameLayout();
@@ -77,12 +73,44 @@
frameTable.Height = bodyFrameLayout.Height - frameBack.Height;
bodyFrameLayout.AddChidren(frameTable);
+ //鍏朵粬
+ var tempRoom = new Common.Room();
+ tempRoom.Name = Language.StringByID(R.MyInternationalizationString.uOther);
+ foreach (var mainKeys in this.listEsixtDevice)
+ {
+ var device = Common.LocalDevice.Current.GetDevice(mainKeys);
+ if (device == null)
+ {
+ continue;
+ }
+ //杩欎釜鎵嬫満寮勫紕,閭ｄ釜鎵嬫満寮勫紕鐨勬儏鍐典笅,
+ //閲囩敤鍚庡鎿嶄綔 -> 鏂板缓涓�涓复鏃舵埧闂村璞″嚭鏉�
+ if (Common.Room.CurrentRoom.GetRoomByDevice(device) == null)
+ {
+ tempRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(device));
+ }
+ }
+
HdlThreadLogic.Current.RunMainInThread(() =>
{
if (dicRoom.ContainsKey(nowSelectFloorId) == true && dicRoom[nowSelectFloorId].Count > 0)
{
//鍒濆鍖栨埧闂存帶浠�
- this.InitRoomControl(scrolContr, dicRoom[nowSelectFloorId]);
+ var listRoom = new List<Common.Room>();
+ listRoom.AddRange(dicRoom[nowSelectFloorId]);
+ if (tempRoom.DeviceUIList.Count > 0)
+ {
+ //鏄剧ず鏂板缓鐨勪复鏃舵埧闂村璞�
+ listRoom.Add(tempRoom);
+ }
+ var roomContr = new RoomDeviceGroupMenuControl(listRoom);
+ frameBack.AddChidren(roomContr);
+ roomContr.SelectRoomEvent += (myRoom) =>
+ {
+ //鍒濆鍖栬澶囪
+ this.InitDeviceControl(myRoom);
+ };
+ roomContr.InitControl();
//纭畾鎸夐挳
var btnOk = new BottomClickButton();
@@ -139,6 +167,17 @@
{
return;
}
+ int indexTemp = 1;
+ foreach (var floorId in dicRoom.Keys)
+ {
+ if (dicFloor.ContainsKey(floorId) == false)
+ {
+ //杩欐槸澶氬彴鎵嬫満鐬庢悶涔嬪悗鍑虹幇鐨勫悗澶囪ˉ鏁戞帾鏂�
+ dicFloor[floorId] = Language.StringByID(R.MyInternationalizationString.uOther) + indexTemp;
+ indexTemp++;
+ }
+ }
+
var btnIconContr = new MostRightIconControl(69, 69);
btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";
topFrameLayout.AddChidren(btnIconContr);
@@ -175,88 +214,6 @@
}
};
}
- #endregion
-
- #region 鈻� 鍒濆鍖栨埧闂存帶浠禵____________________
-
- /// <summary>
- /// 鍒濆鍖栨埧闂存帶浠�
- /// </summary>
- /// <param name="scrolContr">瀹瑰櫒</param>
- /// <param name="listRoom">鎴块棿鍒楄〃</param>
- private void InitRoomControl(HorizontalScrolViewLayout scrolContr, List<Common.Room> listRoom)
- {
- string oldRoomId = listRoom[0].Id;
- FrameLayoutControl oldFrameBack = null;
- NormalViewControl oldBtnText = null;
-
- //寮勪釜绌虹殑杩涘幓鍗犱綅缃�
- var frameTemp = new FrameLayout();
- frameTemp.Height = scrolContr.Height;
- frameTemp.Width = ControlCommonResourse.XXLeft / 2;
- scrolContr.AddChidren(frameTemp);
-
- for (int i = 0; i < listRoom.Count; i++)
- {
- var room = listRoom[i];
- //甯﹀浘鐗囩殑
- var frameBack = new FrameLayoutControl();
- frameBack.UseClickStatu = false;
- frameBack.Gravity = Gravity.Center;
- frameBack.Height = Application.GetRealHeight(159);
- frameBack.Width = Application.GetRealWidth(255);
- if (i == 0)
- {
- frameBack.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
- oldFrameBack = frameBack;
- }
- else
- {
- frameBack.BackgroundImagePath = "Item/RoomIconBackground.png";
- }
- scrolContr.AddChidren(frameBack);
- //鏂囧瓧
- var btnText = new NormalViewControl(frameBack.Width - (int)(frameBack.Height * 0.47), frameBack.Height, false);
- btnText.Gravity = Gravity.CenterHorizontal;
- btnText.Text = room.Name;
- btnText.TextSize = 12;
- btnText.TextAlignment = TextAlignment.Center;
- if (i == 0)
- {
- btnText.TextColor = UserCenterColor.Current.White;
- oldBtnText = btnText;
- }
- else
- {
- btnText.TextColor = UserCenterColor.Current.TextGrayColor1;
- }
- frameBack.AddChidren(btnText, ChidrenBindMode.BindEventOnly);
-
- frameBack.ButtonClickEvent += (sender, e) =>
- {
- if (oldRoomId == room.Id)
- {
- //鍚屼竴涓笢瑗�
- return;
- }
- oldRoomId = room.Id;
-
- //鐘舵�佸彉鏇�
- frameBack.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
- btnText.TextColor = UserCenterColor.Current.White;
-
- oldFrameBack.BackgroundImagePath = "Item/RoomIconBackground.png";
- oldBtnText.TextColor = UserCenterColor.Current.TextGrayColor1;
- oldFrameBack = frameBack;
- oldBtnText = btnText;
- //鍒濆鍖栬澶囪
- this.InitDeviceControl(room);
- };
- }
- //鍒濆鍖栬澶囪
- this.InitDeviceControl(listRoom[0]);
- }
-
#endregion
#region 鈻� 鍒濆鍖栬澶囨帶浠禵____________________
@@ -303,7 +260,7 @@
var btnIcon = rowDevice.AddLeftIcon(81);
Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
//璁惧鍚嶇О
- var btnName = rowDevice.AddLeftCaption(Common.LocalDevice.Current.GetDeviceEpointName(device), 600);
+ var btnName = rowDevice.AddLeftCaption(Common.LocalDevice.Current.GetDeviceEpointName(device), 700);
btnName.TextSize = 15;
//閫夋嫨
var btnSelect = rowDevice.AddMostRightEmptyIcon(58, 58);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
index 649569b..bd338ae 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs
@@ -71,89 +71,6 @@
form.AddForm();
});
};
- }
-
- /// <summary>
- /// 鑿滃崟鎺т欢
- /// </summary>
- private class SearchWirelessMenuControl : DialogCommonForm
- {
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
- {
- var frameBack1 = new FrameLayoutControl();
- frameBack1.UseClickStatu = false;
- frameBack1.Y = Application.GetRealHeight(1420);
- frameBack1.Gravity = Gravity.CenterHorizontal;
- frameBack1.Radius = 12;
- frameBack1.Width = Application.GetRealWidth(1034);
- frameBack1.Height = Application.GetRealHeight(300);
- frameBack1.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(frameBack1);
-
- //UDP妯″紡(鎺ㄨ崘)
- var btnUdp = new NormalViewControl(900, 156, true);
- btnUdp.Gravity = Gravity.CenterHorizontal;
- btnUdp.TextAlignment = TextAlignment.Center;
- btnUdp.TextColor = 0xff0075ff;
- btnUdp.TextSize = 17;
- btnUdp.TextID = R.MyInternationalizationString.uUdpModeRecommend;
- frameBack1.AddChidren(btnUdp, ChidrenBindMode.NotBind);
- btnUdp.ButtonClickEvent += (sender, e) =>
- {
- //鍏抽棴鐣岄潰
- this.CloseForm();
- var form = new WirelessUdpDirectionForm();
- form.AddForm();
- };
-
- //绾�
- var btnLine = new NormalViewControl(frameBack1.Width, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
- btnLine.Y = btnUdp.Bottom;
- frameBack1.AddChidren(btnLine, ChidrenBindMode.NotBind);
- //AP妯″紡
- var btnAp = new NormalViewControl(900, 144, true);
- btnAp.Y = btnLine.Bottom;
- btnAp.Gravity = Gravity.CenterHorizontal;
- btnAp.TextAlignment = TextAlignment.Center;
- btnAp.TextColor = 0xff0075ff;
- btnAp.TextSize = 17;
- btnAp.TextID = R.MyInternationalizationString.uApMode;
- frameBack1.AddChidren(btnAp, ChidrenBindMode.NotBind);
- btnAp.ButtonClickEvent += (sender, e) =>
- {
- //鍏抽棴鐣岄潰
- this.CloseForm();
- var form = new WirelessApDirection1Form();
- form.AddForm();
- };
-
- var frameBack2 = new FrameLayoutControl();
- frameBack2.UseClickStatu = false;
- frameBack2.Y = frameBack1.Bottom + Application.GetRealHeight(23);
- frameBack2.Gravity = Gravity.CenterHorizontal;
- frameBack2.Radius = 12;
- frameBack2.Width = Application.GetRealWidth(1034);
- frameBack2.Height = Application.GetRealHeight(156);
- frameBack2.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(frameBack2);
- //鍙栨秷
- var btnCancel = new NormalViewControl(900, 156, true);
- btnCancel.Gravity = Gravity.CenterHorizontal;
- btnCancel.TextAlignment = TextAlignment.Center;
- btnCancel.TextColor = 0xff0075ff;
- btnCancel.TextSize = 17;
- btnCancel.TextID = R.MyInternationalizationString.uCancel;
- frameBack2.AddChidren(btnCancel, ChidrenBindMode.NotBind);
- btnCancel.ButtonClickEvent += (sender, e) =>
- {
- //鍏抽棴鐣岄潰
- this.CloseForm();
- };
- }
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 9bd9829..7834807 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -160,6 +160,7 @@
frameback.BackgroundImagePath = "Item/BottomButtonGround.png";
bodyFrameLayout.AddChidren(frameback);
var btnReDo = new NormalViewControl(300, 65, true);
+ btnReDo.IsBold = true;
btnReDo.TextColor = UserCenterColor.Current.White;
btnReDo.TextSize = 16;
btnReDo.Y = Application.GetRealHeight(49);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index 2882324..54c02ef 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -154,6 +154,7 @@
frameback.BackgroundImagePath = "Item/BottomButtonGround.png";
bodyFrameLayout.AddChidren(frameback);
var btnReDo = new NormalViewControl(300, 65, true);
+ btnReDo.IsBold = true;
btnReDo.TextColor = UserCenterColor.Current.White;
btnReDo.TextSize = 16;
btnReDo.Y = Application.GetRealHeight(49);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
index 57c6554..cc5c2c2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
@@ -156,6 +156,7 @@
frameback.BackgroundImagePath = "Item/BottomButtonGround.png";
bodyFrameLayout.AddChidren(frameback);
var btnReDo = new NormalViewControl(300, 65, true);
+ btnReDo.IsBold = true;
btnReDo.TextColor = UserCenterColor.Current.White;
btnReDo.TextSize = 16;
btnReDo.Y = Application.GetRealHeight(49);
@@ -246,7 +247,7 @@
//璁℃椂鏃堕棿
int timeCount = 0;
//瓒呮椂鏃堕棿
- int timeOut = 120;
+ int timeOut = 240;
while (btnGwImage.Parent != null)
{
timeCount++;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index 9ec7cc9..fc956cb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -28,15 +28,17 @@
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
var ssid = HdlWifiLogic.Current.SSID;
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
if (ssid == null)
{
//鑾峰彇缃戠粶SSID澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uGetSsidFail);
- this.ShowMassage(ShowMsgType.Error, msg);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
return;
}
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
HdlThreadLogic.Current.RunMain(() =>
{
@@ -122,7 +124,7 @@
return;
}
//寮�濮媁i-Fi閰嶇綉
- HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "1");
+ HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "");
var form = new WirelessUdpSearchForm();
this.AddFromAndRemoveNowForm(form);
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs
index bdb8c08..be082e4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs
@@ -51,6 +51,7 @@
//娣诲姞鏅鸿兘缃戝叧鎴愬姛
var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(85), false);
+ btnMsg.IsBold = true;
btnMsg.Y = Application.GetRealHeight(732);
btnMsg.TextAlignment = TextAlignment.Center;
btnMsg.TextSize = 20;
@@ -67,6 +68,7 @@
frameAdd.BackgroundImagePath = "Item/BottomButtonGround.png";
bodyFrameLayout.AddChidren(frameAdd);
var btnAdd = new NormalViewControl(300, 65, true);
+ btnAdd.IsBold = true;
btnAdd.TextColor = UserCenterColor.Current.White;
btnAdd.TextSize = 16;
btnAdd.Y = Application.GetRealHeight(49);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
index 22baf6c..423d87f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
@@ -73,7 +73,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Y = Application.GetRealHeight(683);
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//杩涘害鏄剧ず鏂囨湰
@@ -96,7 +96,6 @@
var btnProgressBar = new FrameLayout();
btnProgressBar.Width = 0;
btnProgressBar.Height = btnProRow.Height;
- btnProgressBar.Radius = btnProRow.Radius;
btnProgressBar.BackgroundColor = 0xfffb744a;
btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;
btnProRow.AddChidren(btnProgressBar);
@@ -111,7 +110,7 @@
var btnProgressPic = new PicViewControl(84, 60);
btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png";
frameProgress.AddChidren(btnProgressPic);
- var btnProgressView = new NormalViewControl(84, 32, true);
+ var btnProgressView = new NormalViewControl(84, 45, true);
btnProgressView.TextSize = 10;
btnProgressView.TextAlignment = TextAlignment.Center;
btnProgressView.Text = "0%";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
index 9e7939d..266fc22 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
@@ -69,6 +69,7 @@
frameback.BackgroundImagePath = "Item/BottomButtonGround.png";
bodyFrameLayout.AddChidren(frameback);
var btnBackup = new NormalViewControl(400, 65, true);
+ btnBackup.IsBold = true;
btnBackup.TextColor = UserCenterColor.Current.White;
btnBackup.TextSize = 16;
btnBackup.Y = Application.GetRealHeight(49);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
index 0632ca3..721cc9c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
@@ -120,6 +120,11 @@
//鍙戦�佸畾浣嶅懡浠�
HdlGatewayLogic.Current.SetFixedPositionCommand(i_gateway);
};
+ gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new GatewayManage.GatewayInfoEditorForm();
+ form.AddForm(i_gateway);
+ };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index 0a985ae..37f8867 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -69,6 +69,7 @@
//鎴愬憳ID
var btnUserId = new NormalViewControl(800, 50, true);
+ btnUserId.IsBold = true;
btnUserId.Y = Application.GetRealHeight(472);
btnUserId.Gravity = Gravity.CenterHorizontal;
btnUserId.Text = memberResult.Account;
@@ -78,6 +79,7 @@
//鏄电О
var btnName = new NormalViewControl(800, 55, true);
+ btnName.IsBold = true;
btnName.Y = Application.GetRealHeight(541);
btnName.Gravity = Gravity.CenterHorizontal;
btnName.TextAlignment = TextAlignment.Center;
@@ -93,6 +95,7 @@
strMsg = string.Format(strMsg, "\r\n");
}
var btnmsg = new NormalViewControl(800, 100, true);
+ btnmsg.IsBold = true;
btnmsg.Y = Application.GetRealHeight(913);
btnmsg.TextSize = 12;
btnmsg.Text = strMsg;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
index aee74d5..35b2fb0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
@@ -52,7 +52,7 @@
frame.Height = Application.GetRealHeight(1097);
frame.BackgroundColor = UserCenterColor.Current.White;
frame.Gravity = Gravity.Center;
- frame.Radius = 6;
+ frame.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frame);
//鐢ㄦ埛鍥炬爣
@@ -60,6 +60,7 @@
var btnUserIcon = new ImageView();
btnUserIcon.Height = Application.GetMinRealAverage(207);
btnUserIcon.Width = Application.GetMinRealAverage(207);
+ btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
btnUserIcon.Y = Application.GetRealHeight(104);
btnUserIcon.Gravity = Gravity.CenterHorizontal;
if (System.IO.File.Exists(iconPath) == true)
@@ -74,6 +75,7 @@
//鏄电О
var btnName = new NormalViewControl(frame.Width, Application.GetRealHeight(55), false);
+ btnName.IsBold = true;
btnName.TextAlignment = TextAlignment.Center;
btnName.Y = Application.GetRealHeight(334);
btnName.TextColor = UserCenterColor.Current.TextColor2;
@@ -96,6 +98,7 @@
//瀹舵棌鎴愬憳娣诲姞鎴愬姛
var btnSuccess = new NormalViewControl(frame.Width, Application.GetRealHeight(82), false);
+ btnSuccess.IsBold = true;
btnSuccess.Y = Application.GetRealHeight(547);
btnSuccess.TextAlignment = TextAlignment.Center;
btnSuccess.TextID = R.MyInternationalizationString.uAddMemberSuccess;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
index b26c46e..5de6cb0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
@@ -43,18 +43,30 @@
frame.Height = Application.GetRealHeight(1097);
frame.BackgroundColor = UserCenterColor.Current.White;
frame.Gravity = Gravity.Center;
- frame.Radius = 6;
+ frame.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frame);
//鐢ㄦ埛鍥炬爣
- var btnUserIcon = new PicViewControl(207, 207);
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfo.DistributedMark + ".png");
+ var btnUserIcon = new ImageView();
+ btnUserIcon.Height = Application.GetMinRealAverage(207);
+ btnUserIcon.Width = Application.GetMinRealAverage(207);
+ btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
btnUserIcon.Y = Application.GetRealHeight(104);
btnUserIcon.Gravity = Gravity.CenterHorizontal;
- btnUserIcon.UnSelectedImagePath = "Center/Admin.png";
+ if (System.IO.File.Exists(iconPath) == true)
+ {
+ btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);
+ }
+ else
+ {
+ btnUserIcon.ImagePath = "Center/Admin.png";
+ }
frame.AddChidren(btnUserIcon);
//鏄电О
var btnName = new NormalViewControl(frame.Width, Application.GetRealHeight(55), false);
+ btnName.IsBold = true;
btnName.TextAlignment = TextAlignment.Center;
btnName.Y = Application.GetRealHeight(334);
btnName.TextColor = UserCenterColor.Current.TextColor2;
@@ -84,6 +96,7 @@
var btnMsg = new NormalViewControl(frame.Width, Application.GetRealHeight(81), false);
+ btnMsg.IsBold = true;
if (memberInfo.AccountType == 1)
{
//鎺堟潈鎴愬姛!
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
index 5b796b4..6499963 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
@@ -102,6 +102,7 @@
btnErrorMsg.TextAlignment = TextAlignment.Center;
btnErrorMsg.TextColor = 0xfff75858;
btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
+ btnErrorMsg.IsBold = true;
bodyFrameLayout.AddChidren(btnErrorMsg);
btnErrorMsg.Visible = false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
index c45e6c8..b3cbe45 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
@@ -119,6 +119,7 @@
btnErrorMsg.Y = Application.GetRealHeight(677);
btnErrorMsg.TextAlignment = TextAlignment.Center;
btnErrorMsg.TextColor = 0xfff75858;
+ btnErrorMsg.IsBold = true;
btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
bodyFrameLayout.AddChidren(btnErrorMsg);
btnErrorMsg.Visible = false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
index 70b6f2e..9b68f32 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
@@ -95,6 +95,7 @@
btnErrorMsg.TextAlignment = TextAlignment.Center;
btnErrorMsg.TextColor = 0xfff75858;
btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
+ btnErrorMsg.IsBold = true;
bodyFrameLayout.AddChidren(btnErrorMsg);
btnErrorMsg.Visible = false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
index 91b2726..6986653 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
@@ -108,6 +108,7 @@
btnErrorMsg.TextAlignment = TextAlignment.Center;
btnErrorMsg.TextColor = 0xfff75858;
btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
+ btnErrorMsg.IsBold = true;
bodyFrameLayout.AddChidren(btnErrorMsg);
btnErrorMsg.Visible = false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
index d1bbf78..af5834a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
@@ -130,6 +130,7 @@
msgControl.Y = Application.GetRealHeight(582);
msgControl.TextAlignment = TextAlignment.Center;
msgControl.TextColor = 0xfff75858;
+ msgControl.IsBold = true;
bodyFrameLayout.AddChidren(msgControl);
//纭淇敼
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs
index a093a28..84eab2b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs
@@ -81,7 +81,7 @@
var btnCode = new NormalViewControl(302, 127, true);
btnCode.X = rowPhone.Right + Application.GetRealWidth(35);
btnCode.Y = Application.GetRealHeight(23);
- btnCode.Radius = 4;
+ btnCode.RadiusEx = 12;
btnCode.TextID = R.MyInternationalizationString.uGetVerificationCode;
btnCode.TextColor = UserCenterColor.Current.White;
btnCode.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
index 8cb52a4..535ad29 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
@@ -81,7 +81,7 @@
var btnCode = new NormalViewControl(302, 127, true);
btnCode.X = rowPhone.Right + Application.GetRealWidth(35);
btnCode.Y = Application.GetRealHeight(23);
- btnCode.Radius = 4;
+ btnCode.RadiusEx = 12;
btnCode.TextID = R.MyInternationalizationString.uGetVerificationCode;
btnCode.TextColor = UserCenterColor.Current.White;
btnCode.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 63086d9..db1f012 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -60,11 +60,11 @@
framePic.Width = Application.GetMinRealAverage(887);
framePic.Height = Application.GetMinRealAverage(444);
framePic.Gravity = Gravity.CenterHorizontal;
- framePic.Radius = 8;
+ framePic.Radius = (uint)Application.GetRealHeight(17);
framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
bodyFrameLayout.AddChidren(framePic);
var btnPic = new ImageView();
- btnPic.Radius = 8;
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.ImagePath = "RoomIcon/0.JPG";
framePic.AddChidren(btnPic);
btnPic.MouseUpEventHandler += (sender, e) =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index d1e2ed5..fe32bb6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -65,11 +65,11 @@
framePic.Width = Application.GetMinRealAverage(887);
framePic.Height = Application.GetMinRealAverage(444);
framePic.Gravity = Gravity.CenterHorizontal;
- framePic.Radius = 8;
+ framePic.Radius = (uint)Application.GetRealHeight(17);
framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
bodyFrameLayout.AddChidren(framePic);
var btnPic = new ImageView();
- btnPic.Radius = 8;
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
framePic.AddChidren(btnPic);
if (this.editorRoom.BackgroundImageType == 0)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index 299fbba..20a5eea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -17,10 +17,6 @@
/// </summary>
private Common.Room lookRoom = null;
/// <summary>
- /// 褰撳墠閫夋嫨鐨勫垎鏀紝1锛氬満鏅� 2锛氬姛鑳�
- /// </summary>
- private int nowSelectIndex = 1;
- /// <summary>
/// 妗屽竷鎺т欢
/// </summary>
private FrameLayout frameTable = null;
@@ -52,17 +48,14 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- //鍒濆鍖栧垎鏀帶浠�
- this.InitSwitchControl();
-
//鍒濆鍖栨甯冩帶浠�
this.frameTable = new FrameLayout();
frameTable.Y = Application.GetRealHeight(187);
frameTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);
bodyFrameLayout.AddChidren(frameTable);
- //鏄剧ず鍦烘櫙鍒楄〃
- this.ShowSceneList();
+ //鍒濆鍖栧垎鏀帶浠�
+ this.InitSwitchControl();
}
/// <summary>
@@ -70,93 +63,23 @@
/// </summary>
private void InitSwitchControl()
{
- var btnTemp = new NormalViewControl(10, 10, false);
- btnTemp.TextID = R.MyInternationalizationString.uScence;
-
- //鍦烘櫙妗�(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
- var frameScene = new FrameLayoutControl();
- frameScene.UseClickStatu = false;
- frameScene.Height = Application.GetRealHeight(90);
- frameScene.Width = btnTemp.GetRealWidthByText(16);
- frameScene.X = ControlCommonResourse.XXLeft;
- frameScene.Y = Application.GetRealHeight(40);
- bodyFrameLayout.AddChidren(frameScene);
- //鍦烘櫙
- var btnScene = new NormalViewControl(frameScene.Width, Application.GetRealHeight(63), false);
- btnScene.Text = btnTemp.Text;
- btnScene.TextSize = 16;
- btnScene.TextColor = UserCenterColor.Current.TextColor2;
- frameScene.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);
- //搴曠嚎
- var btnSceneLine = new NormalViewControl(40, 10, true);
- btnSceneLine.Y = btnScene.Bottom + Application.GetRealHeight(14);
- btnSceneLine.X = btnScene.X + btnScene.Width / 2 - Application.GetRealWidth(40) / 2;
- btnSceneLine.Radius = (uint)Application.GetRealHeight(10) / 2;
- btnSceneLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- frameScene.AddChidren(btnSceneLine, ChidrenBindMode.BindEventOnly);
-
- btnTemp.TextID = R.MyInternationalizationString.uFunction;
- //鍔熻兘妗�(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
- var frameFunc = new FrameLayoutControl();
- frameFunc.UseClickStatu = false;
- frameFunc.Height = Application.GetRealHeight(90);
- frameFunc.Width = btnTemp.GetRealWidthByText(16);
- frameFunc.X = frameScene.Right + Application.GetRealWidth(58);
- frameFunc.Y = Application.GetRealHeight(40);
- bodyFrameLayout.AddChidren(frameFunc);
- //鍔熻兘
- var btnFunc = new NormalViewControl(frameFunc.Width, Application.GetRealHeight(63), false);
- btnFunc.Text = btnTemp.Text;
- btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;
- frameFunc.AddChidren(btnFunc, ChidrenBindMode.BindEventOnly);
- //搴曠嚎
- var btnFuncLine = new NormalViewControl(40, 10, true);
- btnFuncLine.Y = btnFunc.Bottom + Application.GetRealHeight(14);
- btnFuncLine.X = btnFunc.X + btnFunc.Width / 2 - Application.GetRealWidth(40) / 2;
- btnFuncLine.Radius = (uint)Application.GetRealHeight(10) / 2;
- btnFuncLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- frameFunc.AddChidren(btnFuncLine, ChidrenBindMode.BindEventOnly);
- btnFuncLine.Visible = false;
-
- frameScene.ButtonClickEvent += (sender, e) =>
+ var tabControl = new SceneFunctionSwitchControl();
+ tabControl.Y = Application.GetRealHeight(40);
+ bodyFrameLayout.AddChidren(tabControl);
+ tabControl.SelectTabEvent += (tabIndex) =>
{
- //鍦烘櫙鍒嗘敮閫夋嫨
- if (this.nowSelectIndex == 1)
+ if (tabIndex == 1)
{
- return;
+ //鏄剧ず鍦烘櫙鍒楄〃
+ this.ShowSceneList();
}
- this.nowSelectIndex = 1;
-
- btnScene.TextSize = 16;
- btnScene.TextColor = UserCenterColor.Current.TextColor2;
- btnFunc.TextSize = 14;
- btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnSceneLine.Visible = true;
- btnFuncLine.Visible = false;
-
- //鏄剧ず鍦烘櫙鍒楄〃
- this.ShowSceneList();
- };
-
- frameFunc.ButtonClickEvent += (sender, e) =>
- {
- //鍔熻兘鍒嗘敮閫夋嫨
- if (this.nowSelectIndex == 2)
+ else
{
- return;
+ //鏄剧ず鍔熻兘鍒楄〃
+ this.ShowFunctionList();
}
- this.nowSelectIndex = 2;
-
- btnScene.TextSize = 14;
- btnScene.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnFunc.TextSize = 16;
- btnFunc.TextColor = UserCenterColor.Current.TextColor2;
- btnFuncLine.Visible = true;
- btnSceneLine.Visible = false;
-
- //鏄剧ず鍔熻兘鍒楄〃
- this.ShowFunctionList();
};
+ tabControl.InitControl();
}
#endregion
@@ -195,14 +118,14 @@
btnPic.Width = Application.GetRealWidth(844);
btnPic.Height = Application.GetRealHeight(420);
btnPic.ImagePath = data.IconPath;
- btnPic.Radius = 8;
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
frameContr.AddChidren(btnPic);
var btnName = new NormalViewControl(251, 282, true);
btnName.X = ControlCommonResourse.XXLeft;
btnName.Y = Application.GetRealHeight(58);
btnName.BackgroundColor = 0xff333333;
- btnName.Radius = 8;
+ btnName.RadiusEx = 17;
btnName.Text = data.Name;
btnName.TextSize = 15;
btnName.TextColor = UserCenterColor.Current.White;
@@ -240,7 +163,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Width = bodyFrameLayout.Width;
frameBack.Height = Application.GetRealHeight(1650);
- frameBack.Radius = 20;
+ frameBack.Radius = (uint)Application.GetRealHeight(58);
frameTable.AddChidren(frameBack);
var listView = new VerticalListControl(23);
@@ -392,9 +315,10 @@
{
HdlThreadLogic.Current.RunThread(() =>
{
+ var listCheck = new HashSet<string>();
for (int i = 0; i < listGwId.Count; i++)
{
- if (listView == null)
+ if (listView.Parent == null)
{
return;
}
@@ -403,14 +327,12 @@
var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>
{
string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (listView.Parent == null)
+ if (listView.Parent == null || dicData.ContainsKey(mainkeys) == false || listCheck.Contains(mainkeys) == true)
{
return;
}
- if (listView == null || dicData.ContainsKey(mainkeys) == false)
- {
- return;
- }
+ listCheck.Add(mainkeys);
+
var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
if (localDevice != null && localDevice.IsOnline != device.IsOnline)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 7524e31..160f090 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -365,15 +365,15 @@
listDeleteFile.Add(Common.Room.Lists[i].FileName);
}
}
- //鍒犻櫎鎴块棿
- foreach (string fileName in listDeleteFile)
- {
- Common.Room.CurrentRoom.Remove(fileName);
- }
//濡傛灉褰撳墠閫夋嫨鐨勬埧闂存槸鍒犻櫎瀵硅薄鐨勮瘽
if (Common.Room.CurrentRoom.FloorId == keys)
{
Common.Room.CurrentRoom = Common.Room.Lists[0];
+ }
+ //鍒犻櫎鎴块棿
+ foreach (string fileName in listDeleteFile)
+ {
+ Common.Room.CurrentRoom.Remove(fileName);
}
Common.Config.Instance.Home.Save();
//淇濆瓨椤哄簭
@@ -414,8 +414,15 @@
}
//璇疯緭鍏ユゼ灞傚悕绉�
dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInputFloorName));
- dialogForm.Text = floorName;
-
+ if (Common.Config.Instance.Home.FloorDics.ContainsKey(keys) == true)
+ {
+ dialogForm.Text = Common.Config.Instance.Home.FloorDics[keys];
+ floorName = Common.Config.Instance.Home.FloorDics[keys];
+ }
+ else
+ {
+ dialogForm.Text = floorName;
+ }
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += ((textValue) =>
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
index 4c293ab..3890e8f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
@@ -86,6 +86,7 @@
btnPassword.TextSize = 24;
btnPassword.TextColor = 0xfffc744b;
btnPassword.Text = i_password;
+ btnPassword.IsBold = true;
frameback.AddChidren(btnPassword);
//鍒濆鍖栧垪琛ㄦ帶浠�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
index 8e7bd5d..048ad79 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
@@ -97,6 +97,7 @@
//鍒濆鍖栥�愪俊鎭�氱煡銆戠殑琛�
var row4 = new FrameRowControl(listView.rowSpace / 2);
+ row4.UseClickStatu = false;
listView.AddChidren(row4);
row4.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uInformationPush), 500);
//寮�鍏冲浘鏍�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index 37253bc..99ce126 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
@@ -69,7 +69,7 @@
frameBack.Height = Application.GetRealHeight(1300);
frameBack.Y = Application.GetRealHeight(444);
frameBack.BackgroundColor = 0xa1ffffff;
- frameBack.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ frameBack.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
bodyFrameLayout.AddChidren(frameBack);
//妗屽竷鎺т欢
@@ -117,6 +117,7 @@
btnSensor.TextSize = 16;
btnSensor.TextAlignment = TextAlignment.Center;
btnSensor.TextColor = UserCenterColor.Current.TextColor2;
+ btnSensor.IsBold = true;
frameSensor.AddChidren(btnSensor, ChidrenBindMode.BindEventOnly);
//搴曠嚎
var btnSensorLine = new NormalViewControl(40, 10, true);
@@ -132,8 +133,10 @@
//瀛椾綋澶у皬鍜岄鑹插彉鏇�
btnSensor.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSensor.TextSize = 14;
+ btnSensor.IsBold = false;
btnLog.TextColor = UserCenterColor.Current.TextColor2;
btnLog.TextSize = 16;
+ btnLog.IsBold = true;
btnLogLine.Visible = true;
btnSensorLine.Visible = false;
@@ -150,8 +153,10 @@
//瀛椾綋澶у皬鍜岄鑹插彉鏇�
btnSensor.TextColor = UserCenterColor.Current.TextColor2;
btnSensor.TextSize = 16;
+ btnSensor.IsBold = true;
btnLog.TextColor = UserCenterColor.Current.TextGrayColor3;
btnLog.TextSize = 14;
+ btnLog.IsBold = false;
btnLogLine.Visible = false;
btnSensorLine.Visible = true;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
index ae87a7d..97b2df2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
@@ -207,14 +207,14 @@
btnPic.Width = Application.GetRealWidth(844);
btnPic.Height = Application.GetRealHeight(420);
btnPic.ImagePath = data.IconPath;
- btnPic.Radius = 8;
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
frameContr.AddChidren(btnPic, ChidrenBindMode.BindEventOnly);
var btnName = new NormalViewControl(251, 282, true);
btnName.X = ControlCommonResourse.XXLeft;
btnName.Y = Application.GetRealHeight(58);
btnName.BackgroundColor = 0xff333333;
- btnName.Radius = 8;
+ btnName.RadiusEx = 17;
btnName.Text = data.Name;
btnName.TextSize = 15;
btnName.TextColor = UserCenterColor.Current.White;
@@ -253,6 +253,8 @@
}
};
}
+ //璋冩暣涓�涓嬮珮搴�
+ listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(185));
});
}
@@ -285,7 +287,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Width = bodyFrameLayout.Width;
frameBack.Height = Application.GetRealHeight(1650);
- frameBack.Radius = 20;
+ frameBack.Radius = (uint)Application.GetRealHeight(58);
frameDeviceTable.AddChidren(frameBack);
var listView = new VerticalListControl(23);
@@ -382,6 +384,9 @@
}
};
}
+
+ //鍒楄〃鑷繁鏈変釜23鐨刌杞村潗鏍�
+ listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23), Application.GetRealHeight(300 - 23));
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index 0d30915..73b6939 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -190,14 +190,14 @@
btnPic.Width = Application.GetRealWidth(844);
btnPic.Height = Application.GetRealHeight(420);
btnPic.ImagePath = data.IconPath;
- btnPic.Radius = 8;
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
frameContr.AddChidren(btnPic);
var btnName = new NormalViewControl(251, 282, true);
btnName.X = ControlCommonResourse.XXLeft;
btnName.Y = Application.GetRealHeight(58);
btnName.BackgroundColor = 0xff333333;
- btnName.Radius = 8;
+ btnName.RadiusEx = 17;
btnName.Text = data.Name;
btnName.TextSize = 15;
btnName.TextColor = UserCenterColor.Current.White;
@@ -270,7 +270,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Width = bodyFrameLayout.Width;
frameBack.Height = Application.GetRealHeight(1650);
- frameBack.Radius = 20;
+ frameBack.Radius = (uint)Application.GetRealHeight(58);
frameDeviceTable.AddChidren(frameBack);
var listView = new VerticalListControl(23);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
index 0746732..ef86018 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
@@ -25,7 +25,7 @@
/// </summary>
private void InitMiddleFrame()
{
- uint roundHeigth = 6;
+ uint roundHeigth = (uint)Application.GetRealHeight(17);
//鑳屾櫙妗�
var frameBack = new FrameLayout();
@@ -73,6 +73,7 @@
frameBack.AddChidren(btnIcon);
//鐢ㄦ埛鍚�
var btnUser = new NormalViewControl(frameBack.Width, Application.GetRealHeight(46), false);
+ btnUser.IsBold = true;
btnUser.Y = Application.GetRealHeight(147);
btnUser.Text = UserCenterResourse.UserInfo.UserName;
btnUser.TextAlignment = TextAlignment.Center;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
index 4ee3637..df671d2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
@@ -8,6 +8,11 @@
/// </summary>
public class UserInformationForm : EditorCommonForm
{
+ /// <summary>
+ /// 涓儴妗屽竷鎺т欢
+ /// </summary>
+ private FrameLayout frameMiddleBack = null;
+
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
@@ -70,16 +75,23 @@
/// </summary>
private void InitMiddleBodyFrame()
{
- var frameBack = new FrameLayout();
- frameBack.Y = Application.GetRealHeight(363);
- frameBack.Height = Application.GetRealHeight(1008);
- frameBack.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(frameBack);
+ if (this.frameMiddleBack == null)
+ {
+ frameMiddleBack = new FrameLayout();
+ frameMiddleBack.Y = Application.GetRealHeight(363);
+ frameMiddleBack.Height = Application.GetRealHeight(1008);
+ frameMiddleBack.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameMiddleBack);
+ }
+ else
+ {
+ frameMiddleBack.RemoveAll();
+ }
var listMidFrame = new FrameListControl(12);
listMidFrame.Y = Application.GetRealHeight(11);
listMidFrame.Height = Application.GetRealHeight(1008 - 11);
- frameBack.AddChidren(listMidFrame);
+ frameMiddleBack.AddChidren(listMidFrame);
var rowName = new FrameRowControl(listMidFrame.rowSpace / 2);
//鍏抽棴鐐瑰嚮鐘舵��
@@ -134,6 +146,7 @@
rowEmail.AddRightArrow();
//閭
var btnEmail = rowEmail.AddMostRightView(UserCenterResourse.UserInfo.Email, 500);
+ btnEmail.IsBold = true;
if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Email) == true)
{
//鏈缃�,璇风粦瀹�
@@ -163,6 +176,7 @@
rowPhone.AddRightArrow();
//鎵嬫満鍙�
var btnPhone = rowPhone.AddMostRightView(UserCenterResourse.UserInfo.Phone, 500);
+ btnPhone.IsBold = true;
if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Phone) == true)
{
//鏈缃�,璇风粦瀹�
@@ -196,7 +210,8 @@
//娣诲姞鍚戝彸鍥炬爣
rowOther.AddRightArrow();
//寰俊銆丵Q
- rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChatAndQQ), 500);
+ var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChatAndQQ), 500);
+ btnQQ.IsBold = true;
rowOther.ButtonClickEvent += (sender, e) =>
{
var form = new OtherParty.OtherPartyAccountMenuForm();
@@ -212,7 +227,8 @@
//娣诲姞鍚戝彸鍥炬爣
rowSysPsw.AddRightArrow();
//鍘讳慨鏀�
- rowSysPsw.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGotoEditor), 350);
+ var btnPsw = rowSysPsw.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGotoEditor), 350);
+ btnPsw.IsBold = true;
rowSysPsw.ButtonClickEvent += (sender, e) =>
{
var form = new Password.EditorAccountPasswordForm();
@@ -226,7 +242,8 @@
//娣诲姞鍚戝彸鍥炬爣
rowSecond.AddRightArrow();
//瀵嗙爜銆佹墜鍔裤�佹寚绾�
- rowSecond.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uPasswordGestureFingerPrint), 400);
+ var btnSecand = rowSecond.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uPasswordGestureFingerPrint), 400);
+ btnSecand.IsBold = true;
rowSecond.ButtonClickEvent += (sender, e) =>
{
var form = new SecondAuthenticationForm();
@@ -404,8 +421,8 @@
/// </summary>
public override int FormActionAgainEvent()
{
- //閲嶆柊鍒锋柊鐣岄潰
- this.ShowForm();
+ //鍒濆鍖栦腑閮ㄧ殑淇℃伅
+ this.InitMiddleBodyFrame();
return 1;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index 008e1fd..b7f6ebb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -95,7 +95,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
frameBack.Y = Application.GetRealHeight(380);
frameBack.Gravity = Gravity.CenterHorizontal;
- frameBack.Radius = 12;
+ frameBack.Radius = (uint)Application.GetRealHeight(29);
frameBack.Width = bodyFrameLayout.Width - Application.GetRealWidth(29 * 2);
frameBack.Height = bodyFrameLayout.Height - Application.GetRealHeight(380) + Application.GetRealHeight(100);
bodyFrameLayout.AddChidren(frameBack);
@@ -147,6 +147,7 @@
//鐢ㄦ埛鏄电О
this.btnUserName = new NormalViewControl(605, 60, true);
+ btnUserName.IsBold = true;
btnUserName.X = btnUserIcon.Right + Application.GetRealWidth(5);
btnUserName.Y = Application.GetRealHeight(43);
if (UserCenterResourse.UserInfo != null)
@@ -190,7 +191,7 @@
frameMainMenuBack.Gravity = Gravity.CenterHorizontal;
frameMainMenuBack.Height = Application.GetRealHeight(371);
frameMainMenuBack.Width = frameWhite.Width - Application.GetRealWidth(29 * 2);
- frameMainMenuBack.Radius = 10;
+ frameMainMenuBack.Radius = (uint)Application.GetRealHeight(17);
frameMainMenuBack.BackgroundColor = UserCenterColor.Current.White;
frameWhite.AddChidren(frameMainMenuBack);
}
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 1be601f..7abd292 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -62,11 +62,11 @@
new System.Threading.Thread(async () =>
{
//鐧诲綍鎴愬姛
- var homes = await House.GetHomeLists();
+ var homes = await House.GetHomeLists();
+ //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+ await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
- //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
Room.InitAllRoom();
@@ -93,12 +93,11 @@
new System.Threading.Thread(async () =>
{
//鐧诲綍鎴愬姛
- var homes = await House.GetHomeLists();
+ var homes = await House.GetHomeLists();
+ //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
+ await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
-
- //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
Room.InitAllRoom();
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 3a4a75e..6e90761 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -426,7 +426,6 @@
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/Floor.png"
};
- topFrameLayout.AddChidren(floor);
floorBtn = new Button
{
@@ -438,7 +437,13 @@
TextColor = ZigbeeColor.Current.GXCTextColor,
Text = Config.Instance.Home.GetCurrentFloorName
};
- topFrameLayout.AddChidren(floorBtn);
+
+ if(Config.Instance.Home.FloorDics.Count>0)
+ {
+ topFrameLayout.AddChidren(floor);
+ topFrameLayout.AddChidren(floorBtn);
+ }
+
var messageBtn = new Button()
{
@@ -640,9 +645,9 @@
};
AddChidren(roomPageView);
//涓庡睆骞曡竟妗嗙殑杈硅窛
- roomPageView.RowPadding = Application.GetRealWidth(181);
+ roomPageView.TCBJ = Application.GetRealWidth(181);
//涓や釜page涔嬮棿鐨勯棿璺�
- roomPageView.PagePadding = Application.GetRealWidth(69);
+ roomPageView.JMBJ = Application.GetRealWidth(69);
//褰撳墠鎴块棿
//Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 68d4804..6f8fb12 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -495,7 +495,7 @@
var home = new UserHomeView { };
Instance.BodyView.AddChidren(home);
home.Show();
-
+
}
else if (sender == Instance.categoryIMG || sender==Instance.categoryName)
{
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index 3fd043a..31d21c8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -22,6 +22,10 @@
/// 鏂板彂鐜扮殑缃戝叧閫氱煡
/// </summary>
public static Action<ZigBee.Device.ZbGateway> NewGateWayAction;
+ /// <summary>
+ /// 涓婁竴娆＄殑浣忓畢ID
+ /// </summary>
+ private static string oldHomeID = string.Empty;
public static void Init()
{
@@ -35,7 +39,6 @@
{
var gateWayList = new List<ZbGateway> { };
var searchCount = 6;
- var oldHomeID = string.Empty;
var broadBytes = new byte[44];// byteHomeId[0] ,//H
broadBytes[0] = 0xfe;
broadBytes[1] = 0x29;
@@ -326,6 +329,14 @@
{ IsBackground = true }.Start();
}
+ /// <summary>
+ /// 閲嶆柊鎼滅储,娉ㄦ剰锛氳皟鐢ㄨ鏂规硶,鍒欎績浣垮叏閮ㄧ綉鍏崇殑mqtt鍏ㄩ儴鏂紑,鐒跺悗閲嶆柊鎼滅储(鍙兘浼氭湁1绉掑欢杩�)
+ /// </summary>
+ public static void ReSearch()
+ {
+ //涓轰簡閭ｄ箞澶氬皯涓囧垎涔嬩竴鐨勫嚑鐜�,杩欓噷璁剧疆鎴愬埆鐨勫彟涓�绫荤殑鍊�
+ oldHomeID = "**";
+ }
/// <summary>
/// 鎺ユ敹澶勭悊UDP鏁版嵁鍖�
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 2216ec9..1ae04c4 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -127,7 +127,7 @@
public List<string> HomeFilePathList = new List<string> { };
public string HomeId = string.Empty;
-
+
[Newtonsoft.Json.JsonIgnore]
private House m_Home = null;
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index ebed365..0def10a 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -637,7 +637,7 @@
/// 0锛氱Щ闄ゆ垚鍔燂紙璇ョ姸鎬佸彧閫傜敤鐢ㄤ簬璺ㄧ綉鍏崇粦瀹氥�佺粦瀹氬満鏅�佸け鏁堣澶囷紙璁惧宸茬粡浠庣綉鍏崇殑璁惧鍒楄〃涓垹闄わ級銆傚悓缃戝叧璁惧闂寸殑瑙ｉ櫎缁戝畾闇�瑕佽妭鐐硅澶囩殑纭鎴愬姛淇℃伅锛屼笉浼氱洿鎺ュ弽棣堟垚鍔熴�傦級
///<para>1锛氬け璐ワ紝璁惧涓嶅湪缁戝畾鍒楄〃涓�</para>
///<para>3锛氬け璐ワ紝鍦ㄧ瓑寰呰妭鐐硅澶囩‘璁ゆ槸鍚﹁В闄ょ粦瀹氭垚鍔燂紙褰撶綉鍏宠繕鍦ㄧ瓑寰呮煇鑺傜偣璁惧纭鏄惁瑙ｉ櫎缁戝畾鎴愬姛鐨勫弽棣堜俊鎭椂锛屽鎴风鍐嶆鍙戦�佽В闄ょ粦瀹氳鑺傜偣璁惧鐨勬寚浠わ紝灏嗗弽棣堣鐘舵�併�傦級</para>
- ///<para>4锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/RemoveBindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔熴��</para>
+ ///<para>2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/RemoveBindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔熴��</para>
/// </summary>
public int Result;
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100644
new mode 100755
index aba0dce..0187118
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -586,6 +586,7 @@
public const int Favorite = 10001;
+
/// <summary>
/// 鎵嬫満鍙�
/// </summary>
@@ -650,20 +651,20 @@
/// 纭畾
/// </summary>
public const int Confrim = 10115;
- /// <summary>
- /// 璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍
- /// </summary>
- public const int AccountHasBeenRegistered = 10116;
+ /// <summary>
+ /// 璇ョ敤鎴峰凡瀛樺湪锛屽彲鐩存帴鐧诲綍
+ /// </summary>
+ public const int AccountHasBeenRegistered = 10116;
/// <summary>
/// 鎻愪緵鐨勫弬鏁伴敊璇�
/// </summary>
public const int PARAMETEROREMPTY = 10117;
+ /// <summary>
+ /// 纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
+ /// </summary>
+ public const int TwoPasswordInconsistency = 10118;
/// <summary>
- /// 涓ゆ瀵嗙爜涓嶄竴鑷�
- /// </summary>
- public const int TwoPasswordInconsistency = 10118;
- /// <summary>
- /// 楠岃瘉鐮侀敊璇�
+ /// 楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
/// </summary>
public const int VALIDCODEANDPHONENOEQUAL = 10119;
/// <summary>
@@ -745,7 +746,11 @@
/// <summary>
/// 鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
/// </summary>
- public const int ThePhoneError = 10139;
+ public const int ThePhoneError = 10139;
+ /// <summary>
+ /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
+ /// </summary>
+ public const int ThePWDLengthError = 10140;
/// <summary>
/// 浣犲凡琚己鍒朵笅绾匡紒
/// </summary>
--
Gitblit v1.8.0