From ace942d3f082a8a9687cf65337ee1c342a5c9bd8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 10 一月 2022 11:09:32 +0800
Subject: [PATCH] 备份更新
---
HDL-ON_Android/Properties/AndroidManifest.xml | 6
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 4
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 57 ++++-
HDL-ON_Android/Assets/Language.ini | 6
HDL_ON/HDL_ON.projitems | 1
HDL-ON_Android/HDL-ON_Android.csproj | 6
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs | 2
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 7
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 8
HDL_ON/UI/UI0-Public/Widget/ListCellView.cs | 3
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 30 +-
HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs | 201 ++++++++++++++++++++
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 126 +++++++-----
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI1-Login/LoginPage.cs | 1
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 28 +-
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 49 ++++
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 1
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 8
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs | 5
HDL_ON/Entity/FunctionList.cs | 6
HDL_ON/Entity/Function/Function.cs | 12 +
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs | 8
HDL_ON/Common/R.cs | 5
DLL/EZvizMonitor/ys.dll | 0
26 files changed, 469 insertions(+), 117 deletions(-)
diff --git a/DLL/EZvizMonitor/ys.dll b/DLL/EZvizMonitor/ys.dll
index 3017386..7c6eb30 100644
--- a/DLL/EZvizMonitor/ys.dll
+++ b/DLL/EZvizMonitor/ys.dll
Binary files differ
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 1973d38..3a9497f 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -422,7 +422,7 @@
436=Added Devices
437=Device List
438=humidity:{0}% air:{1} wind:{2}
-439=Real time: {0} kw
+439=Real time: {0} kW
440=Next step
441=Please select all areas of capture status
442=Generate Scene
@@ -511,6 +511,7 @@
523=Delay alarm
524=Bypass
525=Enable
+526=Cancel account
1000=Room Humidity
1001=V-chip
@@ -1645,6 +1646,7 @@
523=寤舵椂鎶ヨ
524=鍋滅敤
525=鍚敤
+526=娉ㄩ攢璐﹀彿
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -1749,7 +1751,7 @@
1093=
1094=閫夋嫨鏃堕棿
1095=閫夋嫨鏃ユ湡
-1096=Generate
+1096=鐢熸垚
1097=涓存椂瀵嗙爜宸茬粡澶嶅埗
1098=娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
1099=鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 5aed3be..362f0b1 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -168,15 +168,15 @@
<Reference Include="Square.OkIO">
<HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
</Reference>
- <Reference Include="ys">
- <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.HDLLinphone">
<HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
</Reference>
<Reference Include="Shared.Droid.LCVideoSDK">
<HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath>
</Reference>
+ <Reference Include="ys">
+ <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index ed2a5ed..22a27ab 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202112283" android:versionName="1.4.5" package="com.hdl.onpro">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202201071" android:versionName="1.5.2" package="com.hdl.onpro">
+ <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="30" />
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<uses-permission android:name="android.permission.INTERNET" />-->
<!--缃戠粶璁块棶-->
@@ -82,7 +82,7 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_LOGS" />
<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
- <application android:allowBackup="true" android:debuggable="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
+ <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
</provider>
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 6cacdd2..92e2950 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.4.502112271</string>
+ <string>1.5.102101041</string>
<key>CFBundleVersion</key>
- <string>1.4.12271</string>
+ <string>1.5.101041</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 1973d38..77d363e 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -422,7 +422,7 @@
436=Added Devices
437=Device List
438=humidity:{0}% air:{1} wind:{2}
-439=Real time: {0} kw
+439=Real time: {0} kW
440=Next step
441=Please select all areas of capture status
442=Generate Scene
@@ -511,6 +511,7 @@
523=Delay alarm
524=Bypass
525=Enable
+526=Cancel account
1000=Room Humidity
1001=V-chip
@@ -1645,6 +1646,7 @@
523=寤舵椂鎶ヨ
524=鍋滅敤
525=鍚敤
+526=娉ㄩ攢璐﹀彿
1000=瀹ゅ唴婀垮害
1001=绔ラ攣
@@ -1746,10 +1748,9 @@
1092=鐢熸晥鏃堕棿
1092=Effective time
1093=澶辨晥鏃堕棿
-1093=
1094=閫夋嫨鏃堕棿
1095=閫夋嫨鏃ユ湡
-1096=Generate
+1096=鐢熸垚
1097=涓存椂瀵嗙爜宸茬粡澶嶅埗
1098=娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
1099=鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 67b3828..fb07c0f 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,11 @@
{
public static class StringId
{
+
+ /// <summary>
+ /// 娉ㄩ攢璐﹀彿
+ /// </summary>
+ public const int CancelAccount = 526;
/// <summary>
/// 鍚敤
/// </summary>
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 64bc159..277fa42 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1110,7 +1110,17 @@
public static class SPK
{
-
+ /// <summary>
+ /// 闂ㄩ攣
+ /// </summary>
+ public const string DoorLock = "security.door";
+
+ public static List<string> GetDoorLockSPKList()
+ {
+ var list = new List<string>();
+ list.Add(DoorLock);
+ return list;
+ }
#region 鐏厜
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index c1b1641..55d26a3 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -72,6 +72,12 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ public List<Function> GetDoorLockList()
+ {
+ var spkList = SPK.GetDoorLockSPKList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
/// <summary>
/// 鏂伴鍒楄〃
/// </summary>
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index b8c7d1c..00e53a2 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -490,6 +490,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmCenter\PushConfigPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\SocketPage_InstantaneousValue.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\SocketPage_CumulativePowerConsumption.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CancelAccountPage.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 07b0ef3..3a9894f 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.4.5";
+ public static string VersionString = "1.5.2";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 7b59c9e..4507e35 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -196,6 +196,10 @@
var airFresh2 = new AirFreshRelayControlPage();
airFresh2.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
+ case SPK.DoorLock:
+ var doorLockPage = new DoorLockListPage();
+ doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
+ break;
}
};
return eventHandler;
diff --git a/HDL_ON/UI/UI0-Public/Widget/ListCellView.cs b/HDL_ON/UI/UI0-Public/Widget/ListCellView.cs
index c7d3114..4e93b99 100644
--- a/HDL_ON/UI/UI0-Public/Widget/ListCellView.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/ListCellView.cs
@@ -71,11 +71,12 @@
BtnTilte = new Button()
{
X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(220),
+ Width = Application.GetRealWidth(260),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
Text = tilteText,
+ IsMoreLines = true
};
this.AddChidren(BtnTilte);
/// <summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 180ba8c..89afbb6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -216,6 +216,7 @@
//etAccount.Text = "18316120654";//tujie
//etAccount.Text = "15626203746";
//etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
+ etAccount.Text = "18059593333";
}
else
{
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 32a50b9..7b9c9c7 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -42,7 +42,6 @@
OnAppConfig.Instance.GlobalRegion = mGlobalRegionListObj;
OnAppConfig.Instance.SaveConfig();
}
- OnAppConfig.Instance.RequestHttpsHost = @"https://bahrain-gateway.hdlcontrol.com";
}
catch { }
}
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 5c2fe0f..9443a70 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -553,20 +553,55 @@
#if DEBUG
- FunctionList.List.Functions.Add(new Function()
+ FunctionList.List.Functions.Add(new Function
{
- spk = SPK.PanelSocket,
- name = "闈㈡澘鎻掑骇",
- attributes = new List<FunctionAttributes>
- {
- new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- new FunctionAttributes(){ key = "on_off_usb",curValue= "on",state = "on" },
- new FunctionAttributes(){ key = "active_power",curValue= "220",state = "220" },
- new FunctionAttributes(){ key = "voltage",curValue= "5",state = "5" },
- new FunctionAttributes(){ key = "current",curValue= "110",state = "110" },
- new FunctionAttributes(){ key = "total_electricity",curValue= "123.33",state = "123.33" },
+ name = "闂ㄩ攣",
+ spk = SPK.DoorLock,
+ sid = "12345",
+ attributes = new List<FunctionAttributes> {
+ new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
+ new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
+ new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
+ new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
}
});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "闂ㄩ攣1",
+ spk = SPK.DoorLock,
+ sid = "123",
+ attributes = new List<FunctionAttributes> {
+ new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
+ new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
+ new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
+ new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
+ }
+ });
+
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.PanelSocket,
+ // name = "闈㈡澘鎻掑骇",
+ // attributes = new List<FunctionAttributes>
+ // {
+ // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "on_off_usb",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "active_power",curValue= "220",state = "220" },
+ // new FunctionAttributes(){ key = "voltage",curValue= "5",state = "5" },
+ // new FunctionAttributes(){ key = "current",curValue= "110",state = "110" },
+ // new FunctionAttributes(){ key = "total_electricity",curValue= "123.33",state = "123.33" },
+ // }
+ //});
//FunctionList.List.Functions.Add(new Function()
//{
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 3914880..77796b7 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -678,6 +678,8 @@
#endregion
break;
case ShowFunction.DoorLock:
+ functionCount = FunctionList.List.GetDoorLockList().Count;
+ functionOnCount = 1;
break;
case ShowFunction.Electric:
#region 鐢靛櫒
@@ -934,6 +936,10 @@
break;
case ShowFunction.DoorLock:
btnName.TextID = StringId.DoorLock;
+ btnFunctionViewBg.MouseUpEventHandler = (sende, e) => {
+ var form = new DoorLockListPage();
+ form.AddForm(FunctionList.List.GetDoorLockList());
+ };
break;
case ShowFunction.Electric:
#region 鐢靛櫒
@@ -1050,7 +1056,7 @@
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
&& ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index ddeb9d9..13f241a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -235,6 +235,51 @@
});
#endregion
+ #region 缁勫彿
+ //var grounpView = new FrameLayout()
+ //{
+ // Height = Application.GetRealWidth(50),
+ //};
+ //contentView.AddChidren(grounpView);
+
+ //Button btnGroupTitle = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // //Width = Application.GetRealWidth(90),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // Text = "缁勫彿"
+ //};
+ //grounpView.AddChidren(btnGroupTitle);
+
+ //var etGroup = new EditText()
+ //{
+ // TextAlignment = TextAlignment.CenterRight,
+ // Width = Application.GetRealWidth(350),
+ // Text = scene.group,
+ // TextColor = CSS_Color.PromptingColor1,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // IsNumberKeyboardType = true
+ //};
+ //grounpView.AddChidren(etGroup);
+ //etGroup.TextChangeEventHandler = (sender, e) => {
+ // scene.group = e;
+ //};
+
+
+ //Button btnGroupLine = new Button()
+ //{
+ // Y = Application.GetRealWidth(49),
+ // Gravity = Gravity.CenterHorizontal,
+ // Height = Application.GetRealHeight(1),
+ // Width = Application.GetRealWidth(343),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ //};
+ //grounpView.AddChidren(btnGroupLine);
+
+ #endregion
+
#region 鍦烘櫙寤舵椂row
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -391,10 +436,12 @@
var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
if (tempScene != null)
{
- scene.functions = tempScene.functions;
+ scene = tempScene;
}
Application.RunOnMainThread(() =>
{
+ btnSceneName.Text = scene.name;
+ //etGroup.Text = scene.group;
LoadFunctionRow();
waitPage.Hide();
waitPage.RemoveFromParent();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 8fd0334..a9abca7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -105,26 +105,26 @@
bodyView.AddChidren(lineView);
#region 鍔熻兘浠嬬粛
- var functionView = new ListCellView()
- {
- Y = lineView.Bottom,
- };
- bodyView.AddChidren(functionView);
- functionView.BtnTilte.TextID = StringId.FunctionIntroduced;
- Action functionAction = () =>
- {
- var mPage = new FunctionIntroductionPage();
- MainPage.BasePageView.AddChidren(mPage);
- mPage.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- functionView.GoAction = functionAction;
+ //var functionView = new ListCellView()
+ //{
+ // Y = lineView.Bottom,
+ //};
+ //bodyView.AddChidren(functionView);
+ //functionView.BtnTilte.TextID = StringId.FunctionIntroduced;
+ //Action functionAction = () =>
+ //{
+ // var mPage = new FunctionIntroductionPage();
+ // MainPage.BasePageView.AddChidren(mPage);
+ // mPage.LoadPage();
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //};
+ //functionView.GoAction = functionAction;
#endregion
#region 鎶曡瘔
var complaintsView = new ListCellView()
{
- Y = functionView.Bottom,
+ Y = lineView.Bottom,
};
bodyView.AddChidren(complaintsView);
complaintsView.BtnTilte.TextID = StringId.Complaints;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
index dcc83fb..bf6589f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
@@ -124,7 +124,7 @@
{
X = btnEmailTitle.Right,
Y = btnEmailText.Bottom + Application.GetRealWidth(4),
- Height = Application.GetRealWidth(20),
+ Height = Application.GetRealWidth(25),
Width = Application.GetRealWidth(266),
TextAlignment = TextAlignment.TopLeft,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
new file mode 100644
index 0000000..30a5652
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs
@@ -0,0 +1,201 @@
+锘縰sing System;
+using Shared;
+using HDL_ON.UI.CSS;
+using Xamarin.Essentials;
+
+namespace HDL_ON.UI
+{
+ public class CancelAccountPage : FrameLayout
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ FrameLayout bodyView;
+
+ /// <summary>
+ ///
+ /// </summary>
+ public CancelAccountPage()
+ {
+ bodyView = this;
+ BackgroundColor = CSS_Color.MainBackgroundColor;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public void LoadPage()
+ {
+ new TopViewDiv(bodyView, Language.StringByID(StringId.CancelAccount)).LoadTopView();
+
+ var textView = new Button()
+ {
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(150),
+ Padding = new Padding( Application.GetRealWidth(16), Application.GetRealWidth(16), Application.GetRealWidth(16), Application.GetRealWidth(16)),
+ IsMoreLines = true,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextAlignment = TextAlignment.TopLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+
+ if(Language.CurrentLanguage == "Chinese")
+ {
+ textView.Text = "鎮ㄥ彲閫氳繃鐢佃瘽涓撶嚎涓庣數瀛愰偖浠剁殑褰㈠紡鍚戞垜浠敵璇锋敞閿�璐︽埛锛屾垜浠敹鍒版偍鐨勭敵璇峰悗锛屼細绗竴鏃堕棿瀹夋帓宸ョ▼浜哄憳瀵规偍App搴旂敤璐︽埛鏁版嵁銆佷互鍙婃櫤鑳藉灞呮櫤鑳界‖浠舵湰鍦版暟鎹叏閮ㄥ垹闄わ紒";
+ }
+ else
+ {
+ textView.Text = "You can apply to us for cancellation of your account through special telephone line and e-mail. After receiving your application, we will arrange engineers to delete all your app account data and local data of smart home smart hardware at the first time!";
+ }
+ bodyView.AddChidren(textView);
+
+ #region 鎶曡瘔鑱旂郴
+ FrameLayout phoneRow = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(214),
+ Height = Application.GetRealWidth(50),
+ };
+ bodyView.AddChidren(phoneRow);
+
+ Button btnPhoneTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(48),
+ TextID = StringId.Telephone,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+ phoneRow.AddChidren(btnPhoneTitle);
+ if (Language.CurrentLanguage == "English")
+ {
+ btnPhoneTitle.Text = "Tel.:";
+ }
+
+ Button btnPhoneText = new Button()
+ {
+ X = btnPhoneTitle.Right,
+ Width = Application.GetRealWidth(266),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ Text = "400 855 8535",
+ };
+ phoneRow.AddChidren(btnPhoneText);
+ /// <summary>
+ /// 鍓嶈繘鍥炬爣
+ /// </summary>
+ var btnImage = new Button()
+ {
+ X = Application.GetRealWidth(343),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ phoneRow.AddChidren(btnImage);
+ phoneRow.AddChidren(new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealWidth(49), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
+
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ PhoneDialer.Open(Constant.SUPPORT_TELEPHONENUMBER);
+ };
+
+ phoneRow.MouseUpEventHandler = eventHandler;
+ btnPhoneText.MouseUpEventHandler = eventHandler;
+ btnImage.MouseUpEventHandler = eventHandler;
+ #endregion
+
+ #region 鑱旂郴閭
+ FrameLayout emailRow = new FrameLayout()
+ {
+ Y = phoneRow.Bottom,
+ Height = Application.GetRealWidth(54),
+ };
+ bodyView.AddChidren(emailRow);
+
+ Button btnEmailTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(48),
+ TextID = StringId.Email_,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+ emailRow.AddChidren(btnEmailTitle);
+
+ Button btnEmailText = new Button()
+ {
+ X = btnEmailTitle.Right,
+ Y = Application.GetRealWidth(8),
+ Height = Application.GetRealWidth(20),
+ Width = Application.GetRealWidth(266),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ Text = Constant.SUPPORT_EMAIL,
+ };
+ emailRow.AddChidren(btnEmailText);
+
+ Button btnEmailTipText = new Button()
+ {
+ X = btnEmailTitle.Right,
+ Y = btnEmailText.Bottom + Application.GetRealWidth(4),
+ Height = Application.GetRealWidth(25),
+ Width = Application.GetRealWidth(266),
+ TextAlignment = TextAlignment.TopLeft,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ TextID = StringId.WillGivePriorityToTheTreatmen,
+ };
+ emailRow.AddChidren(btnEmailTipText);
+
+ if (Language.CurrentLanguage == "English")
+ {
+ btnEmailTitle.Width = Application.GetRealWidth(80);
+ emailRow.Height = Application.GetRealWidth(65);
+ btnEmailTipText.IsMoreLines = true;
+ }
+
+ /// <summary>
+ /// 鍓嶈繘鍥炬爣
+ /// </summary>
+ var btnImage2 = new Button()
+ {
+ X = Application.GetRealWidth(343),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ emailRow.AddChidren(btnImage2);
+
+ emailRow.AddChidren(new Button() { X = Application.GetRealWidth(16), Y = emailRow.Height - Application.GetRealHeight(1), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
+
+ EventHandler<MouseEventArgs> eventHandler2 = (sender, e) =>
+ {
+ CopyToClipboard(Constant.SUPPORT_EMAIL);
+ };
+
+ emailRow.MouseUpEventHandler = eventHandler2;
+ btnEmailText.MouseUpEventHandler = eventHandler2;
+ btnImage2.MouseUpEventHandler = eventHandler2;
+ #endregion
+ }
+
+
+
+ /// <summary>
+ /// 澶嶅埗鍒板壀鍒囨澘
+ /// </summary>
+ /// <param name="text"></param>
+ void CopyToClipboard(string text)
+ {
+ Clipboard.SetTextAsync(text);
+ Utlis.ShowTip(text + "\n" + Language.StringByID(StringId.CopySuccess));
+ }
+
+ }
+
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index e511612..0e31bad 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -183,10 +183,10 @@
/// <summary>
/// 瑙ｉ攣璁剧疆鍖哄煙
/// </summary>
- FrameLayout interpretationSettingsView;
- Button btnInterpretationSettingsTitle;
- Button btnInterpretationSettingsTip;
- Button btnInterpretationSettingsRight;
+ //FrameLayout interpretationSettingsView;
+ //Button btnInterpretationSettingsTitle;
+ //Button btnInterpretationSettingsTip;
+ //Button btnInterpretationSettingsRight;
#endregion
/// <summary>
@@ -679,62 +679,62 @@
}
#endregion
-
- #region 瑙ｉ攣璁剧疆鍖哄煙
var topPaddingView2 = new FrameLayout()
{
Height = Application.GetRealHeight(8)
};
bodyScrolView.AddChidren(topPaddingView2);
- /// <summary>
- /// 瑙ｉ攣璁剧疆鍖哄煙
- /// </summary>
- interpretationSettingsView = new FrameLayout()
- {
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Height = Application.GetRealHeight(70),
- };
- bodyScrolView.AddChidren(interpretationSettingsView);
- if(Language.CurrentLanguage != "Chinese")
- {
- interpretationSettingsView.Height = Application.GetRealHeight(80);
- }
- btnInterpretationSettingsTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Height = Application.GetRealHeight(32),
- TextAlignment = TextAlignment.BottomLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.InterpretationSettings,
- };
- interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);
+ #region 瑙ｉ攣璁剧疆鍖哄煙
+ ///// <summary>
+ ///// 瑙ｉ攣璁剧疆鍖哄煙
+ ///// </summary>
+ //interpretationSettingsView = new FrameLayout()
+ //{
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ // Height = Application.GetRealHeight(70),
+ //};
+ //bodyScrolView.AddChidren(interpretationSettingsView);
+ //if(Language.CurrentLanguage != "Chinese")
+ //{
+ // interpretationSettingsView.Height = Application.GetRealHeight(80);
+ //}
- btnInterpretationSettingsTip = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = btnInterpretationSettingsTitle.Bottom,
- Height = Application.GetRealHeight(32),
- Width = Application.GetRealWidth(310),
- TextAlignment = TextAlignment.TopLeft,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.AppUnlockSettingsTip,
- IsMoreLines = true,
- };
- interpretationSettingsView.AddChidren(btnInterpretationSettingsTip);
+ //btnInterpretationSettingsTitle = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // Height = Application.GetRealHeight(32),
+ // TextAlignment = TextAlignment.BottomLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextID = StringId.InterpretationSettings,
+ //};
+ //interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);
- btnInterpretationSettingsRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
- interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
+ //btnInterpretationSettingsTip = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // Y = btnInterpretationSettingsTitle.Bottom,
+ // Height = Application.GetRealHeight(32),
+ // Width = Application.GetRealWidth(310),
+ // TextAlignment = TextAlignment.TopLeft,
+ // TextColor = CSS_Color.PromptingColor1,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // TextID = StringId.AppUnlockSettingsTip,
+ // IsMoreLines = true,
+ //};
+ //interpretationSettingsView.AddChidren(btnInterpretationSettingsTip);
+
+ //btnInterpretationSettingsRight = new Button()
+ //{
+ // X = Application.GetRealWidth(339),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/Right.png",
+ //};
+ //interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
+ //interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
#endregion
#region 鏈嶅姟鍣ㄤ俊鎭�
@@ -752,7 +752,27 @@
};
myServerInfoCellView.GoAction = selectAction;
myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
- myServerInfoCellView.LineView.RemoveFromParent();
+ //myServerInfoCellView.LineView.RemoveFromParent();
+
+ #endregion
+
+
+ #region 娉ㄩ攢璐﹀彿
+ ListCellView logOffView = new ListCellView()
+ {
+ };
+ bodyScrolView.AddChidren(logOffView);
+ //娉ㄩ攢璐﹀彿鐣岄潰
+ Action logOffAction = () =>
+ {
+ var myServerInfoPage = new CancelAccountPage();
+ MainPage.BasePageView.AddChidren(myServerInfoPage);
+ myServerInfoPage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ logOffView.GoAction = logOffAction;
+ logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
+ logOffView.LineView.RemoveFromParent();
#endregion
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 4d984e0..a13120e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -16,7 +16,7 @@
LoadEvent_ChangeHeadImageView();
LoadEvent_Logout();
LoadEvent_EditUserName();
- LoadEvent_SkipInterpretationSettings();
+ //LoadEvent_SkipInterpretationSettings();
LoadEvent_ChangeBindEmail();
LoadEvent_ChangeBindPhone();
LoadEvent_SkipModifyPassword();
@@ -520,20 +520,20 @@
#endregion
#region 瑙ｉ攣璁剧疆鍖哄煙
- void LoadEvent_SkipInterpretationSettings()
- {
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- var page = new AppUnlockSettingsPage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ //void LoadEvent_SkipInterpretationSettings()
+ //{
+ // EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ // {
+ // var page = new AppUnlockSettingsPage();
+ // MainPage.BasePageView.AddChidren(page);
+ // page.LoadPage();
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ // };
- btnInterpretationSettingsRight.MouseUpEventHandler = eventHandler;
- btnInterpretationSettingsTitle.MouseUpEventHandler = eventHandler;
- btnInterpretationSettingsTip.MouseUpEventHandler = eventHandler;
- }
+ // btnInterpretationSettingsRight.MouseUpEventHandler = eventHandler;
+ // btnInterpretationSettingsTitle.MouseUpEventHandler = eventHandler;
+ // btnInterpretationSettingsTip.MouseUpEventHandler = eventHandler;
+ //}
#endregion
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs
index 914e3a1..2a02592 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockListPage.cs
@@ -38,6 +38,14 @@
/// <param name="i_listDevice">闂ㄩ攣璁惧鍒楄〃</param>
public void ShowForm(List<Function> i_listDevice)
{
+
+#if DEBUG
+
+
+#endif
+
+
+
this.listDevice.AddRange(i_listDevice);
//鏅鸿兘闂ㄩ攣
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index c255299..96945a4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -154,7 +154,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.TextualColor,
- TextID = StringId.InstantaneousValue
+ TextID = StringId.InstantaneousValue,
+ IsMoreLines = true
};
controlView.AddChidren(btnInstantaneousValueText);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
@@ -198,12 +199,13 @@
{
X = Application.GetRealWidth(200),
Y = btnTotalElectricity.Bottom,
- Width = Application.GetRealWidth(235),
+ Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(29),
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.TextualColor,
- TextID = StringId.CumulativePowerConsumption
+ TextID = StringId.CumulativePowerConsumption,
+ IsMoreLines = true
};
controlView.AddChidren(btnTotalElectricityText);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs
index e4a7974..c26b483 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs
@@ -136,7 +136,10 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.RealTimePowerConsumption,
};
- btnRealTimeData.Text = Language.StringByID(StringId.RealTimePowerConsumption).Replace("{0}", function.GetAttrState("active_power"));
+ double realTimePower = 0;
+ double.TryParse(function.GetAttrState("active_power"), out realTimePower);
+ realTimePower /= 1000;
+ btnRealTimeData.Text = Language.StringByID(StringId.RealTimePowerConsumption).Replace("{0}", realTimePower.ToString());
generalTableView.AddChidren(btnRealTimeData);
--
Gitblit v1.8.0