处理bilibili的oaid.aar冲突问题

Tool/Channels/Bilibili/ChannelSetting.yaml

@@ -54,6 +54,7 @@ Packages:
  - Bilibili@1.0.0
  - ThinkingData@1.0.0
  - AIhelper@latest
+ - DeviceHelper_Bilibili@0.0.1
 
 # 爱加密配置
 Encryption:

Tool/Channels/BilibiliDev/ChannelSetting.yaml

@@ -55,6 +55,7 @@ Packages:
  - Bilibili@1.0.0
  - ThinkingData@1.0.0
  - AIhelper@latest
+ - DeviceHelper_Bilibili@0.0.1
 
 # 爱加密配置
 Encryption:

Tool/Channels/MarketTest_Bilibili/ChannelSetting.yaml

@@ -55,6 +55,7 @@ Packages:
  - Bilibili@1.0.0
  - ThinkingData@1.0.0
  - AIhelper@latest
+ - DeviceHelper_Bilibili@0.0.1
 
 # 爱加密配置
 Encryption:

Tool/sdk_packages/DeviceHelper_Bilibili/0.0.1/Assets/Plugins/Android/OAID-SDK/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.example.oaidtest2" >
+
+    <uses-sdk android:minSdkVersion="24" />
+
+    <uses-permission
+        android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
+        tools:ignore="ProtectedPermissions" />
+
+</manifest>

Tool/sdk_packages/DeviceHelper_Bilibili/latest.txt

@@ -0,0 +1 @@
+0.0.1