From d275465c510dc1cf4e61227d7bf6d6054042b379 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 十二月 2021 09:37:41 +0800
Subject: [PATCH] 备份
---
SiriIntentsUI/Info.plist | 4
HDL-ON_Android/Properties/AndroidManifest.xml | 6 +-
HDL_ON/Common/Constant.cs | 29 +++++++++
HDL-ON_Android/AgreementActivity.cs | 4
HDL-ON_Android/Assets/Language.ini | 6 +-
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 1
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 1
HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 9 ++
HDL-ON_Android/HDL-ON_Android.csproj | 2
HDL-ON_iOS/Scan.cs | 1
HDL_ON/UI/BindingResidence/BindingResidencePage.cs | 8 ++
SiriIntents/Info.plist | 4
HDL-ON_Android/SplashActivity.cs | 4 +
HDL-ON_iOS/Info.plist | 2
HDL-ON_iOS/Resources/Language.ini | 6 +-
HDL-ON_Android/Scan.cs | 20 +++++-
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 10 +-
HDL-ON_Android/Other/HDLONUtils.cs | 8 ++
HDL-ON_Android/libs/arm64-v8a/libelianjni.so | 0
HDL_ON/UI/UI1-Login/LoginPage.cs | 35 +++++++----
21 files changed, 120 insertions(+), 41 deletions(-)
diff --git a/HDL-ON_Android/AgreementActivity.cs b/HDL-ON_Android/AgreementActivity.cs
index c861be1..eb2059d 100644
--- a/HDL-ON_Android/AgreementActivity.cs
+++ b/HDL-ON_Android/AgreementActivity.cs
@@ -37,7 +37,7 @@
{
Intent i = new Intent(this, typeof(WebviewActivity));
- i.PutExtra("url", "https://developer.hdlcontrol.com/HDLOnPlusPrivacyPolicy.html");
+ i.PutExtra("url", HDL_ON.Constant.URL_PRIVACYPOLICY);
StartActivity(i);
Intent data = new Intent();
data.PutExtra("data", "disagree");
@@ -47,7 +47,7 @@
{
Intent i = new Intent(this, typeof(WebviewActivity));
- i.PutExtra("url", "https://developer.hdlcontrol.com/HDLOnPlusUserAgreement.html");
+ i.PutExtra("url",HDL_ON.Constant.URL_USERAGREEMENT);
StartActivity(i);
Intent data = new Intent();
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index b7c1057..1973d38 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -293,7 +293,7 @@
289=Remove The Binding
290=Fail to get the history
291=No favorites
-292=About ON+
+292=About On Pro
293=Member
294=Administrator
295=Change password
@@ -369,7 +369,7 @@
365=Can not communicate with the server, fail to edit the scene information
366=Can not communicate with the server, fail to delete the scene
367=Can not communicate with the server, fail to delete the floor
-368=Welcome to enjoy ON+
+368=Welcome to enjoy On Pro
369=Add new residence
370=Become family member
371=Can not use the function, please bind the gateway
@@ -1504,7 +1504,7 @@
365=鏃犳硶涓庢湇鍔″櫒閫氳,鍦烘櫙淇℃伅缂栬緫澶辫触銆�
366=鏃犳硶涓庢湇鍔″櫒閫氳,鍦烘櫙鍒犻櫎澶辫触銆�
367=鏃犳硶涓庢湇鍔″櫒閫氳,妤煎眰鍒犻櫎澶辫触銆�
-368=娆㈣繋浣跨敤ON+
+368=娆㈣繋浣跨敤On Pro
369=娣诲姞鏂颁綇瀹�
370=鎴愪负瀹跺涵鎴愬憳
371=鍔熻兘鏃犳硶浣跨敤锛岃缁戝畾缃戝叧
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index b61af2b..5aed3be 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -64,6 +64,7 @@
<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
+ <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="Shared.Droid.JPush">
@@ -1337,6 +1338,7 @@
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
+ <AndroidNativeLibrary Include="libs\arm64-v8a\libelianjni.so" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />
diff --git a/HDL-ON_Android/Other/HDLONUtils.cs b/HDL-ON_Android/Other/HDLONUtils.cs
index d651bc7..5f184b9 100644
--- a/HDL-ON_Android/Other/HDLONUtils.cs
+++ b/HDL-ON_Android/Other/HDLONUtils.cs
@@ -31,5 +31,13 @@
System.Console.WriteLine("鍙戦�佸箍鎾埛鏂板浘搴� catch");
}
}
+
+ public static void StartSplashActivity()
+ {
+ Intent intent = new Intent(Shared.Application.Activity, typeof(SplashActivity));
+ Shared.Application.Activity.StartActivity(intent);
+ Shared.Application.Activity.Finish();
+ }
+
}
}
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 6eaf73c..ed2a5ed 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="202112271" android:versionName="1.4.5" package="com.hdl.onpro">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
+<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" />
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<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:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
+ <application android:allowBackup="true" android:debuggable="true" 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_Android/Scan.cs b/HDL-ON_Android/Scan.cs
index c329cd0..0a5f4dc 100644
--- a/HDL-ON_Android/Scan.cs
+++ b/HDL-ON_Android/Scan.cs
@@ -11,6 +11,9 @@
public Scan()
{
}
+
+ public static string TipMsg = string.Empty;
+
static MobileBarcodeScanner scanner;
public static void OpenScan(Action<string> action)
{
@@ -73,12 +76,21 @@
intent.SetData(uri);
Application.Activity.StartActivity(intent);
};
- if (Language.CurrentLanguage == "Chinese")
+ if (string.IsNullOrEmpty(TipMsg))
{
- new HDL_ON.UI.PublicAssmebly().TipOptionMsg(StringId.Tip, "鐩告満璁块棶鏉冮檺宸茶鎷掔粷锛岃鍓嶅線绯荤粺璁剧疆鎵撳紑鐩稿叧鏉冮檺銆�", action1);
- }else
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ new HDL_ON.UI.PublicAssmebly().TipOptionMsg(StringId.Tip, "鐩告満璁块棶鏉冮檺宸茶鎷掔粷锛岃鍓嶅線绯荤粺璁剧疆鎵撳紑鐩稿叧鏉冮檺銆�", action1);
+ }
+ else
+ {
+ new HDL_ON.UI.PublicAssmebly().TipOptionMsg(StringId.Tip, "Camera access has been denied. Please go to system settings to open relevant permissions.", action1);
+ }
+ }
+ else
{
- new HDL_ON.UI.PublicAssmebly().TipOptionMsg(StringId.Tip, "Camera access has been denied. Please go to system settings to open relevant permissions.",action1);
+ new HDL_ON.UI.PublicAssmebly().TipOptionMsg(StringId.Tip, TipMsg,action1,45);
+ TipMsg = string.Empty;
}
}
});
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 8d1511b..de15654 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -53,7 +53,7 @@
- if (HDL_ON.OnAppConfig.Instance.FirstRunApp)
+ if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
{
Intent intent = new Intent(this, typeof(AgreementActivity));
@@ -319,4 +319,6 @@
}
+
+
}
\ No newline at end of file
diff --git a/HDL-ON_Android/libs/arm64-v8a/libelianjni.so b/HDL-ON_Android/libs/arm64-v8a/libelianjni.so
new file mode 100644
index 0000000..04e9fcc
--- /dev/null
+++ b/HDL-ON_Android/libs/arm64-v8a/libelianjni.so
Binary files differ
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index a2100e0..6cacdd2 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,7 +100,7 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.4.302112271</string>
+ <string>1.4.502112271</string>
<key>CFBundleVersion</key>
<string>1.4.12271</string>
<key>NSLocationWhenInUseUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index b7c1057..1973d38 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -293,7 +293,7 @@
289=Remove The Binding
290=Fail to get the history
291=No favorites
-292=About ON+
+292=About On Pro
293=Member
294=Administrator
295=Change password
@@ -369,7 +369,7 @@
365=Can not communicate with the server, fail to edit the scene information
366=Can not communicate with the server, fail to delete the scene
367=Can not communicate with the server, fail to delete the floor
-368=Welcome to enjoy ON+
+368=Welcome to enjoy On Pro
369=Add new residence
370=Become family member
371=Can not use the function, please bind the gateway
@@ -1504,7 +1504,7 @@
365=鏃犳硶涓庢湇鍔″櫒閫氳,鍦烘櫙淇℃伅缂栬緫澶辫触銆�
366=鏃犳硶涓庢湇鍔″櫒閫氳,鍦烘櫙鍒犻櫎澶辫触銆�
367=鏃犳硶涓庢湇鍔″櫒閫氳,妤煎眰鍒犻櫎澶辫触銆�
-368=娆㈣繋浣跨敤ON+
+368=娆㈣繋浣跨敤On Pro
369=娣诲姞鏂颁綇瀹�
370=鎴愪负瀹跺涵鎴愬憳
371=鍔熻兘鏃犳硶浣跨敤锛岃缁戝畾缃戝叧
diff --git a/HDL-ON_iOS/Scan.cs b/HDL-ON_iOS/Scan.cs
index 9b810ee..15d717d 100644
--- a/HDL-ON_iOS/Scan.cs
+++ b/HDL-ON_iOS/Scan.cs
@@ -8,6 +8,7 @@
public class Scan
{
+ public static string TipMsg = "";
public Scan()
{
}
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index d4080b3..0dd7756 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -1,4 +1,6 @@
锘縰sing System;
+using Shared;
+
namespace HDL_ON
{
#region 鈻� 鍏ㄥ眬甯搁噺 ____________________________
@@ -10,11 +12,34 @@
/// <summary>
/// 鐢ㄦ埛鍗忚
/// </summary>
- public const string URL_USERAGREEMENT = "https://developer.hdlcontrol.com/HDLOnPlusUserAgreement.html";
+ public static string URL_USERAGREEMENT {
+ get {
+ if (Language.CurrentLanguage == "Chinese") {
+ return "https://developer.hdlcontrol.com/HDLOnPlusUserAgreement.html";
+ }
+ else
+ {
+ return "https://developer.hdlcontrol.com/OnProServiceAgreement-En.html";
+ }
+ }
+ }
/// <summary>
/// 闅愮鏀跨瓥
/// </summary>
- public const string URL_PRIVACYPOLICY = "https://developer.hdlcontrol.com/HDLOnPlusPrivacyPolicy.html";
+ public static string URL_PRIVACYPOLICY
+ {
+ get
+ {
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ return "https://developer.hdlcontrol.com/HDLOnPlusPrivacyPolicy.html";
+ }
+ else
+ {
+ return "https://developer.hdlcontrol.com/OnProUserAgreement-En.html";
+ }
+ }
+ }
/// <summary>
/// 鎶�鏈敮鎸佺數璇濆彿鐮�
/// </summary>
diff --git a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
index bf2f329..88169db 100644
--- a/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
+++ b/HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -91,6 +91,14 @@
btnAddNewResidence.MouseUpEventHandler = (sender, e) =>
{
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ Scan.TipMsg = "鎮ㄥ凡鎷掔粷App鐩告満璁块棶鏉冮檺锛岃繖灏嗗鑷存偍鏃犳硶浣跨敤鎵弿浜岀淮鐮佺粦瀹氭垜鐨勫搴紝浣嗘偍鍙互閫氳繃鍔犲叆鍏朵粬鐢ㄦ埛鐨勫搴紝浣撻獙鏅鸿兘瀹跺眳鏈嶅姟锛屽闇�鍚敤缁戝畾鎴戠殑瀹跺涵鏈嶅姟锛岃鍓嶅線鎵嬫満绯荤粺璁剧疆鎵撳紑鐩稿叧鏉冮檺";
+ }
+ else
+ {
+ Scan.TipMsg = "You have denied access to the app camera, which will make you unable to bind my family with the scanned QR code, but you can experience smart home services by joining other users' families. To enable the bind my family service, please go to the mobile phone system settings to open the relevant permissions";
+ }
Scan.OpenScan((scanString) =>
{
//鎵ц缁戝畾浣忓畢
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 7734924..b070e69 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -243,7 +243,7 @@
/// <param name="titleId"></param>
/// <param name="msgId"></param>
/// <param name="callBackAction"></param>
- public void TipOptionMsg(int titleId, string msg, Action callBackAction)
+ public void TipOptionMsg(int titleId, string msg, Action callBackAction,int extraHeight = 0)
{
Dialog dialog = new Dialog()
{
@@ -253,8 +253,8 @@
FrameLayout contentView = new FrameLayout()
{
Gravity = Gravity.Center,
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(140),
+ Width = Application.GetRealWidth(270 ),
+ Height = Application.GetRealHeight(140 + extraHeight),
BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
BorderColor = 0x00000000,
BorderWidth = 0,
@@ -277,7 +277,7 @@
Button btnMsg = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Height = Application.GetRealHeight(35),
+ Height = Application.GetRealHeight(35 + extraHeight),
Y = btnTitle.Bottom,
Width = Application.GetRealHeight(200),
TextAlignment = TextAlignment.Center,
@@ -290,7 +290,7 @@
Button btnLine = new Button()
{
- Y = Application.GetRealHeight(96),
+ Y = Application.GetRealHeight(96 + extraHeight),
Height = Application.GetRealHeight(1),
Width = Application.GetRealWidth(270 / 2),
BackgroundColor = CSS.CSS_Color.DividingLineColor,
diff --git a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
index 7cfb3f9..63457e1 100644
--- a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
@@ -92,6 +92,7 @@
}
Action withdramAction = () => {
OnAppConfig.Instance.isAgreePrivacyPolicy = false;
+ OnAppConfig.Instance.FirstRunApp = true;
OnAppConfig.Instance.SaveConfig();
HDLCommon.Current.Logout();
Close();
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index fcf307c..180ba8c 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -169,7 +169,7 @@
public void LoadView(UserInfo userInfo = null)
{
#if __Android__
- OnAppConfig.Instance.isAgreePrivacyPolicy = false;
+ OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
var btnIcon = new Button()
{
@@ -207,15 +207,14 @@
//return;
if (b)
{
- //etAccount.Text = "tf@smarttech.com.ua";//鍥藉璐﹀彿锛屾湁浣忓畢锛岀櫥褰曟棤娉曟樉绀�
//etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
//etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
- etAccount.Text = "13226233133";//璞嗚眴
- etAccount.Text = "18316672920";
+ //etAccount.Text = "13226233133";//璞嗚眴
+ //etAccount.Text = "18316672920";
//etAccount.Text = "18316120654";//tujie
- etAccount.Text = "15626203746";
+ //etAccount.Text = "15626203746";
//etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
}
else
@@ -233,9 +232,9 @@
//etAccount.Text = "15971583093";//楂樿儨
//etAccount.Text = "15217626103";//鏄嗘槑閲戣寕椤圭洰
//etAccount.Text = "18598273624";
- //etAccount.Text = "tf@smarttech.com.ua";
+ etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
- etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
//etAccount.Text = "18402017839";//wjc
//etAccount.Text = "13430286286";//cwc
//etAccount.Text = "13709260805";
@@ -246,9 +245,9 @@
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "fslcjm5@163.com")
+ if(etAccount.Text == "tf@smarttech.com.ua")
{
- etPassword.Text = "a123456";
+ etPassword.Text = "Smart2021";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
@@ -1119,11 +1118,11 @@
#region 闅愮鏀跨瓥
AddServiceAgreementControl(bodyView);
-#endregion
+ #endregion
}
-#region 鈻� 鏈嶅姟鍗忚___________________________
+ #region 鈻� 鏈嶅姟鍗忚___________________________
bool isAgreePrivacyPolicy = false;
/// <summary>
/// 娣诲姞鏈嶅姟鍗忚鎺т欢
@@ -1132,6 +1131,11 @@
private void AddServiceAgreementControl(FrameLayout frameLayout)
{
isAgreePrivacyPolicy = OnAppConfig.Instance.isAgreePrivacyPolicy;
+
+
+
+
+
var frameRow = new FrameLayout()
{
Height = Application.GetRealHeight(28),
@@ -1158,7 +1162,7 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
- IsSelected = isAgreePrivacyPolicy,
+ IsSelected = OnAppConfig.Instance.isAgreePrivacyPolicy,
Gravity = Gravity.Center
};
agreeView.AddChidren(agreeBtn);
@@ -1238,6 +1242,13 @@
{
OpenWebViewPage(true);
};
+
+ #if __ANDROID__
+ //if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
+ //{
+ // HDL_ON_Android.HDLONUtils.StartSplashActivity();
+ //}
+ #endif
}
/// <summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 7b9c9c7..32a50b9 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -42,6 +42,7 @@
OnAppConfig.Instance.GlobalRegion = mGlobalRegionListObj;
OnAppConfig.Instance.SaveConfig();
}
+ OnAppConfig.Instance.RequestHttpsHost = @"https://bahrain-gateway.hdlcontrol.com";
}
catch { }
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index fc44e04..ddbe6d8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -661,6 +661,7 @@
TextSize = CSS_FontSize.TextFontSize,
Text = title,
IsBold = true,
+ IsMoreLines = true,
};
this.AddChidren(btnTitle);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
index b39f8be..9455d9a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
@@ -180,7 +180,14 @@
double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt);
tt *= 100;//涔樹互100锛屽皬浜�1鏃犳硶鍔犺浇echart
tt = Math.Round(tt, 2);
- list.Add(ene.name, tt.ToString());
+ if (list.ContainsKey(ene.name))
+ {
+ list.Add(ene.name + "1", tt.ToString());
+ }
+ else
+ {
+ list.Add(ene.name, tt.ToString());
+ }
}
myEchartsView_Pie.ShowWithOption(new EchartsOption_Pie().InitDateJson(list));
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index 43d7878..967b921 100644
--- a/SiriIntents/Info.plist
+++ b/SiriIntents/Info.plist
@@ -11,9 +11,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
- <string>1.3.202112062</string>
+ <string>1.3.202112271</string>
<key>CFBundleVersion</key>
- <string>1.3.12062</string>
+ <string>1.3.12271</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
<key>NSExtension</key>
diff --git a/SiriIntentsUI/Info.plist b/SiriIntentsUI/Info.plist
index 1c27acc..e4359f0 100644
--- a/SiriIntentsUI/Info.plist
+++ b/SiriIntentsUI/Info.plist
@@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
- <string>1.3.202112062</string>
+ <string>1.3.202112271</string>
<key>CFBundleVersion</key>
- <string>1.3.12062</string>
+ <string>1.3.12271</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
<key>NSExtension</key>
--
Gitblit v1.8.0