极光Sdk

wxr

2024-07-25 7b390821384948a6541ee31ce2842d727c1670a9

极光Sdk

 HDL-ON_Android/Assets/agconnect-services.json

@@ -1,47 +1,96 @@
{
    "agcgw_all":{
        "CN":"connect-drcn.hispace.hicloud.com",
        "CN_back":"connect-drcn.dbankcloud.cn",
        "DE":"connect-dre.hispace.hicloud.com",
        "DE_back":"connect-dre.dbankcloud.cn",
        "RU":"connect-drru.hispace.hicloud.com",
        "RU_back":"connect-drru.dbankcloud.cn",
        "SG":"connect-dra.hispace.hicloud.com",
        "SG_back":"connect-dra.dbankcloud.cn"
    "agcgw": {
        "backurl": "connect-drcn.hispace.hicloud.com",
        "url": "connect-drcn.dbankcloud.cn",
        "websocketbackurl": "connect-ws-drcn.hispace.dbankcloud.com",
        "websocketurl": "connect-ws-drcn.hispace.dbankcloud.cn"
    },
    "client":{
        "cp_id":"2850086000428177029",
        "product_id":"736430079245970940",
        "client_id":"703480846752957504",
        "client_secret":"6E796F2ED36C43A87C4F7BB68680F29A15CBD7635F1D55ED004A17F2D2070D17",
        "project_id":"736430079245970940",
        "app_id":"104676079",
        "api_key":"CwEAAAAAzCMOmemAwFVmnLqO8YeBY1StA3YLbXD5k/jRfW8xIga0hN85Ka9PQ4R9hj7dn0WtjVkoW9rTgusFrJhAxUE4tMGV514=",
        "package_name":"com.hdl.onpro"
    "agcgw_all": {
        "CN": "connect-drcn.dbankcloud.cn",
        "CN_back": "connect-drcn.hispace.hicloud.com",
        "DE": "connect-dre.dbankcloud.cn",
        "DE_back": "connect-dre.hispace.hicloud.com",
        "RU": "connect-drru.hispace.dbankcloud.ru",
        "RU_back": "connect-drru.hispace.dbankcloud.cn",
        "SG": "connect-dra.dbankcloud.cn",
        "SG_back": "connect-dra.hispace.hicloud.com"
    },
    "oauth_client":{
        "client_id":"104676079",
        "client_type":1
    "websocketgw_all": {
        "CN": "connect-ws-drcn.hispace.dbankcloud.cn",
        "CN_back": "connect-ws-drcn.hispace.dbankcloud.com",
        "DE": "connect-ws-dre.hispace.dbankcloud.cn",
        "DE_back": "connect-ws-dre.hispace.dbankcloud.com",
        "RU": "connect-ws-drru.hispace.dbankcloud.ru",
        "RU_back": "connect-ws-drru.hispace.dbankcloud.cn",
        "SG": "connect-ws-dra.hispace.dbankcloud.cn",
        "SG_back": "connect-ws-dra.hispace.dbankcloud.com"
    },
    "app_info":{
        "app_id":"104676079",
        "package_name":"com.hdl.onpro"
    "client": {
        "cp_id": "2850086000428177029",
        "product_id": "736430079245970940",
        "client_id": "703480846752957504",
        "client_secret": "6E796F2ED36C43A87C4F7BB68680F29A15CBD7635F1D55ED004A17F2D2070D17",
        "project_id": "736430079245970940",
        "app_id": "104676079",
        "api_key": "CwEAAAAAzCMOmemAwFVmnLqO8YeBY1StA3YLbXD5k/jRfW8xIga0hN85Ka9PQ4R9hj7dn0WtjVkoW9rTgusFrJhAxUE4tMGV514=",
        "package_name": "com.hdl.onpro"
    },
    "configuration_version":"3.0",
    "appInfos":[
    "oauth_client": {
        "client_id": "104676079",
        "client_type": 1
    },
    "app_info": {
        "app_id": "104676079",
        "package_name": "com.hdl.onpro"
    },
    "service": {
        "analytics": {
            "collector_url": "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
            "collector_url_ru": "datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
            "collector_url_sg": "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
            "collector_url_de": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
            "collector_url_cn": "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
            "resource_id": "p1",
            "channel_id": ""
        },
        "edukit": {
            "edu_url": "edukit.cloud.huawei.com.cn",
            "dh_url": "edukit.cloud.huawei.com.cn"
        },
        "search": {
            "url": "https://search-drcn.cloud.huawei.com"
        },
        "cloudstorage": {
            "storage_url_sg_back": "https://agc-storage-dra.cloud.huawei.asia",
            "storage_url_ru_back": "https://agc-storage-drru.cloud.huawei.ru",
            "storage_url_ru": "https://agc-storage-drru.cloud.huawei.ru",
            "storage_url_de_back": "https://agc-storage-dre.cloud.huawei.eu",
            "storage_url_de": "https://ops-dre.agcstorage.link",
            "storage_url": "https://agc-storage-drcn.platform.dbankcloud.cn",
            "storage_url_sg": "https://ops-dra.agcstorage.link",
            "storage_url_cn_back": "https://agc-storage-drcn.cloud.huawei.com.cn",
            "storage_url_cn": "https://agc-storage-drcn.platform.dbankcloud.cn"
        },
        "ml": {
            "mlservice_url": "ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
        }
    },
    "region": "CN",
    "configuration_version": "3.0",
    "appInfos": [
        {
            "package_name":"com.hdl.onpro",
            "client":{
                "app_id":"104676079"
            "package_name": "com.hdl.onpro",
            "client": {
                "app_id": "104676079"
            },
            "app_info":{
                "package_name":"com.hdl.onpro",
                "app_id":"104676079"
            "app_info": {
                "package_name": "com.hdl.onpro",
                "app_id": "104676079"
            },
            "oauth_client":{
                "client_type":1,
                "client_id":"104676079"
            "oauth_client": {
                "client_type": 1,
                "client_id": "104676079"
            }
        }
    ]
}
}

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -199,7 +199,7 @@
      <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath>
    </Reference>
    <Reference Include="Shared.Droid.JPush">
      <HintPath>..\..\第三方功能\极光\Sdk5.3.1\Shared.Droid.JPush.dll</HintPath>
      <HintPath>..\..\第三方功能\极光\Sdk5.4.0\2024年07月22日\Shared.Droid.JPush.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -988,6 +988,12 @@
    <PackageReference Include="lz4net">
      <Version>1.0.15.93</Version>
    </PackageReference>
    <PackageReference Include="Huawei.Agconnect.AgconnectCore">
      <Version>1.9.1.300</Version>
    </PackageReference>
    <PackageReference Include="Huawei.Hmf.Tasks">
      <Version>1.5.2.300</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\Language.ini" />

 HDL-ON_Android/Other/JPush/JPushFirmBroadcast.cs

@@ -8,10 +8,10 @@
namespace HDL_ON_Android
{

    [BroadcastReceiver(Enabled = true, Exported = false, Name = "com.jinlu.onpro.JPushFirmBroadcast")]
    [BroadcastReceiver(Enabled = true, Exported = false, Name = "com.hdl.onpro.JPushFirmBroadcast")]
    [Android.App.IntentFilter(new string[]
    {
        "com.jinlu.onpro.jpush.firm.NOTIFICATION_OPENED"
        "com.hdl.onpro.jpush.firm.NOTIFICATION_OPENED"
    },
     Categories = new string[]
    {

 HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs

@@ -9,12 +9,12 @@
namespace HDL_ON_Android
{
    [Activity(
            Exported = true, Enabled = true, Name = "com.jinlu.onpro.JPushOpenClickActivity"
            Exported = true, Enabled = true, Name = "com.hdl.onpro.JPushOpenClickActivity"
        , Theme = "@android:style/Theme.Translucent.NoTitleBar")]
    [IntentFilter(new string[] { "com.jinlu.onpro.JPushOpenClickActivity", Intent.ActionView },
    [IntentFilter(new string[] { "com.hdl.onpro.JPushOpenClickActivity", Intent.ActionView },
         Categories = new string[]
        {
      "com.jinlu.onpro",Intent.CategoryDefault
      "com.hdl.onpro",Intent.CategoryDefault
        })
        ]
    public class JPushOpenClickActivity : Activity
@@ -30,8 +30,8 @@
        protected void HandleOpenClick(Intent intent)
        {
            Intent broadcastIntent = new Intent();
            broadcastIntent.SetAction("com.jinlu.onpro.jpush.firm.NOTIFICATION_OPENED");
            ComponentName componentName = new ComponentName(PackageName, "com.jinlu.onpro.JPushFirmBroadcast");
            broadcastIntent.SetAction("com.hdl.onpro.jpush.firm.NOTIFICATION_OPENED");
            ComponentName componentName = new ComponentName(PackageName, "com.hdl.onpro.JPushFirmBroadcast");

            if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
            {

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -17,18 +17,21 @@
    //},
    //Categories = new string[]

    //{
    //    "com.jinlu.onpro"
    //    "com.hdl.onpro"
    //})]


    [Android.App.Service(Enabled = true, Exported = false)]
    [Android.App.IntentFilter(
        new string[] { "cn.jpush.android.intent.SERVICE_MESSAGE" },
        Categories = new string[]

        {
            "com.jinlu.onpro"
        })]
    public class JPushReceiver : JPushMessageService
    //[Android.App.Service(Enabled = true)]
    //[Android.App.IntentFilter(
    //    new string[] { "cn.jpush.android.intent.SERVICE_MESSAGE" },
    //    Categories = new string[]

    //    {
    //        "com.hdl.onpro"
    //    })]

    [BroadcastReceiver(Enabled = true, Exported = true)]
    [Android.App.IntentFilter(new string[] { "cn.jpush.android.intent.SERVICE_MESSAGE" }, Categories = new string[] { "com.hdl.onpro" })]
    public class JPushReceiver : JPushMessageReceiver// JPushMessageService
    {





@@ -130,7 +133,6 @@
        public override void OnRegister(Context context, string p1)
        {
            base.OnRegister(context, p1);
            Utlis.WriteLine("极光推送-注册成功回调: " + p1);
        }

        /// <summary>

 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="4.2.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202407022">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.5.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202407022">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--程序可以读取设备外部存储空间(内置SDcard和外置SDCard)的文件，我的文件等-->
@@ -46,116 +46,77 @@
    <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:requestLegacyExternalStorage="true" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="优数养老">
    <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:requestLegacyExternalStorage="true" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
        <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false">
            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
        </provider>
        <!--极光推送-->
        <!-- Required SDK 核心功能-->
        <!-- 可配置 android:process 参数将 PushService 放在其他进程中 -->
        <service
            android:name="cn.jpush.android.service.PushService"
            android:enabled="true"
            android:exported="false" >
            <intent-filter>
                <action android:name="cn.jpush.android.intent.REGISTER" />
                <action android:name="cn.jpush.android.intent.REPORT" />
                <action android:name="cn.jpush.android.intent.PushService" />
                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
            </intent-filter>
        </service>


        <!-- since 3.0.9 Required SDK 核心功能-->
        <provider
            android:authorities="com.hdl.onpro.DataProvider"
            android:name="cn.jpush.android.service.DataProvider"
            android:exported="true"
        />

        <!-- Required SDK 核心功能-->
        <receiver
            android:name="cn.jpush.android.service.PushReceiver"
            android:enabled="true" >
          <intent-filter android:priority="1000">
                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
                <category android:name="com.hdl.onpro"/>
            </intent-filter>
        </receiver>

        <!-- Required SDK 核心功能-->
        <activity
            android:name="cn.jpush.android.ui.PushActivity"
            android:configChanges="orientation|keyboardHidden"
            android:theme="@android:style/Theme.NoTitleBar"        
            android:exported="true" >
            <intent-filter>
                <action android:name="cn.jpush.android.ui.PushActivity" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </activity>
        <!-- SDK 核心功能-->
        <activity
            android:name="cn.jpush.android.ui.PopWinActivity"
            android:configChanges="orientation|keyboardHidden"
            android:exported="true"            
            android:theme="@style/MyDialogStyle">
            <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
                <action android:name="cn.jpush.android.ui.PopWinActivity" />
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </activity>


        <!-- Required SDK 核心功能-->
        <receiver android:name="cn.jpush.android.service.AlarmReceiver" />

        <!--Required SDK核心功能 since 3.3.0，主要用来统一各大推送厂商跳转逻辑，透明窗体也是为了通知跳转时候，保持UI效果一致。-->
        <activity
            android:name="cn.jpush.android.service.JNotifyActivity"
            android:exported="true"
            android:taskAffinity=""            
            android:theme="@style/JPushTheme">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.JNotifyActivity" />
                <category android:name="android.intent.category.DEFAULT" /><!--Required SDK核心功能 since 4.2.2-->
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </activity>
        <!-- since 4.6.0 Required SDK核心功能，各大推送厂商跳转 备份Activity。防止JNotifyActivity 被封后，通知不能跳转。 -->
        <activity
            android:name="cn.android.service.JTransitActivity"
            android:exported="true"
            android:taskAffinity=""
            android:theme="@style/JPushTheme" >
            <intent-filter>
                <action android:name="cn.android.service.JTransitActivity" />
                <category android:name="android.intent.category.DEFAULT"/>
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </activity>
        <!-- since 5.0.0 Required SDK核心功能 -->
        <provider
            android:exported="false"
            android:authorities="com.hdl.onpro.jiguang.InitProvider"
            android:name="cn.jpush.android.service.InitProvider" />


        <!-- Required SDK 核心功能-->
        <!-- 可配置 android:process 参数将 PushService 放在其他进程中 -->
        <service android:name="cn.jpush.android.service.PushService" android:enabled="true" android:exported="false">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.REGISTER" />
                <action android:name="cn.jpush.android.intent.REPORT" />
                <action android:name="cn.jpush.android.intent.PushService" />
                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
            </intent-filter>
        </service>
        <!-- since 3.0.9 Required SDK 核心功能-->
        <provider android:authorities="com.hdl.onpro.DataProvider" android:name="cn.jpush.android.service.DataProvider" android:exported="true" />
        <!-- Required SDK 核心功能-->
        <receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true">
            <intent-filter android:priority="1000">
                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </receiver>
        <!-- Required SDK 核心功能-->
        <activity android:name="cn.jpush.android.ui.PushActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.NoTitleBar" android:exported="true">
            <intent-filter>
                <action android:name="cn.jpush.android.ui.PushActivity" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </activity>
        <!-- SDK 核心功能-->
        <activity android:name="cn.jpush.android.ui.PopWinActivity" android:configChanges="orientation|keyboardHidden" android:exported="true" android:theme="@style/MyDialogStyle">
            <intent-filter>
                <category android:name="android.intent.category.DEFAULT" />
                <action android:name="cn.jpush.android.ui.PopWinActivity" />
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </activity>
        <!-- Required SDK 核心功能-->
        <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
        <!--Required SDK核心功能 since 3.3.0，主要用来统一各大推送厂商跳转逻辑，透明窗体也是为了通知跳转时候，保持UI效果一致。-->
        <activity android:name="cn.jpush.android.service.JNotifyActivity" android:exported="true" android:taskAffinity="" android:theme="@style/JPushTheme">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.JNotifyActivity" />
                <category android:name="android.intent.category.DEFAULT" />
                <!--Required SDK核心功能 since 4.2.2-->
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </activity>
        <!-- since 4.6.0 Required SDK核心功能，各大推送厂商跳转 备份Activity。防止JNotifyActivity 被封后，通知不能跳转。 -->
        <activity android:name="cn.android.service.JTransitActivity" android:exported="true" android:taskAffinity="" android:theme="@style/JPushTheme">
            <intent-filter>
                <action android:name="cn.android.service.JTransitActivity" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.hdl.onpro" />
            </intent-filter>
        </activity>
        <!-- since 5.0.0 Required SDK核心功能 -->
        <provider android:exported="false" android:authorities="com.hdl.onpro.jiguang.InitProvider" android:name="cn.jpush.android.service.InitProvider" />
        <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
        <!-- Required. AppKey copied from Portal -->
        <meta-data android:name="JPUSH_APPKEY" android:value="cbd90743ac45cbca06c8118b" />
        <!-- 极光推送结束 -->
    </application>
</manifest>

        <!--<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
<!--<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
        <meta-data android:name="JPUSH_APPKEY" android:value="cbd90743ac45cbca06c8118b" />
        <meta-data android:name="XIAOMI_APPKEY" android:value="MI-5871892343860" />
        <meta-data android:name="XIAOMI_APPID" android:value="MI-2882303761518923860" />
        <meta-data android:name="OPPO_APPKEY" android:value="OP-e942dafe77cf4b9f868d5421d701655a" />
        <meta-data android:name="OPPO_APPID" android:value="OP-30619979" />
        <meta-data android:name="OPPO_APPSECRET" android:value="OP-11d511c42f654cafac99588322681003" />-->
        <meta-data android:name="OPPO_APPSECRET" android:value="OP-11d511c42f654cafac99588322681003" />-->

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large