From dbae982b5f97a12d49279e87aa3d167ae0c71a09 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 18 五月 2023 11:34:19 +0800
Subject: [PATCH] 增加自动化地理围栏图标
---
HDL-ON_Android/HDL-ON_Android.csproj | 1 +
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 1 +
HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png | 0
HDL-ON_Android/Application.cs | 4 ++++
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 12 ++++++++++++
7 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 1888200..47e46fb 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -48,6 +48,10 @@
base.OnCreate();
+#if DEBUG
+ new Com.Hdl.Dokitsdk.HdlDoKitSdk().InitDokit(this, "3385dbf09648d3d5aabaf03611180610");
+#endif
+
WifiManager manager = (WifiManager)this.GetSystemService(Context.WifiService);
multicast = manager.CreateMulticastLock("UDPwifi");
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png b/HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png
new file mode 100644
index 0000000..e424a54
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index e5f0636..d60a2f0 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -425,6 +425,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index b1617c2..81fdb1c 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.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305126">
+<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="202305161">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--鍙嬬洘-->
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 052dc20..f55067f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1566,6 +1566,7 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectlocation.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png
new file mode 100644
index 0000000..e424a54
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 57848d1..98e5cd6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -395,6 +395,12 @@
}
break;
+ case 8:
+ {
+ iconInt = 5;
+
+ }
+ break;
case 10:
{
iconInt = 4;
@@ -511,6 +517,12 @@
strIcon = "LogicIcon/selectTheScene.png";
}
break;
+ case 5:
+ {
+
+ strIcon = "LogicIcon/selectlocation.png";
+ }
+ break;
case 11:
{
//鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
--
Gitblit v1.8.0