From bd46c57c77c276014db3192a4e2cc96e23c93202 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 21 二月 2020 13:08:47 +0800
Subject: [PATCH] 先上传个版本吧
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs | 2
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 2
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 4
ZigbeeApp/Home.Ios/Resources/Language.ini | 2
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs | 4
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs | 8
ZigbeeApp/Shared/R.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs | 20 +
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 84 ++++++--
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs | 14 -
ZigbeeApp/Shared/Common/CommonPage.cs | 2
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 31 +++
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs | 40 +++
ZigbeeApp/GateWay.Droid/Application.cs | 4
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs | 90 +-------
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs | 4
ZigbeeApp/Shared/Common/Device.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayUploadAndDownLoadForm.cs | 4
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs | 16 -
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs | 12 +
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs | 30 ++
ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs | 40 +++
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs | 21 +
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs | 1
ZigbeeApp/Shared/Shared.projitems | 2
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs | 10
/dev/null | 28 --
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs | 2
46 files changed, 317 insertions(+), 231 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs
index 49eb763..32c6c9d 100755
--- a/ZigbeeApp/GateWay.Droid/Application.cs
+++ b/ZigbeeApp/GateWay.Droid/Application.cs
@@ -98,7 +98,9 @@
api.SendReq(req);
}
/// <summary>鈥� /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜扳�� /// </summary>鈥� void initAll()鈥� {
- Shared.Application.IsGpsEnable = false;
+ string checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);
+ Shared.Application.IsGpsEnable = System.IO.File.Exists(checkFile);
+
//璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
// System.Console.WriteLine($"AAA : {System.DateTime.Now.ToString()}");
#if Release鈥� JPushInterface.SetDebugMode(false);
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 1a96c53..97c3bb2 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -1034,7 +1034,7 @@
15223=娣诲姞澶囦唤
15224=缂栬緫澶囦唤
15225=澶囨敞
-15226=璇疯緭鍏ュ娉ㄥ悕绉�
+15226=璇疯緭鍏ュ浠藉悕绉�
15227=鎭㈠鏂囦欢鎴愬姛
15246=鎶ヨ鐩爣璁剧疆
15247=褰撹闃插尯鎶ヨ鏃讹紝浠ヤ笅鐩爣灏嗕細鍝嶅簲
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index b51b9f7..d4b2821 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020011501" android:installLocation="auto" android:versionName="1.0.20011501">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020011801" android:installLocation="auto" android:versionName="1.0.20011801">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 1a96c53..97c3bb2 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -1034,7 +1034,7 @@
15223=娣诲姞澶囦唤
15224=缂栬緫澶囦唤
15225=澶囨敞
-15226=璇疯緭鍏ュ娉ㄥ悕绉�
+15226=璇疯緭鍏ュ浠藉悕绉�
15227=鎭㈠鏂囦欢鎴愬姛
15246=鎶ヨ鐩爣璁剧疆
15247=褰撹闃插尯鎶ヨ鏃讹紝浠ヤ笅鐩爣灏嗕細鍝嶅簲
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 2268019..20b0d5a 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -62,7 +62,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.0.20011501";
+ public static string CodeIDString = "1.0.20011801";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index b3ae4bb..35989ca 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -2338,12 +2338,12 @@
#region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
/// <summary>
- /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囩殑鍏蜂綋銆愯澶囩被鍨嬨��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��)</para>
+ /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囩殑鍏蜂綋銆愯澶囩被鍨嬨��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨凞eviceConcreteType鍊�)</para>
/// <para>鍙橀噺鍚嶅彲浠ヤ綔涓恒�愯澶囩被鍨嬨�戝浘鐗�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
/// </summary>
public enum DeviceConcreteType
{
- //瀹氫箟瑙勫垯锛氥�愯澶囩被鍨嬨�戝浘鐗囧悕瀛�=LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��
+ //瀹氫箟瑙勫垯锛氥�愯澶囩被鍨嬨�戝浘鐗囧悕瀛�=LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨凞eviceConcreteType鍊�
/// <summary>
/// 鏈煡璁惧
@@ -2578,7 +2578,7 @@
}
/// <summary>
- /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囨墍灞炵殑銆愯澶囩绫汇��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��)</para>
+ /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囨墍灞炵殑銆愯澶囩绫汇��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨凞eviceBeloneType鍊�)</para>
/// <para>杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
/// </summary>
public enum DeviceBeloneType
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index 7f2b3f4..f1b5762 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index 381435e..88f5185 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
index c69ddb4..dca32ed 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index 74fe6f3..2849b65 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 97abd18..e04b70b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -669,7 +669,7 @@
//鍦ㄥ唽鐨凪sg
return Language.StringByID(dicMsg[requestName][statuCode]);
}
- return "ERROR:" + statuCode;
+ return "Error:" + statuCode;
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs
index f13c53d..42d802e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs
@@ -137,84 +137,20 @@
/// </summary>
public uint TextOrangeColor = 0xfffc744b;
/// <summary>
- /// 鈽嗚鎺т欢閫夋嫨鐘舵�佹椂鐨勮儗鏅壊
+ /// 鈽嗚鎺т欢閫夋嫨鐘舵�佹椂鐨勮儗鏅壊(0xfffbfbfb)
/// </summary>
- public uint RowSelectBackColor = 0xfffbfbfb;
-
-
-
-
- /// <summary>
- /// 鐏拌壊
- /// </summary>
- public uint Gray = 0xff6b6b6b;
- /// <summary>
- /// 娣辩伆鑹�(绋嶅井)
- /// </summary>
- public uint DeepGray1 = 0xffd4d4d4;
- /// <summary>
- /// 閫変腑鐨勯鑹�(钃濊壊)
- /// </summary>
- public uint SelectTextColor = 0xff00aaf0;
- /// <summary>
- /// 娣辫摑鑹�
- /// </summary>
- public uint DeepBlue = 0xff3699e2;
- /// <summary>
- /// 鎸夐挳鐨勫垵濮嬭儗鏅壊
- /// </summary>
- public uint ClickButtonColor = 0xff3699e2;
- /// <summary>
- /// 鎸夐挳鎸変笅鐨勮儗鏅壊(鐏拌壊)
- /// </summary>
- public uint ButtonClickColor = 0xffadadad;
- /// <summary>
- /// 绾㈣壊(0xfff62f48)
- /// </summary>
- public uint Red = 0xfff62f48;
- /// <summary>
- /// 姗樿壊
- /// </summary>
- public uint Orange = 0xffff870f;
- /// <summary>
- /// 缁胯壊
- /// </summary>
- public uint Green = 0xff09ff09;
- /// <summary>
- /// 娴呰摑鑹�
- /// </summary>
- public uint WathetBlue = 0xffa2ffff;
- /// <summary>
- /// 娴呯传鑹�
- /// </summary>
- public uint purply = 0xfff4b7f1;
- /// <summary>
- /// 1鏄庣粏(BodyFramelayout)閲岄潰鐨勬爣棰樻帶浠剁殑棰滆壊(0xff000000)
- /// </summary>
- public uint DetailTitleTextColor = 0xff000000;
- /// <summary>
- /// 绾跨殑棰滆壊
- /// </summary>
- public uint Line = 0xffadadad;
- /// <summary>
- /// 钃濊壊瀛椾綋
- /// </summary>
- public uint TextBlueColor = 0xff3699e2;
- /// <summary>
- /// 1鐏拌壊瀛椾綋棰滆壊(0xff999999)
- /// </summary>
- public uint TextGrayColor = 0xff999999;
- /// <summary>
- /// RowLayout鐨勭紪杈戞寜閽殑鑳屾櫙鑹�
- /// </summary>
- public uint RowEditorButtonColor = 0xffff870f;
- /// <summary>
- /// RowLayout鐨勫垹闄ゆ寜閽殑鑳屾櫙鑹�
- /// </summary>
- public uint RowDeleteButtonColor = 0xfff32514;
+ public uint RowSelectBackColor = 0xfffbfbfb;
/// <summary>
- /// 绮夌孩鑹�(杩滅▼杩炴帴鐨勮儗鏅壊)
- /// </summary>
- public uint RemoteLinkPink = 0xffffb9b9;
+ /// 鈽嗛敊璇彁绀虹殑棰滆壊(0xfff75858)
+ /// </summary>
+ public uint ErrorColor = 0xfff75858;
+ /// <summary>
+ /// 鐏拌壊(0xff6b6b6b) 鍏朵粬鍦版柟浼间箮鍦ㄧ敤,寤鸿涓嶈浣跨敤
+ /// </summary>
+ public uint Gray = 0xff6b6b6b;
+ /// <summary>
+ /// 绾㈣壊(0xfff62f48) 鍏朵粬鍦版柟浼间箮鍦ㄧ敤,寤鸿涓嶈浣跨敤
+ /// </summary>
+ public uint Red = 0xfff62f48;
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index f9462e5..cef4eaa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -447,6 +447,10 @@
/// 鍥轰欢鍒嗗竷寮忓敮涓�,涔熸槸涓嬭浇鏃剁殑[涓嬭浇鍥轰欢鐨勫敮涓�鏍囪瘑]鍙傛暟
/// </summary>
public string DistributedMark = string.Empty;
+ /// <summary>
+ /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
}
/// <summary>
@@ -508,6 +512,10 @@
/// 闀滃儚绫诲瀷
/// </summary>
public string ImagType = string.Empty;
+ /// <summary>
+ /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
index affc396..d48e6be 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
@@ -111,11 +111,17 @@
{
if (e.Focus == false)
{
- btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ if (btnLineTemp != null)
+ {
+ btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ }
}
else
{
- btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;
+ if (btnLineTemp != null)
+ {
+ btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
index 02e26e4..3c44056 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
@@ -20,9 +20,13 @@
/// </summary>
public Action<string> FinishInputEvent = null;
/// <summary>
- /// 瀵嗙爜杈撳叆绫诲瀷
+ /// 瀵嗙爜杈撳叆绫诲瀷(瀹冧笌NumberInputOnly涓嶅叡瀛�)
/// </summary>
public bool SecureTextEntry = false;
+ /// <summary>
+ /// 杈撳叆閿洏鎸囧畾涓烘暟瀛楅敭鐩�(榛樿涓簍rue,瀹冧笌SecureTextEntry涓嶅叡瀛�)
+ /// </summary>
+ public bool NumberInputOnly = true;
/// <summary>
/// 楠岃瘉鐮侀暱搴�
/// </summary>
@@ -74,6 +78,10 @@
{
txtCode.SecureTextEntry = true;
}
+ else if (NumberInputOnly == true)
+ {
+ txtCode.IsNumberKeyboardType = true;
+ }
txtCode.Name = i.ToString();
txtCode.TextAlignment = TextAlignment.Center;
frameCode.AddChidren(txtCode);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index 60c5d60..bb6104d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -30,6 +30,10 @@
/// 鍙宠竟鍥炬爣鎺т欢鐨勫ぇ灏�
/// </summary>
private int rightIconSize = 0;
+ /// <summary>
+ /// 搴曠嚎鎺т欢
+ /// </summary>
+ private NormalViewControl btnBottomLine = null;
#endregion
@@ -55,6 +59,11 @@
/// </summary>
public virtual NormalViewControl AddBottomLine()
{
+ if (this.btnBottomLine != null)
+ {
+ //宸茬粡娣诲姞浜嗗簳绾�
+ return btnBottomLine;
+ }
int lineWidth = this.Width - ControlCommonResourse.XXLeft * 2 - LeftOffset - RightOffset;
int XX = ControlCommonResourse.XXLeft + LeftOffset;
if (leftIconSize > 0)
@@ -62,13 +71,13 @@
lineWidth = lineWidth - leftIconSize - Application.GetRealWidth(35);
XX = XX + leftIconSize + Application.GetRealWidth(35);
}
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.X = XX;
- btnLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
- base.AddChidren(btnLine);
+ this.btnBottomLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+ btnBottomLine.X = XX;
+ btnBottomLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;
+ btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ base.AddChidren(btnBottomLine);
- return btnLine;
+ return btnBottomLine;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/DetailTitleControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/DetailTitleControl.cs
deleted file mode 100755
index 2a5aacc..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/DetailTitleControl.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.UserCenter
-{
- /// <summary>
- /// 鍋氭垚涓�涓槑缁�(BodyFramelayout)閲岄潰鐨勬爣棰樻帶浠�(姝ｅ父鏂囨湰瀛椾綋棰滆壊,鏂囧瓧鍚戝乏闈犻綈)鉁�
- /// </summary>
- public class DetailTitleControl : ButtonBase
- {
- /// <summary>
- /// 鍋氭垚涓�涓瓨鍦ㄤ簬BodyFrameLayout閲岄潰鐨勫ご閮ㄦ彁绀轰俊鎭殑鎺т欢(姝ｅ父鏂囨湰瀛椾綋棰滆壊,鏂囧瓧鍚戝乏闈犻綈)
- /// </summary>
- /// <param name="i_Width">瀹藉害</param>
- /// <param name="i_Height">楂樺害</param>
- /// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
- public DetailTitleControl(int i_Width, int i_Height, bool real = false)
- {
- this.TextColor = UserCenterColor.Current.DetailTitleTextColor;
- this.TextSize = 15;
- this.InitSize(i_Width, i_Height, real);
- this.X = ControlCommonResourse.XXLeft;
- }
-
- /// <summary>
- /// 鍋氭垚涓�涓瓨鍦ㄤ簬BodyFrameLayout閲岄潰鐨勫ご閮ㄦ彁绀轰俊鎭殑鎺т欢(姝ｅ父鏂囨湰瀛椾綋棰滆壊,鏂囧瓧鍚戝乏闈犻綈)
- /// </summary>
- /// <param name="i_Width">瀹藉害</param>
- /// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
- public DetailTitleControl(int i_Width, bool real = false)
- {
- this.TextColor = UserCenterColor.Current.DetailTitleTextColor;
- this.TextSize = 15;
- this.InitSize(i_Width, real);
- this.X = ControlCommonResourse.XXLeft;
- }
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowNewVersionTipView.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowNewVersionTipView.cs
deleted file mode 100755
index a0831b9..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowNewVersionTipView.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.UserCenter
-{
- /// <summary>
- /// 鍋氭垚涓�涓綅浜嶳owlayout閲岄潰锛屾彁绀烘嫢鏈夋柊鐗堟湰鐨勬帶浠�
- /// </summary>
- public class RowNewVersionTipView : ButtonBase
- {
- /// <summary>
- /// 鍋氭垚涓�涓綅浜嶳owlayout閲岄潰锛屾彁绀烘嫢鏈夋柊鐗堟湰鐨勬帶浠�
- /// </summary>
- public RowNewVersionTipView()
- {
- this.X = Application.GetRealWidth(720);
- this.Height = ControlCommonResourse.NormalControlHeight;
- this.Width = Application.GetRealWidth(200);
- this.TextAlignment = TextAlignment.Center;
- this.Gravity = Gravity.CenterVertical;
- this.Radius = (uint)ControlCommonResourse.NormalControlHeight / 2;
- this.BackgroundColor = UserCenterColor.Current.Red;
- this.TextColor = UserCenterColor.Current.White;
- this.TextID = R.MyInternationalizationString.uNEW;
- }
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
index 7a693a9..f947cc3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs
@@ -51,6 +51,9 @@
/// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
public virtual void AddForm(params object[] parameter)
{
+ //鍏抽棴杈撳叆娉曠晫闈�
+ this.CloseInputPanel();
+
return;
}
@@ -76,6 +79,8 @@
/// </summary>
public virtual void CloseFormBefore()
{
+ //鍏抽棴杈撳叆娉曠晫闈�
+ this.CloseInputPanel();
}
/// <summary>
@@ -264,6 +269,13 @@
return UserCenterResourse.NowActionFormID == this.FormID;
}
+ /// <summary>
+ /// 鍏抽棴杈撳叆娉曠晫闈�(鏈疄鐜�)
+ /// </summary>
+ public void CloseInputPanel()
+ {
+ }
+
#endregion
#region 鈻� 鍙嶅皠鏂规硶___________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs
index 1274659..20e14bc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs
@@ -62,6 +62,8 @@
/// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
public override void AddForm(params object[] parameter)
{
+ base.AddForm(parameter);
+
//妫�娴嬭兘鍚﹁拷鍔犵敾闈�
if (UserCenterLogic.CheckCanAddForm(this) == false)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
index 0340111..f62992d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
@@ -169,6 +169,8 @@
/// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
public override void AddForm(params object[] parameter)
{
+ base.AddForm(parameter);
+
//妫�娴嬭兘鍚﹁拷鍔犵敾闈�
if (UserCenterLogic.CheckCanAddForm(this) == false)
{
@@ -194,14 +196,14 @@
/// </summary>
public override void CloseFormBefore()
{
+ base.CloseFormBefore();
+
//宸︽粦浣胯兘
this.ScrollEnabled = true;
this.m_parameter = null;
//娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- base.CloseFormBefore();
+ this.ClearBodyFrame();
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
index 776aac3..75f38c3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
@@ -184,6 +184,7 @@
info.Name = data.Name;
info.HardwareVersion = hardCode;
info.ImagType = imgType;
+ info.CreatedOnUtc = data.CreatedOnUtc;
imgTypeInfo.listVeison.Add(info);
//鍥轰欢鐨勪俊鎭鐞�
DoAdjustFirmwareInformation(info, data.Remarks);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
index 58f13c1..de18032 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
@@ -122,6 +122,10 @@
/// 妫�娴嬪紩瀵肩殑銆愭枃浠躲��
/// </summary>
public const string GuideFile = "cad1afb384fb482de753fc37ebe84f9e";
+ /// <summary>
+ /// 鎵撳紑Gbs鐨勫垽鏂�愭枃浠躲��(涓存椂)
+ /// </summary>
+ public const string OpenGbsFile = "cd8f75492cb65ef0951442460336db62";
/// <summary>
/// 鏄剧ず鍔熻兘鑿滃崟鐨勩�愭爣璇嗘枃浠躲��,涓嶅姞瀵�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
index 7e77e24..3883568 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
@@ -99,11 +99,13 @@
var btnIcon = rowlayout.AddLeftIcon();
btnIcon.UnSelectedImagePath = unSelPath;
//鎸囧畾鐨勮澶�
- rowlayout.AddLeftCaption(info.ShowName, 800);
+ rowlayout.AddTopView(info.ShowName, 800);
//鍚戝彸鐨勫浘鏍�
rowlayout.AddRightArrow();
//鍥轰欢淇℃伅
- rowlayout.AddMostRightView(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), 300);
+ string firmwareText = Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion);
+ firmwareText += " " + UserCenterLogic.ConvertUtcTimeToLocalTime(info.CreatedOnUtc).ToString("yyyy/MM/dd HH:mm:ss");
+ rowlayout.AddBottomView(firmwareText, 800);
//搴曠嚎
rowlayout.AddBottomLine();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index ebd4e39..68516c9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -227,8 +227,12 @@
this.AddDirectionAndLimitRow();
//娣诲姞銆愭墜鎷夋帶鍒躲�戣(寮�鍚堝笜涓撶敤)
this.AddHandPullControlRow();
- //娣诲姞銆愭寜閿缃�戣(闈㈡澘涓撶敤)
- this.AddPanelSettionRow();
+ //娣诲姞銆愭寜閿缃�戣(鏂规偊涓撶敤) --杩欎釜鏈夊彲鑳藉拰闈㈡澘閲嶅彔
+ if (this.AddFangyuePanelSettionRow() == false)
+ {
+ //娣诲姞銆愭寜閿缃�戣(闈㈡澘涓撶敤)
+ this.AddPanelSettionRow();
+ }
//娣诲姞銆愬姛鑳借缃�戣
this.AddFunctionSettionRow();
//娣诲姞銆愬共鎺ョ偣璁剧疆銆戣
@@ -452,7 +456,7 @@
#region 鈻� 鎸夐敭璁剧疆(闈㈡澘)_____________________
/// <summary>
- /// 娣诲姞銆愭寜閿缃�戣
+ /// 娣诲姞銆愭寜閿缃�戣(闈㈡澘)
/// </summary>
private void AddPanelSettionRow()
{
@@ -472,26 +476,59 @@
btnFunction.AddBottomLine();
btnFunction.ButtonClickEvent += (sender, e) =>
{
- if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
- || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
- || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
- {
- //鏂规偊闈㈡澘鐨勬寜閿厤缃�
- var form = new DevicePanel.PanelFangyueButtonSettionForm();
- form.AddForm(listNewDevice[0]);
- }
- else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
- {
- //鏂规偊鐜闈㈡澘鐨勬寜閿厤缃�
- var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
- form.AddForm(listNewDevice[0]);
- }
- else
- {
- var form = new DevicePanel.PanelButtonSettionForm();
- form.AddForm(listNewDevice[0]);
- }
+ var form = new DevicePanel.PanelButtonSettionForm();
+ form.AddForm(listNewDevice[0]);
};
+ }
+
+ #endregion
+
+ #region 鈻� 鎸夐敭璁剧疆(鏂规偊)_____________________
+
+ /// <summary>
+ /// 娣诲姞銆愭寜閿缃�戣(鏂规偊)
+ /// </summary>
+ private bool AddFangyuePanelSettionRow()
+ {
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueNewWind)
+ {
+ //鎸夐敭璁剧疆
+ string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);
+ var btnFunction = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(btnFunction);
+ btnFunction.AddLeftCaption(caption, 600);
+ //鍚戝彸鍥炬爣
+ btnFunction.AddRightArrow();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ btnFunction.ButtonClickEvent += (sender, e) =>
+ {
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
+ {
+ //鏂规偊闈㈡澘鐨勬寜閿厤缃�
+ var form = new DevicePanel.PanelFangyueButtonSettionForm();
+ form.AddForm(listNewDevice[0]);
+ }
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
+ {
+ //鏂规偊鐜闈㈡澘鐨勬寜閿厤缃�
+ var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
+ form.AddForm(listNewDevice[0]);
+ }
+ else
+ {
+ //鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
+ }
+ };
+ return true;
+ }
+ return false;
}
#endregion
@@ -604,7 +641,8 @@
{
return;
}
- if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueNewWind)
{
//鐜闈㈡澘娌℃湁鍔熻兘璁剧疆
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index e7277e7..a32c91a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -190,8 +190,6 @@
this.StartTopicTimeOutThread();
return;
}
- //涓柇涓婚瓒呮椂绾跨▼
- this.topTimeOut = -100;
lock (this.dicNewDevice)
{
@@ -457,6 +455,7 @@
}
else if (topic == gatewayId + "/DeviceInComingRespon")
{
+ this.topTimeOut = topMaxTime;
//缃戝叧鏈�缁堜笂鎶ヨ妭鐐硅澶囦俊鎭�
this.SetDeviceProgressValue(6);
return 1;
@@ -507,7 +506,7 @@
System.Threading.Thread.Sleep(1000);
this.topTimeOut--;
}
- if (this.topTimeOut < 0 && this.topTimeOut >= -10)
+ if (this.topTimeOut < 0)
{
//鍝嶅簲瓒呮椂,璇烽噸鏂板叆缃�
this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uResponseTimeoutsAndReAccessNetwork));
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs
index 19f6d79..e653cca 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs
@@ -586,7 +586,7 @@
return;
}
//涓嶉�夋嫨鐘舵��
- nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor;
+ nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor1;
//璁板綍瀹冪殑鍚嶅瓧
dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs
index 02cd11e..6ae4781 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs
@@ -246,7 +246,7 @@
btnColor.Y = Application.GetRealHeight(5);
btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
- btnColor.BackgroundColor = UserCenterColor.Current.Red;
+ btnColor.BackgroundColor = UserCenterColor.Current.ErrorColor;
frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
index dc8cccb..d85a556 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
@@ -636,7 +636,7 @@
return;
}
//涓嶉�夋嫨鐘舵��
- nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor;
+ nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor1;
//璁板綍瀹冪殑鍚嶅瓧
dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
index 01f59ef..c3a2d29 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
@@ -75,7 +75,7 @@
btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);
btnMsg.TextSize = 12;
btnMsg.Height = Application.GetRealHeight(40);
- btnMsg.TextColor = UserCenterColor.Current.Red;
+ btnMsg.TextColor = UserCenterColor.Current.ErrorColor;
bodyFrameLayout.AddChidren(btnMsg);
//鏌ョ湅甯姪
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index 8639828..cb05f8b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -98,7 +98,7 @@
btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);
btnMsg.TextSize = 12;
btnMsg.Height = Application.GetRealHeight(40);
- btnMsg.TextColor = UserCenterColor.Current.Red;
+ btnMsg.TextColor = UserCenterColor.Current.ErrorColor;
bodyFrameLayout.AddChidren(btnMsg);
//鏌ョ湅甯姪
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index 58c9eba..6eb6dbc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -326,8 +326,8 @@
//缂栬緫澶囦唤
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
- //璇疯緭鍏ュ娉ㄥ悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
+ //璇疯緭鍏ュ浠藉悕绉�
+ dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
dialogForm.Text = fileInfo.BackupName;
//鎸変笅纭鎸夐挳
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayUploadAndDownLoadForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayUploadAndDownLoadForm.cs
index 8a72fa4..a33c6f0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayUploadAndDownLoadForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayUploadAndDownLoadForm.cs
@@ -95,8 +95,8 @@
var dialogForm = new DialogInputControl();
//涓婁紶鏁版嵁
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uUploadData));
- //璇疯緭鍏ュ娉ㄥ悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
+ //璇疯緭鍏ュ浠藉悕绉�
+ dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += ((textValue) =>
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
index f01bbc5..1730e43 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
@@ -98,6 +98,7 @@
HdlThreadLogic.Current.RunMainInThread(() =>
{
+ bool canAddTitle = true;
int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;
string imageType1 = upDatezbGateway.getGwInfo.LinuxImageType.ToString();
foreach (var data in listData1)
@@ -107,9 +108,15 @@
//鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
continue;
}
+ if (canAddTitle == true)
+ {
+ this.AddTitleRowlayout("Linux妯″潡");
+ canAddTitle = false;
+ }
this.AddRowlayout(data, FirmwareLevelType.Linux);
}
+ canAddTitle = true;
int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;
string imageType2 = upDatezbGateway.getGwInfo.ZbImageType.ToString();
foreach (var data in listData2)
@@ -119,9 +126,15 @@
//鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
continue;
}
+ if (canAddTitle == true)
+ {
+ this.AddTitleRowlayout("鍗忚皟鍣ㄦā鍧�");
+ canAddTitle = false;
+ }
this.AddRowlayout(data, FirmwareLevelType.Coordinator);
}
+ canAddTitle = true;
string imageType3 = this.listVode[0].DriveImageType.ToString();
foreach (var data in listData3)
{
@@ -129,6 +142,11 @@
{
//鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
continue;
+ }
+ if (canAddTitle == true)
+ {
+ this.AddTitleRowlayout("铏氭嫙璁惧妯″潡");
+ canAddTitle = false;
}
this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);
}
@@ -152,13 +170,12 @@
rowlayout.AddChidren(btnIcon);
//鎸囧畾鐨勭綉鍏�
- var btnGateway = rowlayout.AddLeftCaption(info.ShowName, Application.GetRealWidth(800), rowlayout.Height / 2, false);
- rowlayout.AddChidren(btnGateway);
+ rowlayout.AddTopView(info.ShowName, 800);
//鍥轰欢淇℃伅
- var btnVersion = rowlayout.AddLeftCaption(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), Application.GetRealWidth(800), rowlayout.Height / 2, false);
- btnVersion.Y = btnGateway.Bottom;
- rowlayout.AddChidren(btnVersion);
+ string firmwareText = Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion);
+ firmwareText += " " + UserCenterLogic.ConvertUtcTimeToLocalTime(info.CreatedOnUtc).ToString("yyyy/MM/dd HH:mm:ss");
+ rowlayout.AddBottomView(firmwareText, 800);
//鍚戝彸鐨勫浘鏍�
rowlayout.AddRightArrow();
@@ -193,6 +210,19 @@
}
/// <summary>
+ /// 娣诲姞鏍囬琛�
+ /// </summary>
+ /// <param name="title"></param>
+ private void AddTitleRowlayout(string title)
+ {
+ var rowlayout = new FrameRowControl();
+ rowlayout.UseClickStatu = false;
+ this.listView.AddChidren(rowlayout);
+
+ rowlayout.AddLeftCaption(title, 800);
+ }
+
+ /// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
public override void CloseFormBefore()
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index c6e74c1..4ed0659 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
@@ -484,8 +484,8 @@
var dialogForm = new DialogInputControl();
//缂栬緫澶囦唤
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
- //璇疯緭鍏ュ娉ㄥ悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
+ //璇疯緭鍏ュ浠藉悕绉�
+ dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
dialogForm.Text = fileInfo.BackupName;
//鎸変笅纭鎸夐挳
@@ -519,8 +519,8 @@
var dialogForm = new DialogInputControl();
//娣诲姞澶囦唤
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddBackup));
- //璇疯緭鍏ュ娉ㄥ悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
+ //璇疯緭鍏ュ浠藉悕绉�
+ dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += ((textValue) =>
@@ -574,8 +574,8 @@
{
if (backName == string.Empty)
{
- //璇疯緭鍏ュ娉ㄥ悕绉�
- string msg = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);
+ //璇疯緭鍏ュ浠藉悕绉�
+ string msg = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName);
this.ShowMassage(ShowMsgType.Error, msg);
return false;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index ea1a998..5daaef9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -106,6 +106,7 @@
listView.AddChidren(row1);
row1.AddLeftCaption("娓呴櫎缂撳瓨鏂囦欢", 500);
row1.AddRightArrow();
+ row1.AddBottomLine();
row1.ButtonClickEvent += (sender, e) =>
{
this.ShowMassage(ShowMsgType.Confirm, "鏄惁娓呴櫎缂撳瓨鏂囦欢", () =>
@@ -126,6 +127,36 @@
});
};
+#if Android
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ row1.UseClickStatu = false;
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("GBS瀹氫綅", 500);
+ row1.AddBottomLine();
+ var btnGbsSwitch = row1.AddMostRightSwitchIcon();
+ string checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);
+ if (System.IO.File.Exists(checkFile) == true)
+ {
+ btnGbsSwitch.IsSelected = true;
+ }
+ btnGbsSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "娉ㄦ剰:寮�鍚垨鑰呭叧闂鍔熻兘浼氶噸鍚疉pp", () =>
+ {
+ btnGbsSwitch.IsSelected = !btnGbsSwitch.IsSelected;
+ if (btnGbsSwitch.IsSelected == true)
+ {
+ var file = System.IO.File.Create(checkFile);
+ file.Close();
+ }
+ else
+ {
+ System.IO.File.Delete(checkFile);
+ }
+ HDLUtils.RestartApp();
+ });
+ };
+#endif
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
row1.AddLeftCaption("涓婁紶Log", 500);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index 2acb36b..5410e1f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -43,13 +43,6 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberResult.DistributedMark + ".png");
- if (memberResult.HeadImage != null)
- {
- //鍐欏叆澶村儚鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
- }
-
//澶村儚
var btnUserIcon = new ImageView();
btnUserIcon.Height = Application.GetMinRealAverage(207);
@@ -57,7 +50,7 @@
btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
if (memberResult.HeadImage != null)
{
- btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);
+ btnUserIcon.ImageBytes = memberResult.HeadImage;
}
else
{
@@ -174,14 +167,23 @@
UserCenterResourse.ListMemberInfo.Add(memberInfoRes);
UserCenterLogic.SaveLocalMemberListInfo();
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfoRes.DistributedMark + ".png");
+ if (memberResult.HeadImage != null)
+ {
+ //鍐欏叆澶村儚鍐呭
+ Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
+ }
+
//鎴愬憳娣诲姞鎴愬姛
var form = new AddMemberSuccessForm();
- form.AddForm(memberInfoRes, memberResult.DistributedMark);
+ form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
form.FormCloseEvent += (() =>
{
this.CloseForm();
//鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
this.CloseFormByFormName("AddMemberByIdForm");
+ //娣诲姞鎴愬憳
+ this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
index c333302..3258951 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs
@@ -92,7 +92,7 @@
var btnAuthority = new NormalViewControl(frame.Width, Application.GetRealHeight(50), false);
btnAuthority.TextAlignment = TextAlignment.Center;
btnAuthority.Y = Application.GetRealHeight(400);
- btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;
+ btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;
btnAuthority.TextID = R.MyInternationalizationString.uMember;
btnAuthority.TextSize = 12;
frame.AddChidren(btnAuthority);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
index bf52d7e..0ef7349 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
@@ -126,7 +126,7 @@
btnAuthority.TextAlignment = TextAlignment.Center;
btnAuthority.Y = btnName.Bottom + Application.GetRealHeight(10);
btnAuthority.TextSize = 12;
- btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;
+ btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;
btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
frameBack.AddChidren(btnAuthority);
}
@@ -321,6 +321,23 @@
};
}
+ /// <summary>
+ /// 娣诲姞鎴愬憳琛�(澶栭儴璋冪敤)
+ /// </summary>
+ /// <param name="info"></param>
+ public void AddRowLayoutByOtherForm(MemberInfoRes info)
+ {
+ var myRow = listView.GetChildren(listView.ChildrenCount - 1);
+ if (myRow != null)
+ {
+ //鏈�鍚庝竴琛屽姞搴曠嚎
+ ((FrameRowControl)myRow).AddBottomLine();
+ }
+ this.AddRowLayout(info, false);
+ //璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ }
+
#endregion
#region 鈻� 鑾峰彇鎴愬憳澶村儚_______________________
@@ -374,7 +391,7 @@
#region 鈻� 鍒犻櫎鎸囧畾琛宊________________________
/// <summary>
- /// 鍒犻櫎鎸囧畾琛�
+ /// 鍒犻櫎鎸囧畾琛�(澶栭儴璋冪敤)
/// </summary>
/// <param name="accountId"></param>
public void DeleteRowByAccount(string accountId)
@@ -389,6 +406,9 @@
if (row.MainKeys == accountId)
{
row.RemoveFromParent();
+ //璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+
break;
}
}
@@ -442,12 +462,6 @@
{
//娓呯┖鍏变韩鏂囦欢澶�
HdlShardLogic.Current.ClearShardDirectory();
-
- this.listView.RemoveAll();
- listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(567);
-
- //娣诲姞鎴愬憳鍒楄〃
- this.AddMemberListRowByData();
return 1;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index cd409ea..382f98c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -139,7 +139,7 @@
btnAuthority.TextSize = 12;
btnAuthority.Y = btnUserIcon.Bottom + Application.GetRealHeight(23);
btnAuthority.Gravity = Gravity.CenterHorizontal;
- btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;
+ btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;
btnAuthority.TextID = R.MyInternationalizationString.uMember;
if (memberInfo.AccountType == 1)
{
@@ -159,7 +159,7 @@
private void InitInfoList()
{
//鏍囬:鎴愬憳鏉冮檺
- var btnMenberTile = new DetailTitleControl(800, 60, true);
+ var btnMenberTile = new NormalViewControl(800, 60, true);
btnMenberTile.X = ControlCommonResourse.XXLeft;
btnMenberTile.Y = Application.GetRealHeight(418);
btnMenberTile.TextColor = UserCenterColor.Current.TextColor2;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
index 5de6cb0..f50cf44 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
@@ -82,7 +82,7 @@
var btnAuthority = new NormalViewControl(frame.Width, Application.GetRealHeight(50), false);
btnAuthority.TextAlignment = TextAlignment.Center;
btnAuthority.Y = Application.GetRealHeight(400);
- btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;
+ btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;
if (memberInfo.AccountType == 1)
{
btnAuthority.TextID = R.MyInternationalizationString.Administrator;
@@ -125,7 +125,7 @@
//璇ョ鐞嗗憳宸叉垚涓烘垚鍛�
btnView.TextID = R.MyInternationalizationString.uSubAccountLevelIsDown;
}
- btnView.TextColor = UserCenterColor.Current.TextGrayColor;
+ btnView.TextColor = UserCenterColor.Current.TextGrayColor1;
btnView.IsMoreLines = true;
btnView.TextSize = 12;
frame.AddChidren(btnView);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
index d5c6847..9cb5ad7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
@@ -138,13 +138,7 @@
}
//缂栬緫
- var btnEditor = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
- btnEditor.BackgroundColor = 0xff4a4a4a;
- btnEditor.TextSize = 12;
- btnEditor.TextColor = UserCenterColor.Current.White;
- btnEditor.TextAlignment = TextAlignment.Center;
- btnEditor.TextID = R.MyInternationalizationString.uEditor;
- frameRow.AddRightView(btnEditor);
+ var btnEditor = frameRow.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
{
var form = new EditorRoomInforForm();
@@ -152,13 +146,7 @@
};
//鍒犻櫎
- var btnDelete = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
- btnDelete.BackgroundColor = 0xfff75858;
- btnDelete.TextSize = 12;
- btnDelete.TextColor = UserCenterColor.Current.White;
- btnDelete.TextAlignment = TextAlignment.Center;
- btnDelete.TextID = R.MyInternationalizationString.uDelete;
- frameRow.AddRightView(btnDelete);
+ var btnDelete = frameRow.AddDeleteControl();
btnDelete.ButtonClickEvent += (sender, e) =>
{
//纭鍒犻櫎鎴块棿?
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
index ffeae6e..8a14e1a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
@@ -123,7 +123,7 @@
var txtNote = new TextInputControl(Application.GetRealWidth(740), txtPhone.Height, false);
txtNote.X = ControlCommonResourse.XXLeft;
txtNote.Y = btnLine.Bottom + Application.GetRealHeight(60);
- txtNote.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);
+ txtNote.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPlesaeInputNoteInformation);
frameBack.AddChidren(txtNote);
//鍙栨秷鍥炬爣
var btnCancel2 = new MostRightIconControl(69, 69);
@@ -208,8 +208,8 @@
}
if (strNote == string.Empty)
{
- //璇疯緭鍏ュ娉ㄥ悕绉�
- btnErrorMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);
+ //璇疯緭鍏ュ娉ㄥ唴瀹�
+ btnErrorMsg.Text = Language.StringByID(R.MyInternationalizationString.uPlesaeInputNoteInformation);
return false;
}
@@ -236,13 +236,5 @@
}
#endregion
-
-
-
-
-
-
-
-
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs
index bff1dff..089fab7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs
@@ -129,7 +129,7 @@
row.AddBottomLine();
//鏃堕棿
string second = Language.StringByID(R.MyInternationalizationString.Second);
- this.inDelayTimeControl = row.AddMostRightView(this.timeResponseData.EntranceDelayTime + " " + second, 200);
+ this.inDelayTimeControl = row.AddMostRightView(this.GetTimeText(this.timeResponseData.EntranceDelayTime), 200);
this.inDelayTimeControl.TextColor = UserCenterColor.Current.TextGrayColor1;
row.ButtonClickEvent += (sender, e) =>
@@ -158,7 +158,7 @@
row.AddRightArrow();
//鏃堕棿
string second = Language.StringByID(R.MyInternationalizationString.Second);
- this.outDelayTimeControl = row.AddMostRightView(this.timeResponseData.GoOutDelayTime + " " + second, 200);
+ this.outDelayTimeControl = row.AddMostRightView(this.GetTimeText(this.timeResponseData.GoOutDelayTime), 200);
this.outDelayTimeControl.TextColor = UserCenterColor.Current.TextGrayColor1;
row.ButtonClickEvent += (sender, e) =>
@@ -192,14 +192,15 @@
this.timeResponseData.GoOutDelayTime = OutDelayTime;
Application.RunOnMainThread(() =>
{
- string second = Language.StringByID(R.MyInternationalizationString.Second);
if (this.inDelayTimeControl != null)
{
- this.inDelayTimeControl.Text = inDelayTime + " " + second;
+ //鏄剧ず鏃堕棿缈昏瘧鏂囨湰
+ this.inDelayTimeControl.Text = this.GetTimeText(inDelayTime);
}
if (this.outDelayTimeControl != null)
{
- this.outDelayTimeControl.Text = OutDelayTime + " " + second;
+ //鏄剧ず鏃堕棿缈昏瘧鏂囨湰
+ this.outDelayTimeControl.Text = this.GetTimeText(OutDelayTime);
}
});
}
@@ -286,5 +287,34 @@
}
#endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 鑾峰彇鏃堕棿鐨勭炕璇戞枃鏈�
+ /// </summary>
+ /// <param name="timeSecond">绉�</param>
+ /// <returns></returns>
+ private string GetTimeText(int timeSecond)
+ {
+ string textValue = string.Empty;
+ //鍒�
+ int checkValue = timeSecond / 60;
+ if (checkValue > 0)
+ {
+ string minu = Language.StringByID(R.MyInternationalizationString.uMinute);
+ textValue = checkValue + minu;
+ }
+ //绉�
+ checkValue = timeSecond % 60;
+ if (checkValue > 0)
+ {
+ string second = Language.StringByID(R.MyInternationalizationString.uSecond);
+ textValue += checkValue + second;
+ }
+ return textValue;
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index 4ce6701..fba957b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -171,7 +171,7 @@
this.btnAuthority = new NormalViewControl(605, 60, true);
btnAuthority.X = btnUserName.X;
btnAuthority.Y = btnUserName.Bottom;
- btnAuthority.TextColor = UserCenterColor.Current.Gray;
+ btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor3;
btnAuthority.TextSize = 12;
if (UserCenterResourse.UserInfo != null)
{
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 7a07ac3..58c0e31 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -2168,9 +2168,9 @@
/// </summary>
public const int uBackup = 15225;
/// <summary>
- /// 璇疯緭鍏ュ娉ㄥ悕绉�
+ /// 璇疯緭鍏ュ浠藉悕绉�
/// </summary>
- public const int uPleaseInpuBackup = 15226;
+ public const int uPleaseInpuBackupName = 15226;
/// <summary>
/// 鎭㈠鏂囦欢鎴愬姛
/// </summary>
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 5260f51..b77d82d 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -270,7 +270,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameLayoutControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalFrameControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalListControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\DetailTitleControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\NormalViewControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\ButtonBase.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Common\ClickButtonCommon.cs" />
@@ -281,7 +280,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameCaptionViewControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceObjectControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\RowLayoutControls\RowMostRightTextView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\RowLayoutControls\RowNewVersionTipView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SafeguardLogControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\SceneControls\SceneRoomControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\SceneControls\SceneSimpleSelectControl.cs" />
--
Gitblit v1.8.0