From 58ccc89832196860a74609a1c54b40b7c6f7faed Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 十一月 2023 11:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr-udp修改验证' into Wxr-V2.4.2
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | 10
HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs | 2
HDL_ON/Common/ApiUtlis.cs | 7
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 8
HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs | 19
HDL_ON/HDL_ON.projitems | 5
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs | 14
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 7
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs | 16
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 1
HDL-ON_Android/Resources/Resource.designer.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs | 5
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 31 +
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs | 6
HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 8
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 6
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs | 14
HDL_ON/Entity/Function/Scene.cs | 193 ++++++----
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 107 -----
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs | 9
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 1
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 1
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs | 8
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 29
HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs | 8
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 44 -
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs | 6
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 1
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs | 6
HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs | 4
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 18 -
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneTargetTypeChoosePage.cs | 1
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAutomationListChoosePage.cs | 5
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 10
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 6
HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs | 22
HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPage.cs | 2
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/TvControlPage.cs | 4
HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs | 2
HDL_ON/Entity/FunctionList.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs | 7
/dev/null | 186 ----------
HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 14
HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs | 8
HDL_ON/DAL/Server/HttpServerRequest.cs | 5
HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs | 6
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs | 12
87 files changed, 444 insertions(+), 612 deletions(-)
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index c608c66..7dfc175 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -15,7 +15,7 @@
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
public partial class Resource
{
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index c04aa5a..96f5c7d 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -535,11 +535,12 @@
//======================瀹夐槻====================
GetSecurityList();
+
+ //===================璇诲彇閫昏緫鍒楄〃==========================
+ Logic.LogicList.Clear();//涓婚〉涓嬫媺寮哄埗鍒锋柊鑷姩鍖栧垪琛�
+ MainView.GetLogicList();//璇诲彇鑷姩鍖栧垪琛�
})
{ IsBackground = true }.Start();
-
- //===================璇诲彇閫昏緫鍒楄〃==========================
- Logic.LogicList.Clear();//涓婚〉涓嬫媺寮哄埗鍒锋柊鑷姩鍖栧垪琛�
//======================娉ㄥ唽鎺ㄩ��====================
httpRequest.RegisteredPush();
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index f6d8677..46ccea0 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -192,9 +192,8 @@
{
if (canRefresh)
{
- MainPage.Log($"UserInfo.Current.RefreshToken 1 : " + UserInfo.Current.RefreshToken);
- UserInfo.Current.RefreshToken = SiriKit.NSUserDefaultsHelper.DataSuite.StringForKey(SiriKit.NSUserDefaultsHelper.StorageKeys.GLOBAL_GAccessToken);
- MainPage.Log($"UserInfo.Current.RefreshToken 2 : " + UserInfo.Current.RefreshToken);
+ UserInfo.Current.RefreshToken = SiriKit.NSUserDefaultsHelper.DataSuite.StringForKey(SiriKit.NSUserDefaultsHelper.StorageKeys.GLOBAL_GRefreshToken);
+ //UserInfo.Current.AccessToken = SiriKit.NSUserDefaultsHelper.DataSuite.StringForKey(SiriKit.NSUserDefaultsHelper.StorageKeys.GLOBAL_GAccessToken);
RefreshToken(false);
}
}
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 0be5794..27ce5ef 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 35fba28..1e92f33 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -3,6 +3,7 @@
using HDL_ON.Common;
using HDL_ON.DAL.Server;
using HDL_ON.UI;
+using HDL_ON.UI.UI2.Intelligence.Automation;
using Shared;
namespace HDL_ON.Entity
@@ -86,6 +87,14 @@
/// 鏄惁鍏佽鍒犻櫎
/// </summary>
public bool can_delete = true;
+ /// <summary>
+ /// 鏄惁鍏佽缂栬緫
+ /// </summary>
+ public bool can_edit = true;
+ /// <summary>
+ /// 鏄惁鏄綉鍏虫湰鍦板満鏅�
+ /// </summary>
+ public bool local = false;
/// <summary>
/// 鍒涘缓璇ュ満鏅殑鐢ㄦ埛ID
@@ -561,12 +570,24 @@
/// <returns></returns>
private Function ConvertFunctionObject()
{
- var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
- if(localFunction == null)
+ Function temp = null;
+ if (type == "7")
{
- localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ var logic = Logic.LogicList.Find((obj) => obj.sid == sid);
+ if (logic != null) {
+ temp = new Function();
+ temp.name = logic.name;
+ }
}
- return localFunction;
+ else
+ {
+ temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
+ if (temp == null)
+ {
+ temp = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ }
+ }
+ return temp;
}
@@ -577,91 +598,109 @@
public string GetFunctionScnenInfo()
{
var sceneFunctionInfo = "";
- foreach (var sfs in status)
+ if (type == "7")
{
- if (sfs.key == FunctionAttributeKey.OnOff)
+ foreach (var sfs in status)
{
- if (sfs.value == "off")
+ if (sfs.key == "enable")
{
- return Language.StringByID(StringId.Close);
+ if (sfs.value == "true")
+ return Language.StringByID(StringId.OpenArm);
+ else
+ {
+ return Language.StringByID(StringId.Close);
+ }
}
}
}
- sceneFunctionInfo += Language.StringByID(StringId.Open) + " ";
+ else
+ {
+ foreach (var sfs in status)
+ {
+ if (sfs.key == FunctionAttributeKey.OnOff)
+ {
+ if (sfs.value == "off")
+ {
+ return Language.StringByID(StringId.Close);
+ }
+ }
+ }
+ sceneFunctionInfo += Language.StringByID(StringId.Open) + " ";
- var modeState = status.Find((obj) => obj.key == FunctionAttributeKey.Mode);
- var tempState = status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp);
- var fanState = status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed);
- ////娴蜂俊鐢佃鐘舵��
- //var hisenseTvState = status.Find((obj) => obj.key == "wol");
- //if(hisenseTvState != null)
- //{
- //}
- if (modeState != null)
- {
- sceneFunctionInfo += modeState.GetValueText() + " ";
- }
- if (tempState != null)
- {
- sceneFunctionInfo += tempState.GetValueText();
- sceneFunctionInfo += tempState.GetUintString() + " ";
- }
- if (fanState != null)
- {
- sceneFunctionInfo += fanState.GetValueText() + " ";
- }
- var briState = status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
- if (briState != null)
- {
- sceneFunctionInfo += briState.value + "%" + " ";
- }
- var perState = status.Find((obj) => obj.key == FunctionAttributeKey.Percent);
- if (perState != null)
- {
- sceneFunctionInfo += perState.value + "%" + " ";
- }
- var cctState = status.Find((obj) => obj.key == FunctionAttributeKey.CCT);
- if (cctState != null)
- {
- sceneFunctionInfo += cctState.value + "K" + " ";
- }
- var rgbState = status.Find((obj) => obj.key == FunctionAttributeKey.RGB);
- if (rgbState != null)
- {
- //sceneFunctionInfo += new cctState.value + "%" + " ";
- }
+ var modeState = status.Find((obj) => obj.key == FunctionAttributeKey.Mode);
+ var tempState = status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp);
+ var fanState = status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed);
+ ////娴蜂俊鐢佃鐘舵��
+ //var hisenseTvState = status.Find((obj) => obj.key == "wol");
+ //if(hisenseTvState != null)
+ //{
+ //}
+ if (modeState != null)
+ {
+ sceneFunctionInfo += modeState.GetValueText() + " ";
+ }
+ if (tempState != null)
+ {
+ sceneFunctionInfo += tempState.GetValueText();
+ sceneFunctionInfo += tempState.GetUintString() + " ";
+ }
+ if (fanState != null)
+ {
+ sceneFunctionInfo += fanState.GetValueText() + " ";
+ }
+ var briState = status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
+ if (briState != null)
+ {
+ sceneFunctionInfo += briState.value + "%" + " ";
+ }
+ var perState = status.Find((obj) => obj.key == FunctionAttributeKey.Percent);
+ if (perState != null)
+ {
+ sceneFunctionInfo += perState.value + "%" + " ";
+ }
+ var cctState = status.Find((obj) => obj.key == FunctionAttributeKey.CCT);
+ if (cctState != null)
+ {
+ sceneFunctionInfo += cctState.value + "K" + " ";
+ }
+ var rgbState = status.Find((obj) => obj.key == FunctionAttributeKey.RGB);
+ if (rgbState != null)
+ {
+ //sceneFunctionInfo += new cctState.value + "%" + " ";
+ }
- var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
- if (perAngle != null)
- {
- sceneFunctionInfo += " " + perAngle.value + "掳";
- }
+ var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
+ if (perAngle != null)
+ {
+ sceneFunctionInfo += " " + perAngle.value + "掳";
+ }
- var perSetVolume = status.Find((obj) => obj.key == FunctionAttributeKey.SetVolume);
- if (perSetVolume != null)
- {
- sceneFunctionInfo += " " + perSetVolume.value;
- }
+ var perSetVolume = status.Find((obj) => obj.key == FunctionAttributeKey.SetVolume);
+ if (perSetVolume != null)
+ {
+ sceneFunctionInfo += " " + perSetVolume.value;
+ }
- var perSignal = status.Find((obj) => obj.key == FunctionAttributeKey.Signal);
- if (perSignal != null)
- {
- var p = new HDL_ON.UI.UI2.Intelligence.Automation.PublicInterface();
- string key = p.GetKey(p.GetHisenseSignalSourceDic(), perSignal.value);
- sceneFunctionInfo += " " + key;
- }
+ var perSignal = status.Find((obj) => obj.key == FunctionAttributeKey.Signal);
+ if (perSignal != null)
+ {
+ var p = new HDL_ON.UI.UI2.Intelligence.Automation.PublicInterface();
+ string key = p.GetKey(p.GetHisenseSignalSourceDic(), perSignal.value);
+ sceneFunctionInfo += " " + key;
+ }
- var perVolume =status.Find((obj) => obj.key == FunctionAttributeKey.Volume);
- if (perVolume != null)
- {
- sceneFunctionInfo += " " + perVolume.value;
- }
+ var perVolume = status.Find((obj) => obj.key == FunctionAttributeKey.Volume);
+ if (perVolume != null)
+ {
+ sceneFunctionInfo += " " + perVolume.value;
+ }
- var perSongName =status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
- if (perSongName != null)
- {
- sceneFunctionInfo += " " + perSongName.value;
+ var perSongName = status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
+ if (perSongName != null)
+ {
+ sceneFunctionInfo += " " + perSongName.value;
+ }
}
return sceneFunctionInfo;
}
@@ -670,6 +709,8 @@
/// 璁惧
/// 鍦烘櫙 =scene
/// 缇ゆ帶=5
+ /// 鑷姩鍖�=7
+ ///
/// </summary>
public string type = "0";
}
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 919bfe1..f91b737 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -282,6 +282,8 @@
SPK.SensorSmoke,
SPK.SensorWater,
SPK.SensorGas,
+ SPK.SensorDryContact,
+ SPK.SensorDryContact2,
};
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index f752658..53e3b23 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -136,7 +136,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\QuestionListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\NewBindVerificationCodePage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\NewBindAccountPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\BindAccountPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\AccountBindInfoPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\ChangeBindAccountPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\ChangeBindVerificationCodePage.cs" />
@@ -173,9 +172,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\MemberManagementPageBLL.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\MemberPermissionPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\ChooseShareMemberTargetListPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\ThirdPartyBrandListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\AddDevciePage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\AddThirdPartyBrandListpage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\DeviceListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\BrandListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\UnlockSetting\AppUnlockGesturePage.cs" />
@@ -510,7 +507,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\iot_BindTipPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\Iot_BrandFunctionListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\Iot_AuthorizedPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\Iot_SupportSpkListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\Control_Tcp.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Entity\Function\InverterInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\H5Page.cs" />
@@ -540,7 +536,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\MemberFaceManagementPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\CombinedDimmingListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\GroupControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\AddCombineDimmingPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Entity\ResponseEntity\FreeviewMemberInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\GroupChooseRoomPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\AddGroupControlPage.cs" />
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 572cffe..0bf2eb4 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -42,6 +42,8 @@
/// </summary>
Action backAction;
+ public int maginY = 0;
+
public TopViewDiv(FrameLayout frame, string str)
{
baseView = frame;
@@ -84,7 +86,7 @@
{
contentView = new FrameLayout()
{
- Height = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(64+ maginY),
BackgroundColor = color,
};
baseView.AddChidren(contentView);
@@ -92,7 +94,7 @@
Button btnBackIcon = new Button()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29 + maginY),
Width = Application.GetRealWidth(40),
Height = Application.GetRealWidth(28),
UnSelectedImagePath = "Public/BackIcon.png",
@@ -102,7 +104,7 @@
btnTilte = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(30 + maginY),
Width = Application.GetRealWidth(270),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.Center,
@@ -142,7 +144,7 @@
var btnSetting = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29 + maginY),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -172,7 +174,7 @@
var btnSetting = new Button()
{
X = Application.GetRealWidth(337-37),
- Y = Application.GetRealHeight(20),
+ Y = Application.GetRealHeight(20 + maginY),
Width = Application.GetMinRealAverage(28+37),
Height = Application.GetMinRealAverage(28+19),
TextID = StringId.CombinedDimming,
@@ -199,13 +201,14 @@
public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
{
backAction = action;
+ maginY = 10;
LoadTopView();
var btnSetting = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(28),
+ Y = Application.GetRealHeight(28 + maginY),
Width = Application.GetMinRealAverage(32),
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -239,7 +242,7 @@
var btnSetting = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29 + maginY),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -270,7 +273,7 @@
var btnSetting = new Button()
{
X = Application.GetRealWidth(355-100),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29 + maginY),
Width = Application.GetMinRealAverage(100),
Height = Application.GetMinRealAverage(28),
TextColor = isDelColor ?CSS_Color.WarningColor: CSS_Color.MainColor,
@@ -298,7 +301,7 @@
var btnAddIcon = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29 + maginY),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
@@ -349,7 +352,7 @@
var btnAddIcon = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29 + maginY),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/LinkIotIcon.png",
@@ -376,7 +379,7 @@
var btnAddIcon = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29 + maginY),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/Iot_agreement_icon.png",
@@ -442,7 +445,7 @@
var btnAddIcon = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29 + maginY),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
@@ -492,7 +495,7 @@
var btnAddIcon = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(29+maginY),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
diff --git a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
index 19ea6e0..34cd84a 100644
--- a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
@@ -45,12 +45,14 @@
{
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
this.AddChidren(bodyView);
- new TopViewDiv(this, bodyView, titleStr).LoadTopView(closeAction);
+ var topView = new TopViewDiv(this, bodyView, titleStr);
+ topView.maginY = 10;
+ topView.LoadTopView(closeAction);
//WebView
mWebView = new WebView()
{
- Y = Application.GetRealHeight(64),
- Height = bodyView.Height - Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
+ Height = bodyView.Height - Application.GetRealHeight(64+10),
X = Application.GetRealWidth(16),
Width = bodyView.Width - Application.GetRealWidth(32)
};
diff --git a/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
index 85164ed..1f341aa 100644
--- a/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
@@ -95,7 +95,7 @@
//杩斿洖閿�
var btnBack = new PicViewControl(40, 28);
btnBack.X = Application.GetRealWidth(10);
- btnBack.Y = Application.GetRealHeight(9);
+ btnBack.Y = Application.GetRealHeight(19);
btnBack.UnSelectedImagePath = "Public/BackIcon.png";
topFrameLayout.AddChidren(btnBack);
topFrameLayout.AddTag("btnBack", btnBack);
@@ -119,7 +119,7 @@
//鏍囬
var btnTilte = new NormalViewControl(270, 25, true);
btnTilte.Gravity = Gravity.CenterHorizontal;
- btnTilte.Y = Application.GetRealHeight(10);
+ btnTilte.Y = Application.GetRealHeight(20);
btnTilte.TextAlignment = TextAlignment.Center;
btnTilte.TextSize = UI.CSS.CSS_FontSize.HeadlineFontSize;
btnTilte.TextColor = UI.CSS.CSS_Color.FirstLevelTitleColor;
diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index 9f4971b..a58c218 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -302,12 +302,20 @@
/// <param name="btnHigherCollection">涓婁竴绾х晫闈㈢殑鏀惰棌鎺т欢(鍘熸潵on鐨勬鏋跺お鍧�)</param>
/// <param name="btnHigherDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(鍘熸潵on鐨勬鏋跺お鍧�)</param>
private void AddTopSettingIcon(Button btnHigherDeviceName, Button btnHigherRoom)
- {
- //璁剧疆鍥炬爣(闂ㄩ攣鐣岄潰闇�瑕佸�熺敤杩欎釜鍥炬爣鐨刋杞村拰Y杞�,鎵�浠ュ姞杩涙潵)
- var btnSetting = new PicViewControl(28, 28);
- btnSetting.X = Application.GetRealWidth(337);
- btnSetting.Y = Application.GetRealHeight(9);
- btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";
+ {
+ //璁剧疆鍥炬爣(闂ㄩ攣鐣岄潰闇�瑕佸�熺敤杩欎釜鍥炬爣鐨刋杞村拰Y杞�,鎵�浠ュ姞杩涙潵)
+ var btnSetting = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(19),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
+ };
+ //var btnSetting = new PicViewControl(28, 28);
+ //btnSetting.X = Application.GetRealWidth(337);
+ //btnSetting.Y = Application.GetRealHeight(9);
+ //btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";
btnSetting.Name = "btnSetting";
topFrameLayout.AddChidren(btnSetting);
@@ -317,7 +325,7 @@
btnSetting.Visible = false;
}
- btnSetting.ButtonClickEvent += (sender, e) =>
+ btnSetting.MouseUpEventHandler += (sender, e) =>
{
var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>
{
diff --git a/HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs b/HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs
index ceca9b1..640d1b6 100644
--- a/HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs
+++ b/HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs
@@ -17,7 +17,7 @@
/// <summary>
/// 鐢婚潰TopFrameLayout鐨勯珮搴�(楂樺害锛�44)
/// </summary>
- public static int TopFrameHeight = Application.GetRealHeight(44);
+ public static int TopFrameHeight = Application.GetRealHeight(44 + 10);
/// <summary>
/// 鐢婚潰BodyFrameLayout鐨勯珮搴�(涓嶈兘鐩存帴鎸囧畾鏁板��,涓嶇劧鏈夊彲鑳戒細鍑虹幇璇樊,瀵艰嚧鏃犳硶閾烘弧)
/// </summary>
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 1796050..0ed2008 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -73,7 +73,9 @@
public void LoadPage(Action backAction)
{
this.backAction = backAction;
- new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter));
+ topView.maginY = 10;
+ topView.LoadTopView();
AddTopMenuView();
AddMessageView();
@@ -92,7 +94,7 @@
menuView = new HorizontalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealWidth(117),
BackgroundColor = CSS_Color.MainBackgroundColor,
HorizontalScrollBarEnabled = false//闅愯棌婊氬姩鏉�
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index c8891fe..c1e7d38 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -84,50 +84,24 @@
skipView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView_LightFunction(action);
}
else
{
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView();
}
-
-
-#if DEBUG
- //Button testBtn = new Button()
- //{
- // X = Application.GetRealWidth(80),
- // Height = Application.GetRealHeight(64),
- // BackgroundColor = 0xFFFF0000
- //};
- //bodyView.AddChidren(testBtn);
- //int ddd = 0;
- //testBtn.MouseUpEventHandler = (sender, e) => {
- // ddd++;
-
- // Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
- // if (ddd % 2 == 0)
- // {
- // function_online.online = true;
- // }
- // else
- // {
- // function_online.online = false;
- // }
- // HomePage.LoadEvent_RefreshDevcieOnline(function_online);
- // FunctionPage.UpdataOnline(function_online);
- // RoomPage.UpdataOnline(function_online);
-
-
- //};
-#endif
/// <summary>
/// 鎴块棿鍐呭鏄剧ず鍖哄煙
/// </summary>
var roomFloorChangeView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(52),
};
bodyView.AddChidren(roomFloorChangeView);
@@ -158,8 +132,8 @@
functionListView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64 + 52),
- Height = Application.GetRealHeight(603 - 12 - 52),
+ Y = Application.GetRealHeight(64 + 52 +10),
+ Height = Application.GetRealHeight(603 - 12 - 52-10),
};
bodyView.AddChidren(functionListView);
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index bba7be6..6ec4b00 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
@@ -25,6 +25,7 @@
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.NewScene));
+ topView.maginY = 10;
topView.LoadTopView();
#region 娣诲姞鍦烘櫙
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index b4695e7..575dadd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -98,6 +98,7 @@
public void LoadPage()
{
var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.NewScene));
+ topView.maginY = 10;
topView.LoadTopView();
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAutomationListChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAutomationListChoosePage.cs
index 834f48f..16fa3e4 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAutomationListChoosePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAutomationListChoosePage.cs
@@ -29,12 +29,13 @@
{
this.bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
var topView = new TopViewDiv(bodyView,Language.StringByID( StringId.SelectAutomation));
+ topView.maginY = 10;
topView.LoadTopView();
var contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667-70),
+ Y = Application.GetRealHeight(74),
+ Height = Application.GetRealHeight(667-80),
ScrollEnabled = false,
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index f7181b6..ae70c7a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -99,6 +99,7 @@
public void LoadPage(Action backRefresh)
{
var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.EditScene));
+ topView.maginY = 10;
topView.LoadTopView(backRefresh);
initPage();
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
index 6f7a0a4..2278e48 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListChoosePage.cs
@@ -58,6 +58,7 @@
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction));
+ topView.maginY = 10;
topView.LoadTopView();
#region 鏄剧ず鐨勫姛鑳界被鍨嬪垏鎹㈠尯鍩�
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneTargetTypeChoosePage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneTargetTypeChoosePage.cs
index bd92ea7..effe348 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneTargetTypeChoosePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneTargetTypeChoosePage.cs
@@ -40,6 +40,7 @@
BackgroundColor = CSS_Color.BackgroundColor
});
var topView = new TopViewDiv(bodyView,Language.StringByID(StringId.AddExecutionAction));
+ topView.maginY = 10;
topView.LoadTopView();
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 6c54743..08820bd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -54,6 +54,7 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
var topView = new TopViewDiv(bodyView, sceneFunction.localFunction.name);
+ topView.maginY = 10;
topView.LoadTopView();
contentView = new VerticalScrolViewLayout()
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 2bf2a19..2f38f9b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -46,13 +46,15 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.About));
+ topView.maginY = 10;
+ topView.LoadTopView();
this.BackgroundColor = CSS_Color.MainBackgroundColor;
Button btnOnIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealWidth(106),
+ Y = Application.GetRealWidth(106+10),
Width = Application.GetRealWidth(58),
Height = Application.GetRealWidth(58),
UnSelectedImagePath = "OnIcon.png",
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
index 811a71e..227a159 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
@@ -29,12 +29,14 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints));
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 鎶曡瘔鑱旂郴
FrameLayout phoneRow = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealWidth(50),
};
bodyView.AddChidren(phoneRow);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs
index da10e26..83a359d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FirmwareUpdateView.cs
@@ -14,12 +14,14 @@
public void ShowPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.FirmwareUpdate)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.FirmwareUpdate));
+ topView.maginY = 10;
+ topView.LoadTopView();
var contentView = new VerticalScrolViewLayout()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(90),
+ Y = Application.GetRealHeight(100),
Height = bodyView.Height,
BackgroundColor = CSS_Color.MainBackgroundColor,
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs
index a9f92b0..b8dade0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/SupportHomeKitNotesPage.cs
@@ -14,12 +14,14 @@
}
public void ShowPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.SupportHomeKitNotes)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SupportHomeKitNotes));
+ topView.maginY = 10;
+ topView.LoadTopView();
var contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(90),
- Height = bodyView.Height ,
+ Y = Application.GetRealHeight(100),
+ Height = Application.GetRealHeight(490) ,
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
index 331dc4a..0e0a31d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
@@ -47,11 +47,13 @@
optionType = ot;
titleId = tId;
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView();
FrameLayout rowView = new FrameLayout()
{
- Y = Application.GetRealHeight(72),
+ Y = Application.GetRealHeight(72+10),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs
deleted file mode 100644
index 4129820..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-锘�//using System;
-//using Shared;
-//using HDL_ON.UI.CSS;
-//using System.Text.RegularExpressions;
-//using HDL_ON.DAL.Server;
-
-//namespace HDL_ON.UI
-//{
-// public partial class BindAccountPage : FrameLayout
-// {
-// FrameLayout bodyView;
-// Button btnBind;
-// EditText etContent;
-// Action<string> action;
-// /// <summary>
-// /// 鏍囬ID
-// /// </summary>
-// int titleId;
-// public BindAccountPage()
-// {
-// bodyView = this;
-// }
-
-// public void LoadPage(Action<string> act,int tId)
-// {
-// action = act;
-// titleId = tId;
-// bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-// new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
-
-// FrameLayout rowView = new FrameLayout()
-// {
-// Y = Application.GetRealHeight(72),
-// Height = Application.GetRealHeight(50),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// bodyView.AddChidren(rowView);
-
-// Button btnTitle = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// Width = Application.GetRealWidth(180),
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// TextAlignment = TextAlignment.CenterLeft,
-// TextID = titleId == StringId.BindEmail ? StringId.EntryNewEmail : StringId.EntryNewPhone,
-// };
-// rowView.AddChidren(btnTitle);
-
-// etContent = new EditText()
-// {
-// Width = Application.GetRealWidth(359),
-// TextColor = CSS_Color.PromptingColor1,
-// TextSize = CSS_FontSize.TextFontSize,
-// TextAlignment = TextAlignment.CenterRight,
-// Foucs = true
-// };
-// rowView.AddChidren(etContent);
-
-// btnBind = new Button()
-// {
-// Y = Application.GetRealHeight(213),
-// Gravity = Gravity.CenterHorizontal,
-// Width = Application.GetRealWidth(220),
-// Height = Application.GetRealHeight(44),
-// BackgroundColor = CSS_Color.MainColor,
-// TextAlignment = TextAlignment.Center,
-// TextColor = CSS_Color.MainBackgroundColor,
-// TextID = StringId.Confirm,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// IsBold = true,
-// Radius = (uint)Application.GetRealWidth(22),
-// BorderColor = 0x00000000,
-// BorderWidth = 0,
-// };
-// bodyView.AddChidren(btnBind);
-
-// LoadEvent_BindEmail();
-
-// }
-// }
-
-
-// //--------------------------------------------
-// public partial class BindAccountPage
-// {
-// void LoadEvent_BindEmail()
-// {
-// btnBind.MouseUpEventHandler = (sender, e) => {
-// Application.HideSoftInput();
-// var account = etContent.Text.Trim();
-// if (titleId == StringId.BindEmail)
-// {
-// if (account == UserInfo.Current.userEmailInfo)
-// {
-// var tip = new Tip()
-// {
-// Text = Language.StringByID(StringId.EmailIsSameNoNeedModfiy),
-// CloseTime = 1,
-// Direction = AMPopTipDirection.None
-// };
-// tip.Show(bodyView);
-// return;
-// }
-// if (!Regex.IsMatch(account, "([a-zA-Z0-9_\\.\\-])+\\@(([a-zA-Z0-9\\-])+\\.)+([a-zA-Z0-9]{2,5})+"))
-// {
-// var tip = new Tip()
-// {
-// Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
-// CloseTime = 1,
-// Direction = AMPopTipDirection.None
-// };
-// tip.Show(bodyView);
-// return;
-// }
-// }
-// else if (titleId == StringId.BindPhone)
-// {
-// if(account == UserInfo.Current.userMobileInfo)
-// {
-// var tip = new Tip()
-// {
-// Text = Language.StringByID(StringId.PhoneNumberIsSameNoNeedModfiy),
-// CloseTime = 1,
-// Direction = AMPopTipDirection.None
-// };
-// tip.Show(bodyView);
-// return;
-// }
-// if (!Regex.IsMatch(account, @"^[1]+\d{10}") || (account.Length != 11))
-// {
-// var tip = new Tip()
-// {
-// Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
-// CloseTime = 1,
-// Direction = AMPopTipDirection.None
-// };
-// tip.Show(bodyView);
-// return;
-// }
-// }
-// new System.Threading.Thread(() =>
-// {
-// var result = new HttpServerRequest().BindAccount(account);
-// if (result.ToUpper() == StateCode.SUCCESS)
-// {
-// Application.RunOnMainThread(() =>
-// {
-// if (titleId == StringId.BindEmail)
-// {
-// UserInfo.Current.userEmailInfo = account;
-// }
-// else if (titleId == StringId.BindPhone)
-// {
-// UserInfo.Current.userMobileInfo = account;
-// }
-// var page = new OperationResultDisPalyPage();
-// page.Show();
-// if (titleId == StringId.BindEmail)
-// {
-// page.LoadPage(true, Language.StringByID(StringId.BindEmail), Language.StringByID(StringId.BindEmailSuccess), "");
-// }
-// else if (titleId == StringId.BindPhone)
-// {
-// page.LoadPage(true, Language.StringByID(StringId.BindPhone), Language.StringByID(StringId.BindPhoneSuccess), "");
-// }
-
-// for (int i = 0; i < 3; i++)
-// {
-// MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
-// }
-// action(account);
-// });
-// }
-// else
-// {
-// var tipMsg = "";
-
-// Application.RunOnMainThread(() =>
-// {
-// var page = new OperationResultDisPalyPage();
-// page.Show();
-// if (titleId == StringId.BindEmail)
-// {
-// if (result == "Exist")
-// {
-// tipMsg = Language.StringByID(StringId.EmailAlreadyUse);
-// }
-// page.LoadPage(false, Language.StringByID(StringId.BindEmail), Language.StringByID(StringId.BindEmailFail) + "," + tipMsg, "");
-// }
-// else
-// {
-// if (result == "Exist")
-// {
-// tipMsg = Language.StringByID(StringId.PhoneNumberAlreadyUse);
-// }
-// page.LoadPage(false, Language.StringByID(StringId.BindPhone), Language.StringByID(StringId.BindPhoneFail) + "," + tipMsg, "");
-// }
-// });
-// }
-// })
-// { IsBackground = true }.Start();
-// };
-// }
-// }
-//}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
index af42f85..2b704d4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
@@ -67,11 +67,13 @@
account = UserInfo.Current.userMobileInfo;
}
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView();
FrameLayout rowView = new FrameLayout()
{
- Y = Application.GetRealHeight(72),
+ Y = Application.GetRealHeight(72+10),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -100,7 +102,7 @@
Button btnChangeBind = new Button()
{
- Y = Application.GetRealHeight(213),
+ Y = Application.GetRealHeight(213+10),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
Height = Application.GetRealWidth(44),
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs
index b599c70..b703c92 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs
@@ -88,11 +88,13 @@
Application.HideSoftInput();
BackConfirmAction();
};
- new TopViewDiv(bodyView, Language.StringByID(tId), false).LoadTopView(backAction);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(tId), false);
+ topView.maginY = 10;
+ topView.LoadTopView(backAction);
btnTip = new Button()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(84),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs
index 2a3a276..dbc51be 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs
@@ -70,7 +70,9 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView();
if (isPhone)
{
@@ -93,7 +95,7 @@
#region 濡傛灉鏄墜鏈�
//鎵嬫満鍥藉鍖哄彿閫夋嫨鎸夐挳
ListCellView codeView = new ListCellView() {
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
};
bodyView.AddChidren(codeView);
//璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
@@ -170,7 +172,7 @@
#region 濡傛灉鏄偖绠�
FrameLayout rowView = new FrameLayout()
{
- Y = Application.GetRealHeight(72),
+ Y = Application.GetRealHeight(72+10),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs
index 3b501fe..000f8de 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs
@@ -94,11 +94,13 @@
Application.HideSoftInput();
BackConfirmAction();
};
- new TopViewDiv(bodyView, Language.StringByID(tId), false).LoadTopView(backAction);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(tId), false);
+ topView.maginY = 10;
+ topView.LoadTopView(backAction);
btnTip = new Button()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64-10),
Height = Application.GetRealHeight(84),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 14acce9..d801642 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -55,13 +55,15 @@
public void LoadPage(VerticalRefreshLayout refreshView)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice));
+ topView.maginY = 10;
+ topView.LoadTopView();
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
VerticalScrollBarEnabled = false,
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
deleted file mode 100644
index febc19c..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-锘�//using System;
-//using System.Collections.Generic;
-//using HDL_ON.Entity;
-//using HDL_ON.UI.CSS;
-//using Shared;
-
-//namespace HDL_ON.UI
-//{
-// public class AddThirdPartyBrandListpage : FrameLayout
-// {
-// FrameLayout bodyView;
-// VerticalRefreshLayout contentView;
-// List<IntegratedBrand> brandList;
-// public AddThirdPartyBrandListpage(List<IntegratedBrand> list)
-// {
-// bodyView = this;
-// brandList = list;
-// }
-
-// public void LoadPage()
-// {
-// new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();
-
-// bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-
-// contentView = new VerticalRefreshLayout()
-// {
-// Y = Application.GetRealHeight(64),
-// Height = Application.GetRealHeight(667 - 64),
-// VerticalScrollBarEnabled = false,
-// };
-// bodyView.AddChidren(contentView);
-
-
-// contentView.BeginHeaderRefreshingAction = () =>
-// {
-// contentView.EndHeaderRefreshing();
-// Load3tyBrandList();
-// };
-
-// Load3tyBrandList();
-
-// contentView.BeginHeaderRefreshingAction = () =>
-// {
-// contentView.EndHeaderRefreshing();
-// Load3tyBrandList();
-// };
-// }
-
-// void LoadRow(List<IntegratedBrand> brandList)
-// {
-// contentView.RemoveAll();
-// bool isFrist = true;
-// foreach(var brand in brandList)
-// {
-// FrameLayout row = new FrameLayout() {
-// Height = Application.GetRealHeight(50),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// contentView.AddChidren(row);
-
-// if(isFrist)
-// {
-// isFrist = false;
-// }
-// else
-// {
-// Button btnLine = new Button()
-// {
-// X = Application.GetRealWidth(56),
-// Width = Application.GetRealWidth(303),
-// Height = 1,
-// BackgroundColor = CSS_Color.DividingLineColor,
-// };
-// row.AddChidren(btnLine);
-// }
-
-// ImageView btnIcon = new ImageView()
-// {
-// X = Application.GetRealWidth(12),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetRealWidth(32),
-// Height = Application.GetRealWidth(32),
-// Radius = (uint)Application.GetRealWidth(4),
-// BackgroundColor = CSS_Color.PromptingColor1
-// //ImagePath = "tuya_logo.png"
-// };
-// row.AddChidren(btnIcon);
-// Button btnRight = new Button()
-// {
-// X = Application.GetRealWidth(339),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetMinRealAverage(16),
-// Height = Application.GetMinRealAverage(16),
-// UnSelectedImagePath = "Public/Right.png",
-// };
-// row.AddChidren(btnRight);
-
-// Button btnName = new Button()
-// {
-// X = Application.GetRealWidth(56),
-// Width = Application.GetRealWidth(303),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextSize = CSS_FontSize.TextFontSize,
-// Text = brand.brandName,
-// };
-// row.AddChidren(btnName);
-// //涓嬭浇绗笁鏂瑰搧鐗宨con
-// ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
-
-// btnName.MouseUpEventHandler = (sender, e) => {
-// var page = new AddDevciePage(brand);
-// MainPage.BasePageView.AddChidren(page);
-// page.LoadPage();
-// MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-// };
-// }
-
-// }
-
-// void Load3tyBrandList()
-// {
-// var waitPage = new Loading();
-// waitPage.Start();
-// new System.Threading.Thread(() => {
-// try
-// {
-// var pm = new DAL.Server.HttpServerRequest();
-// var pack = pm.Get3tyBrandList();
-// if(pack.Code == DAL.Server.StateCode.SUCCESS)
-// {
-// var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrand>>(pack.Data.ToString());
-// Application.RunOnMainThread(() =>
-// {
-// LoadRow(revData);
-// });
-// }
-// }
-// catch (Exception ex)
-// {
-// MainPage.Log("1--::"+ex.Message);
-// }
-// finally
-// {
-// Application.RunOnMainThread(() => { waitPage.Hide(); });
-// }
-// }) { IsBackground = true }.Start();
-// }
-// /// <summary>
-// /// 璺宠浆娣诲姞璁惧鐣岄潰
-// /// </summary>
-// /// <param name="bandType">鍝佺墝绫诲瀷</param>
-// void SkipPage_AddDevice()
-// {
-
-// }
-// }
-//}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index f4f0ede..f54199f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -26,21 +26,23 @@
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_Add3tyIot(action);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand));
+ topView.maginY = 10;
+ topView.LoadTopView_Add3tyIot(action);
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
bodyView.AddChidren(new Button
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(65),
- Height = Application.GetRealHeight(603),
+ Y = Application.GetRealHeight(65+10),
+ Height = Application.GetRealHeight(603-10),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 7bc7270..2bcf880 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -34,13 +34,15 @@
page.LoadPage(contentView);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Devices));
+ topView.maginY = 10;
+ topView.LoadTopView_AddIcon("3ty", action);
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
VerticalScrollBarEnabled = false,
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
index bb118a5..053765d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
@@ -38,22 +38,24 @@
};
page.LoadPage(brand_Iot);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- new TopViewDiv(bodyView, brand_Iot.brandName).LoadTopView_3tyIot(action);
+ };
+ var topView = new TopViewDiv(bodyView, brand_Iot.brandName);
+ topView.maginY = 10;
+ topView.LoadTopView_3tyIot(action);
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
bodyView.AddChidren(new Button
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
Button btnTipText = new Button()
{
- Y = Application.GetRealHeight(80),
+ Y = Application.GetRealHeight(80+10),
Width = Application.GetRealWidth(347),
Height = Application.GetRealHeight(65),
Gravity = Gravity.CenterHorizontal,
@@ -74,8 +76,8 @@
contentView = new FrameLayout()
{
- Y = Application.GetRealHeight(150),
- Height = Application.GetRealHeight(573),
+ Y = Application.GetRealHeight(150+10),
+ Height = Application.GetRealHeight(573-10),
};
bodyView.AddChidren(contentView);
@@ -353,7 +355,7 @@
var btnTip = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(180),
Height = Application.GetRealWidth(180),
UnSelectedImagePath = "TipNot.png",
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs
index 6ac1e9a..46448a5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs
@@ -26,22 +26,24 @@
public void LoadPage()
{
-
- new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount)).LoadTopView(CSS_Color.MainBackgroundColor);
+
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount));
+ topView.maginY = 10;
+ topView.LoadTopView(CSS_Color.MainBackgroundColor);
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
bodyView.AddChidren(new Button
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
Button btnTipText = new Button()
{
- Y = Application.GetRealHeight(80),
+ Y = Application.GetRealHeight(80+10),
Width = Application.GetRealWidth(347),
Height = Application.GetRealHeight(65),
Gravity = Gravity.CenterHorizontal,
@@ -63,8 +65,8 @@
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(150),
- Height = Application.GetRealHeight(573),
+ Y = Application.GetRealHeight(150+10),
+ Height = Application.GetRealHeight(573-10),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_SupportSpkListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_SupportSpkListPage.cs
deleted file mode 100644
index eadaa43..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_SupportSpkListPage.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing System;
-using HDL_ON.Entity;
-using Shared;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 鏀寔鐨勭涓夋柟骞冲彴璁惧鍒楄〃鐣岄潰
- /// </summary>
- public class Iot_SupportSpkListPage : FrameLayout
- {
- private FrameLayout bodyView;
-
- IntegratedBrand_Iot brand_Iot;
-
- public Iot_SupportSpkListPage()
- {
- bodyView = this;
- }
-
- public void LoadPage()
- {
-
- }
- }
-}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs
deleted file mode 100644
index b292e9d..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-锘�//using System;
-//using System.Collections.Generic;
-//using HDL_ON.Entity;
-//using HDL_ON.UI.CSS;
-//using Shared;
-//namespace HDL_ON.UI
-//{
-// public class ThirdPartyBrandListPage : FrameLayout
-// {
-
-// FrameLayout bodyView;
-// FrameLayout contentView;
-// Button btnAdd;
-
-// public ThirdPartyBrandListPage()
-// {
-// bodyView = this;
-// }
-
-// public void LoadPage()
-// {
-// new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();
-
-// contentView = new FrameLayout()
-// {
-// Y = Application.GetRealHeight(64),
-// Height = Application.GetRealHeight(667-64),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// bodyView.AddChidren(contentView);
-
-// AddEmptyTipView();
-
-// Button btnTipMsg = new Button()
-// {
-// Height = Application.GetRealHeight(17 + 24),
-// Y = Application.GetRealHeight(535 - 12),
-// TextColor = CSS_Color.TextualColor,
-// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-// TextAlignment = TextAlignment.Center,
-// TextID = StringId.TipAddThirdPartyDeviceMsg,
-// };
-// bodyView.AddChidren(btnTipMsg);
-
-// btnAdd = new Button()
-// {
-// Gravity = Gravity.CenterHorizontal,
-// Y = Application.GetRealHeight(564),
-// Width = Application.GetRealWidth(220),
-// Height = Application.GetRealWidth(44),
-// Radius = (uint)Application.GetRealWidth(22),
-// BackgroundColor = CSS_Color.MainColor,
-// TextAlignment = TextAlignment.Center,
-// TextColor = CSS_Color.MainBackgroundColor,
-// TextID = StringId.Add,
-// };
-// bodyView.AddChidren(btnAdd);
-
-// LoadEvent_SikpAddBrand();
-// }
-
-// /// <summary>
-// /// 娣诲姞鍐呭涓虹┖鎻愮ず椤甸潰
-// /// </summary>
-// void AddEmptyTipView()
-// {
-// var emptyTipView = new FrameLayout()
-// {
-// Height =Application.GetRealWidth(470),
-// Width = contentView.Width,
-// };
-// contentView.AddChidren(emptyTipView);
-
-// var tipView = new EmptyTipView(Language.StringByID(StringId.TipNotThirdPartyDevice))
-// {
-// Gravity = Gravity.Center
-// };
-// emptyTipView.AddChidren(tipView);
-// }
-// /// <summary>
-// /// 璺宠浆缁戝畾绗笁鏂瑰搧鐗岀晫闈�
-// /// </summary>
-// void LoadEvent_SikpAddBrand()
-// {
-// btnAdd.MouseUpEventHandler = (sender, e) => {
-// var page = new AddThirdPartyBrandListpage();
-// MainPage.BasePageView.AddChidren(page);
-// page.LoadPage();
-// MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-// };
-// }
-// }
-//}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
index 7fe2ade..9fa0b37 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
@@ -27,15 +27,17 @@
public void LoadPage(IntegratedBrand_Iot brand_Iot)
{
- new TopViewDiv(bodyView, brand_Iot.brandName).LoadTopView(CSS_Color.MainBackgroundColor);
+ var topView = new TopViewDiv(bodyView, brand_Iot.brandName);
+ topView.maginY = 10;
+ topView.LoadTopView(CSS_Color.MainBackgroundColor);
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
var contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
BackgroundColor = CSS_Color.BackgroundColor,
- Height = Application.GetRealHeight(667 - 124)
+ Height = Application.GetRealHeight(667 - 124 - 10)
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
index c4df7f8..3a6090b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
@@ -87,7 +87,10 @@
public void InitView_PreRelease()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.CancelAccount)).LoadTopView(CSS_Color.MainBackgroundColor);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.CancelAccount));
+ topView.maginY = 10;
+ topView.LoadTopView(CSS_Color.MainBackgroundColor);
+
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
var textView = new Button()
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddCombineDimmingPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddCombineDimmingPage.cs
deleted file mode 100644
index b5611fd..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddCombineDimmingPage.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-锘�//using System;
-//using Shared;
-//using HDL_ON.Entity;
-//using HDL_ON.UI.CSS;
-
-//namespace HDL_ON.UI
-//{
-// public class AddCombineDimmingPage : FrameLayout
-// {
-// FrameLayout bodyView;
-
-
-// GroupControl groupControl;
-
-// public AddCombineDimmingPage()
-// {
-// bodyView = this;
-// groupControl = new GroupControl();
-// }
-
-// public void LoadPage()
-// {
-// new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
-
-// var contentView = new FrameLayout()
-// {
-// Y = Application.GetRealHeight(64),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// Height = Application.GetRealHeight(550),
-// };
-// bodyView.AddChidren(contentView);
-
-// #region 缁勫悕绉�
-// FrameLayout groupNameView;
-// groupNameView = new FrameLayout()
-// {
-// Height = Application.GetRealHeight(50),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// contentView.AddChidren(groupNameView);
-// Button btnGroupNameTitle = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// Width = Application.GetRealWidth(78),
-// TextID = StringId.GroupNmae,
-// TextAlignment = TextAlignment.CenterLeft,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// };
-// groupNameView.AddChidren(btnGroupNameTitle);
-
-// var btnGroupName = new EditText()
-// {
-// X = Application.GetRealWidth(155),
-// Width = Application.GetRealWidth(200),
-// PlaceholderText =Language.StringByID( StringId.PlsEntry),
-// TextSize = CSS_FontSize.TextFontSize,
-// TextAlignment = TextAlignment.CenterRight,
-// TextColor = CSS_Color.TextualColor,
-// };
-// groupNameView.AddChidren(btnGroupName);
-
-// groupNameView.AddChidren(
-// new Button()
-// {
-// Gravity = Gravity.CenterHorizontal,
-// Y = Application.GetRealHeight(49),
-// Height = Application.GetRealHeight(1),
-// Width = Application.GetRealWidth(343),
-// BackgroundColor = CSS_Color.DividingLineColor,
-// });
-// #endregion
-// #region 浣嶇疆绠＄悊
-// var locationMagtView = new FrameLayout()
-// {
-// Height = Application.GetRealHeight(55),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// contentView.AddChidren(locationMagtView);
-
-// var btnLocationMagtTitle = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// Width = Application.GetRealWidth(160),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// TextID = StringId.LocationManagement,
-// };
-// locationMagtView.AddChidren(btnLocationMagtTitle);
-
-// var btnLocationValues = new Button()
-// {
-// X = Application.GetRealWidth(86),
-// Width = Application.GetRealWidth(237),
-// TextAlignment = TextAlignment.CenterRight,
-// TextColor = CSS_Color.PromptingColor1,
-// TextSize = CSS_FontSize.TextFontSize,
-// Text = groupControl.GetRoomListName(),
-// };
-// locationMagtView.AddChidren(btnLocationValues);
-
-// var btnLocationInfoRight = new Button()
-// {
-// X = Application.GetRealWidth(339),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetMinRealAverage(16),
-// Height = Application.GetMinRealAverage(16),
-// UnSelectedImagePath = "Public/RightIcon.png",
-// };
-// locationMagtView.AddChidren(btnLocationInfoRight);
-// EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
-// {
-// //淇敼鍔熻兘鎵�灞炴埧闂翠箣鍚庣殑鍥炶皟浜嬩欢
-// Action chooseRoomBackAction = () => {
-// try
-// {
-// btnLocationValues.Text = groupControl.GetRoomListName();
-// }
-// catch { }
-// };
-// var view = new GroupChooseRoomPage(groupControl, chooseRoomBackAction);
-// MainPage.BasePageView.AddChidren(view);
-// view.LoadPage();
-// MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-// };
-// if (btnLocationInfoRight != null)
-// {
-// btnLocationInfoRight.MouseUpEventHandler = eventHandler;
-// }
-// if (btnLocationValues != null)
-// {
-// btnLocationValues.MouseUpEventHandler = eventHandler;
-// }
-
-// locationMagtView.AddChidren(
-// new Button()
-// {
-// Gravity = Gravity.CenterHorizontal,
-// BackgroundColor = CSS_Color.DividingLineColor,
-// Width = Application.GetRealWidth(343),
-// Height = Application.GetRealHeight(1)
-// });
-// #endregion
-
-// #region 璁惧閫夋嫨
-// contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
-
-// var chooseFunctionTitleView = new FrameLayout()
-// {
-// Height = Application.GetRealHeight(44),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// contentView.AddChidren(chooseFunctionTitleView);
-// contentView.AddChidren(
-// new Button()
-// {
-// Gravity = Gravity.CenterHorizontal,
-// Y = Application.GetRealHeight(49),
-// Height = Application.GetRealHeight(1),
-// Width = Application.GetRealWidth(343),
-// BackgroundColor = CSS_Color.DividingLineColor,
-// });
-
-// var btnChooseFunctionTitle = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextColor = CSS_Color.MainColor,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// IsBold = true,
-// TextID = StringId.SelectGroupControlFunction,
-// };
-// chooseFunctionTitleView.AddChidren(btnChooseFunctionTitle);
-
-// var deviceListView = new VerticalScrolViewLayout()
-// {
-// Height = Application.GetRealHeight(387),
-// };
-// contentView.AddChidren(deviceListView);
-
-// foreach(var function in FunctionList.List.GetLightList())
-// {
-// var functionRow = new FrameLayout()
-// {
-// Height = Application.GetRealHeight(65),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// deviceListView.AddChidren(functionRow);
-
-// var btnFunctionName = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// Y = Application.GetRealHeight(10),
-// Width = Application.GetRealWidth(308),
-// Height = Application.GetRealHeight(24),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// Text = function.name,
-// };
-// functionRow.AddChidren(btnFunctionName);
-
-// var btnFunctionLocationInfo = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// Y = btnFunctionName.Bottom,
-// Width = Application.GetRealWidth(308),
-// Height = Application.GetRealHeight(21),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-// TextColor = CSS_Color.PromptingColor1,
-// Text = function.GetRoomListName(),
-// };
-// functionRow.AddChidren(btnFunctionLocationInfo);
-
-
-
-
-// }
-
-
-// #endregion
-
-// #region 搴曢儴纭鎸夐挳
-
-
-
-// var bottomView = new FrameLayout()
-// {
-// Y = Application.GetRealHeight(591),
-// Height = Application.GetRealHeight(106),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// Radius = (uint)Application.GetRealWidth(16),
-// };
-// bodyView.AddChidren(bottomView);
-
-// var btnConfrim = new Button()
-// {
-// Gravity = Gravity.CenterHorizontal,
-// Y = Application.GetRealHeight(12),
-// Width = Application.GetRealWidth(220),
-// Height = Application.GetRealWidth(44),
-// TextAlignment = TextAlignment.Center,
-// TextColor = CSS_Color.MainBackgroundColor,
-// BackgroundColor = CSS_Color.MainColor,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// IsBold = true,
-// Radius = (uint)Application.GetRealWidth(22),
-// TextID = StringId.Complete
-// };
-// bottomView.AddChidren(btnConfrim);
-
-// btnConfrim.MouseUpEventHandler = (sender, e) =>
-// {
-
-// };
-
-// #endregion
-
-
-// }
-// }
-//}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index 1066e2f..5fef359 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -92,11 +92,15 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
if (isAdd)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
+ topView.maginY = 10;
+ topView.LoadTopView();
}
else
{
- new TopViewDiv(bodyView, "").LoadTopView_SettingText(()=> {
+ var topView = new TopViewDiv(bodyView, "");
+ topView.maginY = 10;
+ topView.LoadTopView_SettingText(()=> {
Action action = () => {
var waitPage = new Loading();
@@ -158,8 +162,8 @@
}
var contentView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667-64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667-64-10),
};
bodyView.AddChidren(contentView);
@@ -371,7 +375,7 @@
functionListView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(220),
- Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100),
+ Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100-10),
};
bodyView.AddChidren(functionListView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
index 351bee9..1c9c47a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -22,7 +22,9 @@
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView_AddIcon("CombinedDimming",
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
+ topView.maginY = 10;
+ topView.LoadTopView_AddIcon("CombinedDimming",
(s, c) =>
{
try
@@ -44,8 +46,8 @@
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
index c4ed617..4ca1413 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
@@ -60,12 +60,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming));
+ topView.maginY = 10;
+ topView.LoadTopView();
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
index f92dd5d..505447f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
@@ -66,14 +66,17 @@
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.FacePassage)).LoadTopView();
+ var topNavView = new TopViewDiv(bodyView, Language.StringByID(StringId.FacePassage));
+ topNavView.maginY = 10;
+ topNavView.LoadTopView();
+
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
contentView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64 - 10),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index 8704a24..b79d50f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -34,11 +34,13 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember));
+ topView.maginY = 10;
+ topView.LoadTopView();
var btnMemberName = new Button()
{
- Y = Application.GetRealHeight(70),
+ Y = Application.GetRealHeight(70+10),
X = Application.GetRealWidth(16),
Height = Application.GetRealHeight(32),
TextColor = CSS_Color.FirstLevelTitleColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs
deleted file mode 100644
index 99001ef..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-锘�//using System.Collections.Generic;
-//using HDL_ON.DAL.Server;
-//using HDL_ON.Entity;
-//using HDL_ON.UI.CSS;
-//using Shared;
-
-//namespace HDL_ON.UI
-//{
-// /// <summary>
-// /// 鍔犺浇闇�瑕佸垎浜埌瀛愯处鍙风殑閫夋嫨鐣岄潰
-// /// </summary>
-// public partial class ChooseShareMemberTargetListPage : FrameLayout
-// {
-// ChooseShareMemberTargetListPage bodyView;
-// VerticalScrolViewLayout contentView;
-// Button btnOption;
-
-// Loading waitPage;
-// List<ShareData> addFuns;
-// List<ResidenceMemberInfo> memberList;
-// ResidenceMemberInfo memberInfo;
-
-// public ChooseShareMemberTargetListPage(List<ShareData> funs, ResidenceMemberInfo mInfo)
-// {
-// memberList = new List<ResidenceMemberInfo>();
-// addFuns = funs;
-// bodyView = this;
-// memberInfo = mInfo;
-// }
-
-// public void LoadPage()
-// {
-// //鍒涘缓璇诲彇鎴愬憳璐﹀彿绾跨▼
-// var thread = LoadThread_GetResidenceMemberAccount();
-// waitPage = new Loading();
-// new PublicAssmebly().LoadPage_WaitPage(thread, bodyView, waitPage);
-
-// bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-// new TopViewDiv(bodyView, Language.StringByID(StringId.Shared)).LoadTopView();
-
-// #region title view
-// FrameLayout titleView = new FrameLayout()
-// {
-// Y = Application.GetRealHeight(72),
-// Height = Application.GetRealHeight(44),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// bodyView.AddChidren(titleView);
-
-// Button btnTitle = new Button()
-// {
-// X = Application.GetRealWidth(16),
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextID = StringId.SharedTo,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// TextAlignment = TextAlignment.CenterLeft,
-// IsBold = true,
-// };
-// titleView.AddChidren(btnTitle);
-
-// titleView.AddChidren(new Button() {
-// X = Application.GetRealWidth(16),
-// Y = Application.GetRealHeight(43),
-// Height = Application.GetRealHeight(1),
-// BackgroundColor = CSS_Color.DividingLineColor,
-// });
-// #endregion
-
-// contentView = new VerticalScrolViewLayout()
-// {
-// Y = titleView.Bottom,
-// Height = Application.GetRealHeight(420),
-// //BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// bodyView.AddChidren(contentView);
-
-// LoadMemberRow();
-
-// btnOption = new Button()
-// {
-// Y = Application.GetRealHeight(519 + 64),
-// Gravity = Gravity.CenterHorizontal,
-// Width = Application.GetRealWidth(220),
-// Height = Application.GetRealWidth(44),
-// BackgroundColor = CSS_Color.MainColor,
-// TextAlignment = TextAlignment.Center,
-// TextColor = CSS_Color.MainBackgroundColor,
-// TextID = StringId.ConfirmShared,
-// TextSize = CSS_FontSize.SubheadingFontSize,
-// IsBold = true,
-// Radius = (uint)Application.GetRealWidth(22),
-// BorderColor = 0x00000000,
-// BorderWidth = 0,
-// };
-// bodyView.AddChidren(btnOption);
-
-// LoadEvent_SharedData();
-// }
-
-// /// <summary>
-// /// 鍔犺浇鎴愬憳鍒楄〃鍖哄煙
-// /// </summary>
-// void LoadMemberRow()
-// {
-// contentView.RemoveAll();
-
-// int index = 1;
-// foreach (var mInfo in memberList)
-// {
-// FrameLayout memberRow = new FrameLayout()
-// {
-// Height = Application.GetRealWidth(65),
-// BackgroundColor = CSS_Color.MainBackgroundColor,
-// };
-// contentView.AddChidren(memberRow);
-
-// var memberHeadImageView = new ImageView()
-// {
-// X = Application.GetRealWidth(16),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetMinRealAverage(36),
-// Height = Application.GetMinRealAverage(36),
-// Radius = (uint)Application.GetMinRealAverage(24),
-// ImagePath = mInfo.headImagePagePath,
-// };
-// memberRow.AddChidren(memberHeadImageView);
-
-// Button btnMemberName = new Button()
-// {
-// X = Application.GetRealWidth(64),
-// Y = Application.GetRealWidth(10),
-// //Width = Application.GetRealWidth(300),
-// Height = Application.GetRealWidth(24),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextColor = CSS_Color.FirstLevelTitleColor,
-// TextSize = CSS_FontSize.TextFontSize,
-// Text = mInfo.UserName,
-// };
-// memberRow.AddChidren(btnMemberName);
-
-// Button btnMemberMail = new Button()
-// {
-// X = Application.GetRealWidth(64),
-// Y = btnMemberName.Bottom,
-// //Width = Application.GetRealWidth(300),
-// Height = Application.GetRealWidth(21),
-// TextAlignment = TextAlignment.CenterLeft,
-// TextColor = CSS_Color.PromptingColor1,
-// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-// Text = mInfo.Account,
-// };
-// memberRow.AddChidren(btnMemberMail);
-
-// Button btnChoose = new Button()
-// {
-// X = Application.GetRealWidth(331),
-// Gravity = Gravity.CenterVertical,
-// Width = Application.GetMinRealAverage(28),
-// Height = Application.GetMinRealAverage(28),
-// UnSelectedImagePath = "Public/ChooseIcon.png",
-// SelectedImagePath = "Public/ChooseOnIcon.png",
-// IsSelected = true,
-// };
-// memberRow.AddChidren(btnChoose);
-
-// if (memberList.Count > index)
-// {
-// memberRow.AddChidren(new Button()
-// {
-// Y = Application.GetRealHeight(64),
-// Gravity = Gravity.CenterHorizontal,
-// Width = Application.GetRealWidth(343),
-// Height = Application.GetRealHeight(1),
-// BackgroundColor = CSS_Color.DividingLineColor,
-// });
-// }
-// index++;
-
-// var eventHandler = LoadEvent_ChangeSharedList(btnChoose, mInfo);
-// btnChoose.MouseUpEventHandler = eventHandler;
-// btnMemberName.MouseUpEventHandler = eventHandler;
-// btnMemberMail.MouseUpEventHandler = eventHandler;
-// }
-// }
-// }
-//}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
index db9bf9a..8321a12 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
@@ -29,12 +29,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
- new TopViewDiv(bodyView, memberInfo.nickName).LoadTopView();
+ var topView = new TopViewDiv(bodyView, memberInfo.nickName);
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 浜鸿劯绠＄悊
var btnMemberFaceTitle = new Button()
{
- Y = Application.GetRealHeight(80),
+ Y = Application.GetRealHeight(80+10),
X = Application.GetRealWidth(16),
Height = Application.GetRealHeight(32),
TextColor = CSS_Color.FirstLevelTitleColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
index d4f4569..beb7360 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -84,11 +84,13 @@
public void LoadPage(int tId)
{
titleId = tId;
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
+ topView.maginY = 10;
+ topView.LoadTopView();
allRoomView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -128,8 +130,8 @@
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64+50),
- Height = Application.GetRealHeight(450),
+ Y = Application.GetRealHeight(64+50+10),
+ Height = Application.GetRealHeight(450-10),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index d008e3f..96c583b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -29,24 +29,6 @@
//鏄惁闇�瑕佷繚瀛�
new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
- //if (titleId == StringId.PermissionToUse)//浠庝釜浜轰腑蹇冭繘鍏ュ崟鐙垎浜�
- //{
- // Action action = () =>
- // {
- // UploadShareDeviceList();
- // };
- // //鏄惁闇�瑕佷繚瀛�
- // new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
- //}
- //else
- //{
- // //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
- // //2020-12-01 灞忚斀椤甸潰
- // //var page = new ChooseShareMemberTargetListPage(funs_New, memberInfo);
- // //MainPage.BasePageView.AddChidren(page);
- // //page.LoadPage();
- // //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //}
};
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index 4cad50b..436cf68 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -53,7 +53,9 @@
mmp.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_MemberTopView(refreshAction, backAction);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement));
+ topView.maginY = 10;
+ topView.LoadTopView_MemberTopView(refreshAction, backAction);
contentView = new VerticalScrolViewLayout()
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index dcf64c7..0d70570 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -31,11 +31,13 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.MemberPermissionManagement)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MemberPermissionManagement));
+ topView.maginY = 10;
+ topView.LoadTopView();
FrameLayout headPortraitView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(66),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
index 862fb16..a24f74f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
@@ -24,7 +24,9 @@
public void LoadPage(bool isStartCheckResidenceThread = false)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.MyQRcode)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MyQRcode));
+ topView.maginY = 10;
+ topView.LoadTopView();
int backViewHeight = Application.GetRealHeight(132) + Application.GetRealWidth(266);
FrameLayout backView = new FrameLayout()
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
index e858618..001bc82 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
@@ -21,11 +21,13 @@
{
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
//鏈嶅姟鍣ㄤ俊鎭�
- new TopViewDiv(bodyView, Language.StringByID(StringId.ServerInformation)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.ServerInformation));
+ topView.maginY = 10;
+ topView.LoadTopView();
ImageView imageView = new ImageView()
{
- Y = Application.GetMinRealAverage(88),
+ Y = Application.GetMinRealAverage(88+10),
Width = Application.GetMinRealAverage(200),
Height = Application.GetMinRealAverage(180),
ImagePath = "PersonalCenter/ServerInfo.png",
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index be1fc7d..f27995e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -270,6 +270,7 @@
BorderColor = CSS.CSS_Color.DividingLineColor,
BorderWidth = 3,
TextColor = CSS.CSS_Color.TextualColor,
+ Radius = 1,
};
searchView.AddChidren(searchTv);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 7745f79..1228ec0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -228,13 +228,15 @@
public void LoadView()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter));
+ topView.maginY = 10;
+ topView.LoadTopView();
bodyScrolView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
VerticalScrollBarEnabled = false,
- Height = Application.GetRealHeight(551),
+ Height = Application.GetRealHeight(551-10),
};
bodyView.AddChidren(bodyScrolView);
@@ -262,7 +264,7 @@
};
headPortraitView.AddChidren(userHeadImageView);
-#region 涓汉淇℃伅閫夐」鍖哄煙
+ #region 涓汉淇℃伅閫夐」鍖哄煙
var topPaddingView = new FrameLayout()
{
Height = Application.GetRealHeight(8)
@@ -296,7 +298,7 @@
optionListView.Height = Application.GetRealHeight(51 * (6 + addRow));
-#region 涓汉閫夐」-鍚嶅瓧鍖哄煙
+ #region 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// <summary>
/// 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// </summary>
@@ -344,8 +346,8 @@
};
userNameView.AddChidren(btnEditUserNameIcon);
optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
-#endregion
-#region 涓汉閫夐」-浜岀淮鐮佸尯鍩�
+ #endregion
+ #region 涓汉閫夐」-浜岀淮鐮佸尯鍩�
/// <summary>
/// 涓汉閫夐」-浜岀淮鐮佸尯鍩�
/// </summary>
@@ -392,8 +394,8 @@
UnSelectedImagePath = "Public/Right.png",
};
_QRcodeView.AddChidren(btnQRcodeRight);
-#endregion
-#region 涓汉閫夐」-閭淇℃伅鍖哄煙
+ #endregion
+ #region 涓汉閫夐」-閭淇℃伅鍖哄煙
/// <summary>
/// 涓汉閫夐」-閭淇℃伅鍖哄煙
/// </summary>
@@ -441,7 +443,7 @@
};
userEmailInfoView.AddChidren(btnUserEmailRight);
optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
-#endregion
+ #endregion
#region 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙
/// <summary>
/// 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙
@@ -854,7 +856,14 @@
logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
logOffView.LineView.RemoveFromParent();
-#endregion
+ #endregion
+
+ bodyView.AddChidren(new Button()
+ {
+ Y = Application.GetRealHeight(622),
+ Height = 1,
+ BackgroundColor = CSS_Color.DividingLineColor,
+ });
btnLogout = new Button()
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 2866fb5..e84a5cb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -41,111 +41,6 @@
};
}
- ///// <summary>
- ///// 閫�鍑虹櫥褰曟搷浣�
- ///// </summary>
- //void Logout()
- //{
- // #region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す
- // string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- // new System.Threading.Thread(() =>
- // {
- // try
- // {
- // var backuplist = FileUtils.ReadFiles();
- // //绉诲姩鏂囦欢
- // foreach (var fileName in backuplist)
- // {
- // System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
- // if (fileInfo.Exists)
- // {
- // fileInfo.MoveTo(oldRegionRootPath + fileName);
- // MainPage.Log("move file : " + fileName);
- // }
- // }
- // FileUtils.DeleteRegionFiles(oldRegionRootPath);
- // }
- // catch (Exception ex)
- // {
- // MainPage.Log($"xxx:{ex.Message}");
- // }
- // finally
- // {
- // FileUtils.DeleteAllFile();
- // }
- // }).Start();
- // #endregion
-
- // //2.娉ㄩ攢鎺ㄩ��
- // new HttpServerRequest().SignOutPush();
- // //3.璺宠浆鐧诲綍椤甸潰
- // UserInfo.Current.LastTime = DateTime.MinValue;
- // UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
- // UserInfo.Current.SaveUserInfo();
- // MainPage.GoLoginPage(UserInfo.Current);
- // DB_ResidenceData.residenceData.EixtAccount();
- //}
-
- ///// <summary>
- ///// 閫�鍑虹櫥褰曟搷浣�
- ///// </summary>
- //public void LogoutNew()
- //{
- // //鍔犺浇Loading鏁堟灉
- // var waitPage = new Loading();
- // bodyView.AddChidren(waitPage);
- // waitPage.Start(Language.StringByID(StringId.PleaseWait));
-
- // new Thread(() =>
- // {
- // try
- // {
- // #region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す
- // //string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- // ////娓呯┖涔嬪墠鐨勪綇瀹呮枃浠�
- // //FileUtils.DeleteRegionFiles(oldRegionRootPath);
- // //var backuplist = FileUtils.ReadFiles();
- // ////绉诲姩鏂囦欢
- // //foreach (var fileName in backuplist)
- // //{
- // // System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
- // // if (fileInfo.Exists)
- // // {
- // // fileInfo.MoveTo(oldRegionRootPath + fileName);
- // // MainPage.Log("move file : " + fileName);
- // // }
- // //}
- // #endregion
- // }
- // catch (Exception ex)
- // {
- // MainPage.Log($"xxx:{ex.Message}");
- // }
- // finally
- // {
- // //FileUtils.DeleteAllFile();
- // //2.娉ㄩ攢鎺ㄩ��
- // new HttpServerRequest().SignOutPush();
- // //3.璺宠浆鐧诲綍椤甸潰
- // UserInfo.Current.LastTime = DateTime.MinValue;
- // UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
- // UserInfo.Current.SaveUserInfo();
- // Shared.Application.RunOnMainThread(() =>
- // {
- // if (waitPage != null)
- // {
- // waitPage.RemoveFromParent();
- // waitPage = null;
- // }
-
- // MainPage.GoLoginPage(UserInfo.Current);
- // DB_ResidenceData.residenceData.EixtAccount();
-
- // });
- // }
- // }).Start();
- //}
-
/// <summary>
/// 閫�鍑鸿处鍙风櫥褰曚簨浠�
/// </summary>
@@ -452,7 +347,7 @@
btnQRcodeRight.MouseUpEventHandler = eventHandler;
}
-#region 淇敼缁戝畾閭
+ #region 淇敼缁戝畾閭
/// <summary>
/// 淇敼缁戝畾閭
/// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
index 7b49246..2429551 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
@@ -67,13 +67,15 @@
isHitBack = true;
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.ModifyPassword)).LoadTopView(backAction);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.ModifyPassword));
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 鍘熷瘑鐮�
FrameLayout oldPwdView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -132,7 +134,6 @@
TextSize = CSS_FontSize.TextFontSize,
SecureTextEntry = true,
TextAlignment = TextAlignment.CenterRight,
- Foucs = true
};
rowView.AddChidren(etPassword);
var lineView = new LineView(rowView.Height);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index 8b430ad..e956e63 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -99,12 +99,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.ResidenceManage)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.ResidenceManage));
+ topView.maginY = 10;
+ topView.LoadTopView();
VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
ScrollEnabled = false,
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs
index 4b29afa..57aba67 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs
@@ -49,9 +49,11 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.SmartSpeaker)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SmartSpeaker));
+ topView.maginY = 10;
+ topView.LoadTopView();
- int bodyY = Application.GetRealHeight(64);
+ int bodyY = Application.GetRealHeight(64+10);
bodyScrolView = new VerticalScrolViewLayout()
{
Y = bodyY,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
index 2443d5c..314964b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs
@@ -44,9 +44,11 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement));
+ topView.maginY = 10;
+ topView.LoadTopView();
- int bodyY = Application.GetRealHeight(64);
+ int bodyY = Application.GetRealHeight(64+10);
bodyScrolView = new VerticalScrolViewLayout()
{
Y = bodyY,
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/TvControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/TvControlPage.cs
index f38036f..24d6ce8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/TvControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/TvControlPage.cs
@@ -53,7 +53,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
@@ -76,7 +76,7 @@
#region 杞洏鎺у埗鍖哄煙
topMenuView = new FrameLayout()
{
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(199),
Height = Application.GetRealWidth(199),
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 4094b80..297105a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -92,7 +92,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
index 9f4b9b4..3088b95 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
@@ -41,14 +41,16 @@
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(527),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(527-10),
};
bodyView.AddChidren(contentView);
if (string.IsNullOrEmpty(title))
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddSecurity)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddSecurity));
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 甯冮槻淇℃伅
var deploymentTitleRow = new FrameLayout()
{
@@ -166,7 +168,9 @@
}
else
{
- new TopViewDiv(bodyView, title).LoadTopView();
+ var topView = new TopViewDiv(bodyView, title);
+ topView.maginY = 10;
+ topView.LoadTopView();
securityAlarm.status = "enable";
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
index 4f83b31..e0bfecc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
@@ -29,12 +29,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddDefenseFunction)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDefenseFunction));
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 鏄剧ず鐨勫姛鑳界被鍨嬪垏鎹㈠尯鍩�
var showdFunctionTypeRow = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(53),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -81,13 +83,19 @@
}, nowSelectId);
};
+ showdFunctionTypeRow.AddChidren(new Button() {
+ Height = 1,
+ Y = Application.GetRealHeight(52),
+ BackgroundColor = CSS_Color.DividingLineColor
+ });
+
#endregion
functionListView = new VerticalScrolViewLayout()
{
Y = showdFunctionTypeRow.Bottom,
- Height = Application.GetRealHeight(530-60),
+ Height = Application.GetRealHeight(530-60-10),
BackgroundColor = CSS_Color.BackgroundColor,
};
bodyView.AddChidren(functionListView);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs
index e1dd248..e5fa65d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs
@@ -51,13 +51,15 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction));
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 鏄剧ず鐨勫姛鑳界被鍨嬪垏鎹㈠尯鍩�
showdFunctionTypeRow = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(62),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(53),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(showdFunctionTypeRow);
@@ -87,12 +89,21 @@
showdFunctionTypeRow.AddChidren(btnFloor);
LoadDialog_ChangeFloor();
+
+ showdFunctionTypeRow.AddChidren(new Button()
+ {
+ Height = 1,
+ Y = Application.GetRealHeight(52),
+ BackgroundColor = CSS_Color.DividingLineColor
+ });
+
+
#endregion
functionListView = new VerticalScrolViewLayout()
{
Y = showdFunctionTypeRow.Bottom,
- Height = Application.GetRealHeight(530 - 100),
+ Height = Application.GetRealHeight(530-60-10),
BackgroundColor = CSS_Color.BackgroundColor,
};
bodyView.AddChidren(functionListView);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index a692dae..417d640 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -65,12 +65,14 @@
};
if (addNav)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.SecurityCenter)).LoadTopView_ArmCenter(skipAction);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SecurityCenter));
+ topView.maginY = 10;
+ topView.LoadTopView_ArmCenter(skipAction);
}
VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
{
- Y = addNav? Application.GetRealHeight(64):0,
- Height = Application.GetRealHeight(667 - 64),
+ Y = addNav? Application.GetRealHeight(64+10):0,
+ Height = Application.GetRealHeight(667 - 64-10),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs
index 346e2d3..078c574 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs
@@ -15,14 +15,16 @@
}
public void Show(Entity.SecurityAlarm alarm)
{
-
- new TopViewDiv(bodyView, Language.StringByID(StringId.fasongtongzhi)).LoadTopView();
+
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.fasongtongzhi));
+ topView.maginY = 10;
+ topView.LoadTopView();
this.BackgroundColor = CSS.CSS_Color.BackgroundColor;
var viewLayout = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(527),
};
bodyView.AddChidren(viewLayout);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index d0d0372..118ee74 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -57,12 +57,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement));
+ topView.maginY = 10;
+ topView.LoadTopView();
contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
};
bodyView.AddChidren(contentView);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
index f294bd6..1cbcd2b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
@@ -95,7 +95,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
index 050f0b1..d9bb494 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
@@ -66,7 +66,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
index 7c9b864..d6ba2ca 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -90,7 +90,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
index 6b29c6f..0448c0c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -88,7 +88,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPage.cs
index 47c9da5..6616c72 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPage.cs
@@ -90,7 +90,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
index a1a754e..a12ecd9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
@@ -85,7 +85,7 @@
controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
index 8124d16..69548cd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
@@ -85,7 +85,7 @@
controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs
index 9049d4e..a923807 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs
@@ -72,7 +72,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
@@ -127,7 +127,7 @@
#region 杞洏鎺у埗鍖哄煙
topMenuView = new FrameLayout()
{
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(199),
Height = Application.GetRealWidth(199),
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
index 1c96354..16c49cf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
@@ -59,7 +59,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
index 11604ef..5673e6b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
@@ -42,7 +42,7 @@
btnIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(134),
Height = Application.GetRealWidth(134),
UnSelectedImagePath = "FunctionIcon/IrFan/FanIcon.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
index ce95adc..58859d2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
@@ -74,7 +74,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
@@ -129,7 +129,7 @@
#region 杞洏鎺у埗鍖哄煙
topMenuView = new FrameLayout()
{
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(199),
Height = Application.GetRealWidth(199),
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index 6e5f982..a3fb826 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -59,7 +59,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
index 4e8852d..cb8824c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs
@@ -73,7 +73,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
@@ -128,7 +128,7 @@
#region 杞洏鎺у埗鍖哄煙
topMenuView = new FrameLayout()
{
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(199),
Height = Application.GetRealWidth(199),
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
index b0ee9af..f34efd5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -74,7 +74,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
@@ -129,7 +129,7 @@
#region 杞洏鎺у埗鍖哄煙
topMenuView = new FrameLayout()
{
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(199),
Height = Application.GetRealWidth(199),
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 3eb5f49..4f8edc6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -106,7 +106,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index 97c64ec..d9ae722 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -72,11 +72,14 @@
public void LoadPage(bool locationSetting = true)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Setting));
+ topView.maginY = 10;
+ topView.LoadTopView();
+
var contentView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(600),
ScrollEnabled = false,
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
index 887adeb..d5c0ef9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -87,7 +87,7 @@
controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
index 7904d1d..741453a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -81,7 +81,7 @@
controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs
index 96465f1..107c8a3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs
@@ -48,7 +48,7 @@
controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 4560904..a9e30ac 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -100,7 +100,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPage.cs
index 28473f2..32a977e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPage.cs
@@ -88,7 +88,7 @@
FrameLayout controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
index 1bb8d06..bd7e630 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -80,7 +80,7 @@
controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
--
Gitblit v1.8.0