From 7945aea863e3b4ea3cfbeacd6bde14d7a89afc55 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 22 九月 2023 14:13:12 +0800
Subject: [PATCH] RGB修改
---
HDL-ON_Android/HDL-ON_Android.csproj | 52 +++++-------
HDL-ON_iOS/Resources/Language.ini | 2
HDL-ON_Android/Assets/Language.ini | 2
HDL-ON_Android/Scan.cs | 30 -------
HDL-ON_iOS/HDL-ON_iOS.csproj | 58 +++++++-------
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 43 ++++++++--
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs | 14 +-
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI1-Login/LoginPage.cs | 2
9 files changed, 96 insertions(+), 109 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 5f9922e..ff8cadd 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -2013,7 +2013,7 @@
630=鐐僵鍔熻兘
631=璧峰棰滆壊
632=缁撴潫棰滆壊
-633=鐐僵鍛ㄦ湡
+633=鐐僵閫熺巼
634=鎺ㄨ崘
635=褰撳墠棰滆壊
636=鑹插�煎彿涓�6浣嶏紙鐢辩函鏁板瓧/鏁板瓧+瀛楁瘝缁勫悎锛�
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c6a2366..6e93f55 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -402,27 +402,6 @@
<AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorfulBar.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_blue.png" />
- <AndroidAsset Include="Assets\h5\index.html" />
- <AndroidAsset Include="Assets\h5\static\index.63b34199.css" />
- <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
- <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\eidt.png" />
- <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" />
- <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" />
- <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" />
- <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" />
- <AndroidAsset Include="Assets\h5\static\images\yinying.png" />
- <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" />
- <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" />
- <AndroidAsset Include="Assets\h5\static\images\left-icon.png" />
- <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
<AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
<AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
<AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
@@ -588,8 +567,6 @@
<AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
- <AndroidAsset Include="Assets\h5\static\js\index.31e0ba7a.js" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index.25064587.js" />
<AndroidAsset Include="Assets\Phone\HisenseTv\guan.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\kai.png" />
<AndroidAsset Include="Assets\Phone\HisenseTv\kaiguanSelected.png" />
@@ -598,14 +575,31 @@
<AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjiaSelected.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
- <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
- <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
- <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\h5\static\font\SourceHanSansCN-Normal.otf" />
<AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
+ <AndroidAsset Include="Assets\h5\index.html" />
+ <AndroidAsset Include="Assets\h5\static\index.63b34199.css" />
+ <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\eidt.png" />
+ <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" />
+ <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" />
+ <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" />
+ <AndroidAsset Include="Assets\h5\static\images\yinying.png" />
+ <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" />
+ <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" />
+ <AndroidAsset Include="Assets\h5\static\images\left-icon.png" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-index-index.a5a00a32.js" />
+ <AndroidAsset Include="Assets\h5\static\js\index.3517131b.js" />
+ <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
+ <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_Android/Scan.cs b/HDL-ON_Android/Scan.cs
index ea1bf16..ee51da6 100644
--- a/HDL-ON_Android/Scan.cs
+++ b/HDL-ON_Android/Scan.cs
@@ -49,37 +49,7 @@
HDL_ON_Android.ScanActivity.InitDdd(this);
- //MobileBarcodeScanner.Initialize(Shared.Application.Activity.Application);
- //var mZXingCustomScanView = new ZXingCustomScanView(Shared.Application.Activity.Application);
- //mZXingCustomScanView.cancelTextView.Text = cancel;
- //mZXingCustomScanView.flashTextView.Text = flashText;
- //mZXingCustomScanView.titleTextView.Text = titleText;
- //mZXingCustomScanView.SetMinimumWidth( 1800);
- //var bOn = false;
- //scanner = new ZXing.Mobile.MobileBarcodeScanner()
- //{
- // UseCustomOverlay = true,
- // CustomOverlay = mZXingCustomScanView
- //};
- ////scanner.CustomOverlay.width
- //mZXingCustomScanView.OnCancel += () =>
- //{
-
- // scanner?.Cancel();
- //};
-
- //mZXingCustomScanView.OnTorch += () =>
- //{
- // bOn = !bOn;
- // scanner?.Torch(bOn);
- //};
}
-
- //var result = await scanner.Scan();
- //if (result != null)
- // action?.Invoke(result.Text);
- //else
- // action?.Invoke(null);
}
else
{
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 6e85bb0..7f00bda 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1584,35 +1584,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
<BundleResource Include="Resources\Phone\Classification\Room\HomePagebg.png" />
- <BundleResource Include="Resources\h5\index.html" />
- <BundleResource Include="Resources\h5\static\index.63b34199.css" />
- <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
- <BundleResource Include="Resources\h5\static\images\inverter-center.svg" />
- <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" />
- <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" />
- <BundleResource Include="Resources\h5\static\images\eidt.png" />
- <BundleResource Include="Resources\h5\static\images\switch-off.svg" />
- <BundleResource Include="Resources\h5\static\images\circle-ic.png" />
- <BundleResource Include="Resources\h5\static\images\inverter-center.png" />
- <BundleResource Include="Resources\h5\static\images\pan_ic.png" />
- <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" />
- <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" />
- <BundleResource Include="Resources\h5\static\images\switch-on.svg" />
- <BundleResource Include="Resources\h5\static\images\inverter-center.webp" />
- <BundleResource Include="Resources\h5\static\images\yinying.png" />
- <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
- <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
- <BundleResource Include="Resources\h5\static\images\left-icon.png" />
- <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
- <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
- <BundleResource Include="Resources\h5\static\js\index.31e0ba7a.js" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index.25064587.js" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
- <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
- <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\h5\static\font\SourceHanSansCN-Normal.otf" />
<BundleResource Include="Resources\Phone\HisenseTv\yingliangjian.png" />
<BundleResource Include="Resources\Phone\HisenseTv\caidan.png" />
<BundleResource Include="Resources\Phone\HisenseTv\offtvbj.png" />
@@ -1755,6 +1726,35 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
<BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
+ <BundleResource Include="Resources\h5\index.html" />
+ <BundleResource Include="Resources\h5\static\index.63b34199.css" />
+ <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
+ <BundleResource Include="Resources\h5\static\images\inverter-center.svg" />
+ <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" />
+ <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" />
+ <BundleResource Include="Resources\h5\static\images\eidt.png" />
+ <BundleResource Include="Resources\h5\static\images\switch-off.svg" />
+ <BundleResource Include="Resources\h5\static\images\circle-ic.png" />
+ <BundleResource Include="Resources\h5\static\images\inverter-center.png" />
+ <BundleResource Include="Resources\h5\static\images\pan_ic.png" />
+ <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" />
+ <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" />
+ <BundleResource Include="Resources\h5\static\images\switch-on.svg" />
+ <BundleResource Include="Resources\h5\static\images\inverter-center.webp" />
+ <BundleResource Include="Resources\h5\static\images\yinying.png" />
+ <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
+ <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
+ <BundleResource Include="Resources\h5\static\images\left-icon.png" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index.a5a00a32.js" />
+ <BundleResource Include="Resources\h5\static\js\index.3517131b.js" />
+ <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
+ <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
+ <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\h5\static\font\SourceHanSansCN-Normal.otf" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 0dff473..9d76f34 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -2013,7 +2013,7 @@
630=鐐僵鍔熻兘
631=璧峰棰滆壊
632=缁撴潫棰滆壊
-633=鐐僵鍛ㄦ湡
+633=鐐僵閫熺巼
634=鎺ㄨ崘
635=褰撳墠棰滆壊
636=鑹插�煎彿涓�6浣嶏紙鐢辩函鏁板瓧/鏁板瓧+瀛楁瘝缁勫悎锛�
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 82136c9..d5e3084 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.1.3";
+ public static string VersionString = "2.1.4";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 496c9ab..512a64e 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -476,6 +476,7 @@
}
+ static Dialog dialogTipMsgAutoClose;
/// <summary>
/// 淇℃伅鎻愮ず绐楀彛锛岃嚜鍔ㄥ叧闂�
@@ -484,14 +485,31 @@
/// <param name="isWhite"></param>
public void TipMsgAutoClose(string msg, bool isWhite, int closeTime = 1500)
{
- Dialog dialog = new Dialog();
+ if (dialogTipMsgAutoClose == null)
+ {
+ dialogTipMsgAutoClose = new Dialog();
+ }
+ else
+ {
+ try
+ {
+ if (dialogTipMsgAutoClose != null)
+ {
+ dialogTipMsgAutoClose.Close();
+ }
+ dialogTipMsgAutoClose = null;
+ }
+ catch { }
+ dialogTipMsgAutoClose = new Dialog();
+
+ }
FrameLayout dialogBody = new FrameLayout();
- dialog.AddChidren(dialogBody);
+ dialogTipMsgAutoClose.AddChidren(dialogBody);
dialogBody.MouseUpEventHandler = (sender, e) =>
{
- dialog.Close();
- dialog = null;
+ dialogTipMsgAutoClose.Close();
+ dialogTipMsgAutoClose = null;
};
FrameLayout frame = new FrameLayout()
@@ -503,11 +521,11 @@
BackgroundColor = isWhite ? 0xE6FFFFFF : CSS_Color.DialogTransparentColor1,
Radius = (uint)Application.GetRealWidth(12),
};
- dialog.AddChidren(frame);
+ dialogTipMsgAutoClose.AddChidren(frame);
frame.MouseUpEventHandler = (sender, e) =>
{
- dialog.Close();
- dialog = null;
+ dialogTipMsgAutoClose.Close();
+ dialogTipMsgAutoClose = null;
};
Button btnTipIcon = new Button()
@@ -532,17 +550,22 @@
};
frame.AddChidren(btnTipMsg);
- dialog.Show();
+ dialogTipMsgAutoClose.Show();
new Thread(() =>
{
Thread.Sleep(closeTime);
Application.RunOnMainThread(() =>
{
- if(dialog!=null)
+ try
{
- dialog.Close();
+ if (dialogTipMsgAutoClose != null)
+ {
+ dialogTipMsgAutoClose.Close();
+ }
+ dialogTipMsgAutoClose = null;
}
+ catch { }
});
})
{ IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 3f042bc..ee73f8b 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -327,6 +327,7 @@
etAccount.Text = "18316672920";
etAccount.Text = "18244942707";
etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
+ etAccount.Text = "18933160333";
}
else
{
@@ -344,7 +345,6 @@
//etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
//etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
- //etAccount.Text = "18402017839";//wjc
//etAccount.Text = "13430286286";//cwc
//etAccount.Text = "13709260805";
//etAccount.Text = "support5@hdlchina.com.cn";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
index 9a24099..fe9d187 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
@@ -274,8 +274,8 @@
var time = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.ColorfulTime));
- btnWorkHours.Text = time/ 360 + Language.StringByID(StringId.h);
- btnWorkHours.Text += time / 60 + Language.StringByID(StringId.m);
+ //btnWorkHours.Text = time/ 360 + Language.StringByID(StringId.h);
+ btnWorkHours.Text = time / 60 + Language.StringByID(StringId.m);
btnWorkHours.Text += time % 60 + Language.StringByID(StringId.s);
var waitPage = new Loading();
@@ -297,8 +297,8 @@
new PublicAssmebly().TipMsg(StringId.Tip, StringId.TimeInvalid);
return;
}
- btnWorkHours.Text = hour + "鏃�";
- btnWorkHours.Text += minute + "鍒�";
+ //btnWorkHours.Text = hour + "鏃�";
+ btnWorkHours.Text = minute + "鍒�";
btnWorkHours.Text += second + "绉�";
new System.Threading.Thread(() => {
var d = new Dictionary<string, string>();
@@ -402,13 +402,13 @@
{
item1.Add(i+Language.StringByID(StringId.h));
}
- for (int i = 0; i <= 59; i += 1)
+ for (int i = 1; i <= 119; i += 1)
{
item2.Add(i + Language.StringByID(StringId.m));
item3.Add(i + Language.StringByID(StringId.s));
}
- uIPickerView.setNPicker(item1, item2,item3);
- uIPickerView.setCurrentItems(hour, minute, second);
+ uIPickerView.setNPicker( item3,null,null);
+ uIPickerView.setCurrentItems(second-1,0,0);
optionBaseView.AddChidren(uIPickerView);
dialog.Show();
--
Gitblit v1.8.0