wxr
2022-01-14 db82174d1a8f728da1dd4047e52542b6c86b3059
友盟SDK
3个文件已添加
6个文件已修改
46 ■■■■ 已修改文件
DLL/Shared.Droid.HDLWidget-BackgroudLocation.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid.HDLWidget.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/UMeng/UMSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/ViewController.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpUtil.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ThirdPartyIntegration/OnproUmengSdk/ApiDefinitions.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid.HDLWidget-BackgroudLocation.dll
Binary files differ
DLL/Shared.Droid.HDLWidget.dll
Binary files differ
DLL/UMeng/UMSdk.dll
Binary files differ
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">
        <!--/扫描二维码activity-->
        <!--<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>
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">
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()
        {
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>
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";
ThirdPartyIntegration/OnproUmengSdk/ApiDefinitions.cs
New file
@@ -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);
    }
}