From db82174d1a8f728da1dd4047e52542b6c86b3059 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 14 一月 2022 13:10:59 +0800
Subject: [PATCH] 友盟SDK
---
DLL/UMeng/UMSdk.dll | 0
HDL-ON_iOS/ViewController.cs | 13 +++++++++++++
HDL-ON_Android/Properties/AndroidManifest.xml | 11 +++++++++--
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL-ON_iOS/HDL-ON_iOS.csproj | 3 +++
DLL/Shared.Droid.HDLWidget.dll | 0
ThirdPartyIntegration/OnproUmengSdk/ApiDefinitions.cs | 13 +++++++++++++
DLL/Shared.Droid.HDLWidget-BackgroudLocation.dll | 0
HDL_ON/UI/UI1-Login/LoginPage.cs | 2 +-
9 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/DLL/Shared.Droid.HDLWidget-BackgroudLocation.dll b/DLL/Shared.Droid.HDLWidget-BackgroudLocation.dll
new file mode 100644
index 0000000..032a0df
--- /dev/null
+++ b/DLL/Shared.Droid.HDLWidget-BackgroudLocation.dll
Binary files differ
diff --git a/DLL/Shared.Droid.HDLWidget.dll b/DLL/Shared.Droid.HDLWidget.dll
index 032a0df..91c55f5 100644
--- a/DLL/Shared.Droid.HDLWidget.dll
+++ b/DLL/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/DLL/UMeng/UMSdk.dll b/DLL/UMeng/UMSdk.dll
new file mode 100644
index 0000000..7fe25d7
--- /dev/null
+++ b/DLL/UMeng/UMSdk.dll
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 3c9fe94..9a1f2f0 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202201121" android:versionName="1.5.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202201141" android:versionName="1.5.2" package="com.hdl.onpro"
+ xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="30" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
@@ -7,6 +8,7 @@
<!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>-->
<!--<uses-permission android:name="android.permission.READ_PHONE_STATE"/>-->
<!--<uses-permission android:name="android.permission.INTERNET"/>-->
+
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<uses-permission android:name="android.permission.INTERNET" />-->
<!--缃戠粶璁块棶-->
@@ -87,8 +89,12 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_LOGS" />
+
+
+
<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
- <application android:allowBackup="true" android:debuggable="false" 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">
+
<!--/鎵弿浜岀淮鐮乤ctivity-->
<!--<activity
android:name="com.journeyapps.barcodescanner.CaptureActivity"
@@ -195,4 +201,5 @@
<!-- 璁剧疆楂樺痉鍦板浘key -->
<meta-data android:name="com.amap.api.v2.apikey" android:value="9901dd06e30b229efdd4c5bf5e076224" />
</application>
+
</manifest>
\ No newline at end of file
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index b91b57c..97b08bc 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -110,6 +110,9 @@
<Reference Include="Shared.IOS.HDLSceneSiri">
<HintPath>..\..\HDLXamarinSceneSiri\Shared.IOS.HDLSceneSiri\Shared.IOS.HDLSceneSiri\bin\Release\Shared.IOS.HDLSceneSiri.dll</HintPath>
</Reference>
+ <Reference Include="UMSdk">
+ <HintPath>..\DLL\UMeng\UMSdk.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index 05e8540..478b9b5 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -48,6 +48,19 @@
}
+ //鍚姩鍙嬬洘sdk
+ new System.Threading.Thread(() => {
+ while (true)
+ {
+ if (OnAppConfig.Instance.IsLogin)
+ {
+ var um = new UMSdk.HDLUMSDK();
+ um.InitUMSDKWithAppKey("61d56642e0f9bb492bbc3e72", "IOS");
+ }
+ System.Threading.Thread.Sleep(1000);
+ }
+ }) { IsBackground = true }.Start();
+
}
public override UIStatusBarStyle PreferredStatusBarStyle()
{
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 315e9a2..6c692b6 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 89afbb6..5369bff 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -236,7 +236,7 @@
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 = "18402017839";//wjc
//etAccount.Text = "13430286286";//cwc
//etAccount.Text = "13709260805";
//etAccount.Text = "support5@hdlchina.com.cn";
diff --git a/ThirdPartyIntegration/OnproUmengSdk/ApiDefinitions.cs b/ThirdPartyIntegration/OnproUmengSdk/ApiDefinitions.cs
new file mode 100644
index 0000000..16710e2
--- /dev/null
+++ b/ThirdPartyIntegration/OnproUmengSdk/ApiDefinitions.cs
@@ -0,0 +1,13 @@
+using Foundation;
+
+namespace UMSdk.ios
+{
+ // @interface HDLUMSDK : NSObject
+ [BaseType (typeof(NSObject))]
+ interface HDLUMSDK
+ {
+ // -(void)initUMSDKWithAppKey:(NSString *)appKey channel:(NSString *)channel;
+ [Export ("initUMSDKWithAppKey:channel:")]
+ void InitUMSDKWithAppKey (string appKey, string channel);
+ }
+}
--
Gitblit v1.8.0