From b3c9ada9a3e758c9f67abb9fc0a6a2764c7ea03d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 十月 2022 11:19:07 +0800
Subject: [PATCH] 光伏更新主页图标
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_Android/Assets/Language.ini | 30 +++++-----
HDL-ON_iOS/HDL-ON_iOS.csproj | 7 ++
HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon1.png | 0
HDL_ON/Common/ApiUtlis.cs | 2
HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon1.png | 0
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 83 +++++++++++++++++++--------
HDL-ON_iOS/Resources/Phone/Public/IotCheckIcon.png | 0
HDL-ON_iOS/Resources/Phone/Public/LinkIotIcon.png | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 4
HDL-ON_Android/HDL-ON_Android.csproj | 4 +
HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon3.png | 0
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 30 +++++-----
HDL_ON/DAL/Server/HttpUtil.cs | 1
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs | 2
HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon3.png | 0
HDL-ON_iOS/Resources/Phone/Public/IotCheckOnIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon2.png | 0
20 files changed, 105 insertions(+), 64 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 6355595..b368a91 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -547,11 +547,11 @@
559=Bind a third-party account
560=Bound
561=Original password
-562=PhotovoltaicEnergyStorage
+562=Photovoltaic
563=Normal operation
-564=Working mode:----
-565=Power generation today: --- kW 路 H
-566=Current power generation: --- w
+564= ----
+565= ---- kW路h
+566= ---- w
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
@@ -1768,9 +1768,9 @@
561=鍘熷瘑鐮�
562=鍏変紡鍌ㄨ兘
563=宸ヤ綔姝ｅ父
-564=宸ヤ綔妯″紡: ----
-565=浠婃棩鍙戠數: ----KW路h
-566=鍙戠數鍔熺巼: ----w
+564= ----
+565= ----KW路h
+566= ----w
567=鐢垫睜SOC: --%
568=杩愯鏁伴噺/鎬绘暟閲�: --/--
569=浜哄眳鐜
@@ -2963,11 +2963,11 @@
559=Bind a third-party account
560=Bound
561=Original password
-562=PhotovoltaicEnergyStorage
+562=Photovoltaic
563=Normal operation
-564=Working mode:----
-565=Power generation today: --- kW 路 H
-566=Current power generation: --- w
+564= ----
+565= ---- kW路h
+566= ---- w
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
@@ -4166,11 +4166,11 @@
559=Bind a third-party account
560=Bound
561=Original password
-562=PhotovoltaicEnergyStorage
+562=Photovoltaic
563=Normal operation
-564=Working mode:----
-565=Power generation today: --- kW 路 H
-566=Current power generation: --- w
+564= ----
+565= ---- kW路h
+566= ---- w
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon1.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon1.png
new file mode 100644
index 0000000..b7439e8
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon1.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon2.png
new file mode 100644
index 0000000..1180abd
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon3.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon3.png
new file mode 100644
index 0000000..c2cd105
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Inverter/Icon3.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c5915a1..2ca4b05 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -293,6 +293,9 @@
<AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
<AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon3.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
@@ -1501,6 +1504,7 @@
<Folder Include="Zxing\" />
<Folder Include="Assets\Phone\FunctionIcon\CAC\" />
<Folder Include="Assets\Phone\FunctionIcon\Panel\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 7f99e08..acd3aec 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202210111">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202210131">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index defc966..1b44744 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -489,6 +489,7 @@
<Folder Include="Base.lproj\" />
<Folder Include="Resources\Phone\FunctionIcon\CAC\" />
<Folder Include="Resources\Phone\FunctionIcon\Panel\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Inverter\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1540,6 +1541,12 @@
<BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
<BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Inverter\Icon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Inverter\Icon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Inverter\Icon3.png" />
+ <BundleResource Include="Resources\Phone\Public\IotCheckIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\IotCheckOnIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\LinkIotIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 069281e..3daaf41 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.6.102210091</string>
+ <string>1.6.102210131</string>
<key>CFBundleVersion</key>
- <string>1.6.110091</string>
+ <string>1.6.110131</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 6355595..b368a91 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -547,11 +547,11 @@
559=Bind a third-party account
560=Bound
561=Original password
-562=PhotovoltaicEnergyStorage
+562=Photovoltaic
563=Normal operation
-564=Working mode:----
-565=Power generation today: --- kW 路 H
-566=Current power generation: --- w
+564= ----
+565= ---- kW路h
+566= ---- w
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
@@ -1768,9 +1768,9 @@
561=鍘熷瘑鐮�
562=鍏変紡鍌ㄨ兘
563=宸ヤ綔姝ｅ父
-564=宸ヤ綔妯″紡: ----
-565=浠婃棩鍙戠數: ----KW路h
-566=鍙戠數鍔熺巼: ----w
+564= ----
+565= ----KW路h
+566= ----w
567=鐢垫睜SOC: --%
568=杩愯鏁伴噺/鎬绘暟閲�: --/--
569=浜哄眳鐜
@@ -2963,11 +2963,11 @@
559=Bind a third-party account
560=Bound
561=Original password
-562=PhotovoltaicEnergyStorage
+562=Photovoltaic
563=Normal operation
-564=Working mode:----
-565=Power generation today: --- kW 路 H
-566=Current power generation: --- w
+564= ----
+565= ---- kW路h
+566= ---- w
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
@@ -4166,11 +4166,11 @@
559=Bind a third-party account
560=Bound
561=Original password
-562=PhotovoltaicEnergyStorage
+562=Photovoltaic
563=Normal operation
-564=Working mode:----
-565=Power generation today: --- kW 路 H
-566=Current power generation: --- w
+564= ----
+565= ---- kW路h
+566= ---- w
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon1.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon1.png
new file mode 100644
index 0000000..b7439e8
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon1.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon2.png
new file mode 100644
index 0000000..1180abd
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon3.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon3.png
new file mode 100644
index 0000000..c2cd105
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Inverter/Icon3.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Public/IotCheckIcon.png b/HDL-ON_iOS/Resources/Phone/Public/IotCheckIcon.png
new file mode 100644
index 0000000..0fa6702
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/Public/IotCheckIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Public/IotCheckOnIcon.png b/HDL-ON_iOS/Resources/Phone/Public/IotCheckOnIcon.png
new file mode 100644
index 0000000..0dffe12
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/Public/IotCheckOnIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Public/LinkIotIcon.png b/HDL-ON_iOS/Resources/Phone/Public/LinkIotIcon.png
new file mode 100644
index 0000000..eb33281
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/Public/LinkIotIcon.png
Binary files differ
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index e175781..15c61f8 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -318,7 +318,7 @@
{ IsBackground = true }.Start();
//===================璇诲彇閫昏緫鍒楄〃==========================
- UI.UI2.Intelligence.Automation.MainView.GetLogicList();
+ UI.UI2.Intelligence.Automation.MainView.GetLogicList(true);
//===================璇诲彇鍙瀵硅鏁版嵁==========================
//鍒ゆ柇鏄惁鏈夊彲瑙嗗璁叉暟鎹紝鏈夊垯鏄剧ず鍙瀵硅icon
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 1c3250c..511a91e 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,7 +17,6 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
-
public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index f2177b9..acbc6c3 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1227,12 +1227,23 @@
//};
//inverterListView.AddChidren(btnWorkStatus);
- Button btnWorkingMode = new Button()
+ Button btnWorkingModeIcon = new Button()
{
X = Application.GetRealWidth(16),
+ Y = btnOpenCount.Bottom + Application.GetRealHeight(5),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealWidth(14),
+ UnSelectedImagePath = "FunctionIcon/Inverter/Icon1.png"
+ };
+ inverterListView.AddChidren(btnWorkingModeIcon);
+
+
+ Button btnWorkingMode = new Button()
+ {
+ X = Application.GetRealWidth(37),
Y = btnOpenCount.Bottom + Application.GetRealHeight(5),// + Application.GetRealHeight(16),
Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(18),
+ Height = Application.GetRealHeight(14),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.WorkingMode,
@@ -1240,12 +1251,23 @@
};
inverterListView.AddChidren(btnWorkingMode);
- Button btnPowerTenerationToday = new Button()
+
+ Button btnPowerTenerationTodayIcon = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnWorkingMode.Bottom + Application.GetRealHeight(5),
+ Y = btnWorkingMode.Bottom + Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealWidth(14),
+ UnSelectedImagePath = "FunctionIcon/Inverter/Icon2.png"
+ };
+ inverterListView.AddChidren(btnPowerTenerationTodayIcon);
+
+ Button btnPowerTenerationToday = new Button()
+ {
+ X = Application.GetRealWidth(37),
+ Y = btnWorkingMode.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(21),
+ Height = Application.GetRealHeight(14),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.PowerTenerationToday,
@@ -1253,13 +1275,22 @@
};
inverterListView.AddChidren(btnPowerTenerationToday);
+ Button btnCurrentPowerGenerationIcon = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(14),
+ Height = Application.GetRealWidth(14),
+ UnSelectedImagePath = "FunctionIcon/Inverter/Icon3.png"
+ };
+ inverterListView.AddChidren(btnCurrentPowerGenerationIcon);
Button btnCurrentPowerGeneration = new Button()
{
- X = Application.GetRealWidth(16),
- Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(5),
+ X = Application.GetRealWidth(37),
+ Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(21),
+ Height = Application.GetRealHeight(14),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.CurrentPowerGeneration,
@@ -1267,17 +1298,17 @@
};
inverterListView.AddChidren(btnCurrentPowerGeneration);
- Button btnBatterySOC = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = btnCurrentPowerGeneration.Bottom,
- Width = Application.GetRealWidth(148),
- Height = Application.GetRealHeight(18),
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = StringId.BatterySOC,
- TextAlignment = TextAlignment.CenterLeft,
- };
+ //Button btnBatterySOC = new Button()
+ //{
+ // X = Application.GetRealWidth(37),
+ // Y = btnCurrentPowerGeneration.Bottom,
+ // Width = Application.GetRealWidth(148),
+ // Height = Application.GetRealHeight(18),
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextID = StringId.BatterySOC,
+ // TextAlignment = TextAlignment.CenterLeft,
+ //};
//inverterListView.AddChidren(btnBatterySOC);
//Button btnOperationDataTotalData = new Button()
@@ -1354,7 +1385,7 @@
{
h5BasePage.RemoveFromParent();
});
- refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
+ refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration);
}
else if (jObj["method"].ToString() == "setPageIndex")
{
@@ -1367,7 +1398,7 @@
};
- refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
+ refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration);
index++;
}
@@ -1377,7 +1408,7 @@
#endregion
}
- void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration, Button btnBatterySOC)
+ void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration)
{
new System.Threading.Thread(() =>
{
@@ -1398,7 +1429,7 @@
{
Application.RunOnMainThread(() =>
{
- btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
+ btnPowerTenerationToday.Text = info.totalElectricityPvToday + "kW路h";// Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
string workModeString = "";
if (Language.CurrentLanguage == "Chinese") {
switch (info.workMode)
@@ -1429,9 +1460,9 @@
break;
}
}
- btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", workModeString);
- btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
- btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
+ btnWorkingMode.Text = workModeString;// Language.StringByID(StringId.WorkingMode).Replace("----", workModeString);
+ btnCurrentPowerGeneration.Text = info.powerPvNow + "w";// Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
+ //btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
});
}
catch (Exception ex)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 57848d1..a28c458 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -258,9 +258,9 @@
/// <summary>
/// 鑾峰彇閫昏緫鍒楄〃
/// </summary>
- public static void GetLogicList()
+ public static void GetLogicList(bool needRefresh = false)//澧炲姞寮哄埗鍒锋柊
{
- if (Logic.LogicList.Count != 0)
+ if (Logic.LogicList.Count != 0 || !needRefresh)
{
//鑷姩鍖栧垪琛ㄤ负0鎵嶅幓鑾峰彇鑷姩鍖栧垪琛紱
return;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
index dc0bd62..0a77c44 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
@@ -257,6 +257,7 @@
var http = new HttpServerRequest();
var waitPage = new Loading();
this.AddChidren(waitPage);
+ dialog.Close();
waitPage.Start("");
new System.Threading.Thread(() =>
{
@@ -279,7 +280,6 @@
}
else
{
- dialog.Close();
if (Language.CurrentLanguage != "Chinese")
{
new Alert("", "Operation failed", "").Show();
--
Gitblit v1.8.0