From 8b6955d13baac33a1b07f3b90a07ed29c8232376 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 12 五月 2023 14:28:16 +0800
Subject: [PATCH] 地理围栏中英文适配
---
HDL-ON_Android/HDL-ON_Android.csproj | 1
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 5 ++
/dev/null | 47 -----------------------
HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs | 6 +-
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4 +-
HDL-ON_iOS/Resources/Language.ini | 11 +++++
HDL-ON_Android/Assets/Language.ini | 11 +++++
DLL/Shared.Droid1.dll | 0
HDL_ON/Common/R.cs | 10 ++++-
HDL_ON/UI/MainPage.cs | 4 +-
11 files changed, 42 insertions(+), 59 deletions(-)
diff --git a/DLL/Shared.Droid1.dll b/DLL/Shared.Droid1.dll
new file mode 100644
index 0000000..dbf1276
--- /dev/null
+++ b/DLL/Shared.Droid1.dll
Binary files differ
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 04445d1..02de4b8 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -607,6 +607,8 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
2532=Visitor Invitation Record
@@ -1882,6 +1884,9 @@
620=寰呴獙鏀�
621=鍒濆鎬�
622=楠屾敹
+623=缁忕含搴�
+624=瑙﹀彂鑼冨洿
+
2532=璁垮閭�璇疯褰�
@@ -3156,6 +3161,8 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
2532=Visitor Invitation Record
@@ -4425,6 +4432,8 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
@@ -5684,6 +5693,8 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 367a5c3..e5f0636 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -226,7 +226,6 @@
<Compile Include="Zxing\CustomCaptureActivity.cs" />
<Compile Include="Zxing\ScanActivity.cs" />
<Compile Include="LeChengVideo\LeTest.cs" />
- <Compile Include="Other\SmsReceiver.cs" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\agconnect-services.json" />
diff --git a/HDL-ON_Android/Other/SmsReceiver.cs b/HDL-ON_Android/Other/SmsReceiver.cs
deleted file mode 100644
index cae40aa..0000000
--- a/HDL-ON_Android/Other/SmsReceiver.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-锘縰sing System;
-using System.Text;
-using Android.App;
-using Android.Content;
-using Android.Provider;
-using Android.Telephony;
-
-namespace HDL_ON_Android.Other
-{
- [BroadcastReceiver(Enabled = true, Label = "SMS Receiver")]
- [IntentFilter(new[] { "android.provider.Telephony.SMS_RECEIVED" })]
- public class SmsReceiver : BroadcastReceiver
- {
- public override void OnReceive(Context context, Intent intent)
- {
- if (intent.Action != Telephony.Sms.Intents.SmsReceivedAction)
- return;
-
- var bundle = intent.Extras;
- if (bundle == null)
- return;
-
- try
- {
- var pdus = (Java.Lang.Object[])bundle.Get("pdus");
- if (pdus == null)
- return;
-
- var msgs = new SmsMessage[pdus.Length];
- var sb = new StringBuilder();
- for (var i = 0; i < msgs.Length; i++)
- {
- msgs[i] = SmsMessage.CreateFromPdu((byte[])pdus[i]);
- sb.Append(msgs[i].MessageBody);
- }
-
- // 澶勭悊鎺ユ敹鍒扮殑鐭俊鍐呭
- string message = sb.ToString();
- // TODO: 澶勭悊鎺ユ敹鍒扮殑鐭俊鍐呭
- }
- catch (Exception ex)
- {
- Console.WriteLine("澶勭悊鎺ユ敹鍒扮殑鐭俊鍐呭寮傚父" + ex.Message);
- }
- }
- }
-}
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 57f0b3f..b3ca131 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.7.5" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305101">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305122">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index af356b1..6313305 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@
<key>CFBundleName</key>
<string>On Pro</string>
<key>CFBundleShortVersionString</key>
- <string>1.7.5</string>
+ <string>1.7.6</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.7.5</string>
+ <string>1.7.6</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixinULAPI</string>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 04445d1..02de4b8 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -607,6 +607,8 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
2532=Visitor Invitation Record
@@ -1882,6 +1884,9 @@
620=寰呴獙鏀�
621=鍒濆鎬�
622=楠屾敹
+623=缁忕含搴�
+624=瑙﹀彂鑼冨洿
+
2532=璁垮閭�璇疯褰�
@@ -3156,6 +3161,8 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
2532=Visitor Invitation Record
@@ -4425,6 +4432,8 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
@@ -5684,6 +5693,8 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 7f2d884..4c060dd 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,8 +4,14 @@
{
public static class StringId
{
-
-
+ /// <summary>
+ /// 瑙﹀彂鑼冨洿
+ /// </summary>
+ public const int TriggeredRange = 624;
+ /// <summary>
+ /// 缁忕含搴�
+ /// </summary>
+ public const int LatAndLon= 623;
/// <summary>
/// 楠屾敹
/// </summary>
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 9e6d8aa..e69a4b8 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.7.5";
+ public static string VersionString = "1.7.6";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -140,7 +140,7 @@
_RoomNotSupportFunctionList.Add(SPK.AvMusic);
_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
- _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
+ //_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
_RoomNotSupportFunctionList.Add(SPK.SensorLight);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs
index a37e8e9..d173496 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs
@@ -25,7 +25,7 @@
{
RemoveFromParent();
};
- topView.topNameBtn.Text = "閫夋嫨瀹氫綅浣嶇疆";
+ topView.topNameBtn.TextID = StringId.Setting;// = "閫夋嫨瀹氫綅浣嶇疆";
FrameLayout viewLayout = new FrameLayout
{
@@ -43,7 +43,7 @@
lonlatView.btnText.X = Application.GetRealWidth(16);
lonlatView.btnLine.X = Application.GetRealWidth(16);
lonlatView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
- lonlatView.btnText.Text = "褰撳墠鐨勭粡绾害";
+ lonlatView.btnText.TextID = StringId.LatAndLon;
lonlatView.btnState.Visible = true;
lonlatView.btnState.IsMoreLines = true;
lonlatView.btnState.Height = Application.GetRealHeight(25);
@@ -59,7 +59,7 @@
locateView.btnText.X = Application.GetRealWidth(16);
locateView.btnLine.X = Application.GetRealWidth(16);
locateView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
- locateView.btnText.Text = "鍦ㄨ浣嶇疆鑼冨洿鏃�";
+ locateView.btnText.TextID = StringId.TriggeredRange;
locateView.btnState.Visible = true;
locateView.btnState.Text = this.queryItem(r.ToString());
viewLayout.AddChidren(locateView.FLayoutView());
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 40f3a18..bdfc709 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -248,7 +248,10 @@
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
- d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+ if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+ {
+ d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+ }
//if (btnSwitch.IsSelected)
//{
// d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
--
Gitblit v1.8.0