From eda9dc9ddd483d874bc6c1c76c173d4ce86af577 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 04 九月 2018 12:20:33 +0800
Subject: [PATCH] update 更改配置文件路径
---
Project/app/src/game_226114725/AndroidManifest.xml | 0
Project/app/src/game_822055139/AndroidManifest.xml | 0
Project/app/src/game_813015059/AndroidManifest.xml | 0
ChannelDiff/226114725/AndroidManifest.xml | 192 +++++++++++++
ChannelDiff/test/AndroidManifest.xml | 19 -
ChannelDiff/813015059/AndroidManifest.xml | 192 +++++++++++++
ChannelDiff/815035853/AndroidManifest.xml | 192 +++++++++++++
ChannelDiff/815035853/libs/app-game_815035853-release.aar | 0
/dev/null | 0
ChannelDiff/226114725/libs/app-game_226114725-release.aar | 0
ChannelDiff/813015059/libs/app-game_813015059-release.aar | 0
ChannelDiff/822055139/libs/app-game_822055139-release.aar | 0
Project/app/src/game_815035853/AndroidManifest.xml | 0
ChannelDiff/822055139/AndroidManifest.xml | 192 +++++++++++++
Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java | 1
Project/app/build.gradle | 20
ChannelDiff/test/libs/app-secondworld-release.aar | 0
17 files changed, 746 insertions(+), 62 deletions(-)
diff --git a/ChannelDiff/226114725/AndroidManifest.xml b/ChannelDiff/226114725/AndroidManifest.xml
index c6aea74..fb576b6 100644
--- a/ChannelDiff/226114725/AndroidManifest.xml
+++ b/ChannelDiff/226114725/AndroidManifest.xml
@@ -24,6 +24,14 @@
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+ <permission
+ android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
+ android:protectionLevel="signature" />
+ <!-- Required -->
+ <permission android:name="com.shandangceshi.snxxz.permission.JPUSH_MESSAGE" />
+
+ <uses-permission android:name="com.shandangceshi.snxxz.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
@@ -56,16 +64,182 @@
</activity>
<!-- 閽堝7.0浠ヤ笂鐨刟pi寮�鏀剧殑鏂囦欢鏉冮檺 -->
- <!-- <provider -->
- <!-- android:name="android.support.v4.content.FileProvider" -->
- <!-- android:authorities="${appId}.fileProvider" -->
- <!-- android:grantUriPermissions="true" -->
- <!-- android:exported="false"> -->
- <!-- <meta-data -->
- <!-- android:name="android.support.FILE_PROVIDER_PATHS" -->
- <!-- android:resource="@xml/file_paths" /> -->
- <!-- </provider> -->
+ <provider
+ android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.shandangceshi.snxxz.fileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true" >
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
+ <meta-data
+ android:name="yl_appid"
+ android:value="226114725" />
+ <meta-data
+ android:name="yl_channelid"
+ android:value="1000" />
+ <meta-data
+ android:name="yl_platform_id"
+ android:value="1000" />
+ <meta-data
+ android:name="TrackAppID"
+ android:value="5ae23b6b905f98d9b8bd542debf35678" />
+ <meta-data
+ android:name="TrackChannelID"
+ android:value="_default_" />
+
+ <!-- 浠婃棩澶存潯鐩稿叧閰嶇疆 -->
+ <meta-data
+ android:name="TouTiao_AppName"
+ android:value="${TT_AppName}" />
+ <meta-data
+ android:name="TouTiao_AppID"
+ android:value="${TT_AppID}" />
+ <meta-data
+ android:name="TouTiao_Chanel"
+ android:value="${TT_Chanel}" />
+
+ <!-- Required SDK 鏍稿績鍔熻兘 -->
+ <!-- 鍙厤缃產ndroid:process鍙傛暟灏哖ushService鏀惧湪鍏朵粬杩涚▼涓� -->
+ <service
+ android:name="cn.jpush.android.service.PushService"
+ android:exported="false"
+ android:process=":mult" >
+ <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:name="cn.jpush.android.service.DataProvider"
+ android:authorities="com.shandangceshi.snxxz.DataProvider"
+ android:exported="true" />
+
+ <!-- since 1.8.0 option 鍙�夐」銆傜敤浜庡悓涓�璁惧涓笉鍚屽簲鐢ㄧ殑JPush鏈嶅姟鐩镐簰鎷夎捣鐨勫姛鑳姐�� -->
+ <!-- 鑻ヤ笉鍚敤璇ュ姛鑳藉彲鍒犻櫎璇ョ粍浠讹紝灏嗕笉鎷夎捣鍏朵粬搴旂敤涔熶笉鑳借鍏朵粬搴旂敤鎷夎捣 -->
+ <service
+ android:name="cn.jpush.android.service.DaemonService"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="cn.jpush.android.intent.DaemonService" />
+
+ <category android:name="com.shandangceshi.snxxz" />
+ </intent-filter>
+ </service>
+
+ <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘 -->
+ <provider
+ android:name="cn.jpush.android.service.DownloadProvider"
+ android:authorities="com.shandangceshi.snxxz.DownloadProvider"
+ 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.shandangceshi.snxxz" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.USER_PRESENT" />
+ <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+ </intent-filter>
+ <!-- Optional -->
+ <intent-filter>
+ <action android:name="android.intent.action.PACKAGE_ADDED" />
+ <action android:name="android.intent.action.PACKAGE_REMOVED" />
+
+ <data android:scheme="package" />
+ </intent-filter>
+ </receiver>
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <activity
+ android:name="cn.jpush.android.ui.PushActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="false"
+ android:theme="@android:style/Theme.NoTitleBar" >
+ <intent-filter>
+ <action android:name="cn.jpush.android.ui.PushActivity" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.shandangceshi.snxxz" />
+ </intent-filter>
+ </activity>
+ <!-- SDK鏍稿績鍔熻兘 -->
+ <activity
+ android:name="cn.jpush.android.ui.PopWinActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="false"
+ android:theme="@style/MyDialogStyle" >
+ <intent-filter>
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.shandangceshi.snxxz" />
+ </intent-filter>
+ </activity>
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <service
+ android:name="cn.jpush.android.service.DownloadService"
+ android:enabled="true"
+ android:exported="false" />
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
+
+ <!-- Required since 3.0.7 -->
+ <!-- 鏂扮殑tag/alias鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氱殑骞挎挱 -->
+ <!-- 璇ュ箍鎾渶瑕佺户鎵縅Push鎻愪緵鐨凧PushMessageReceiver绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter -->
+ <!-- <receiver -->
+ <!-- android:name="鑷畾涔� Receiver" -->
+ <!-- android:enabled="true" > -->
+ <!-- <intent-filter> -->
+ <!-- <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" /> -->
+ <!-- <category android:name="鎮ㄥ簲鐢ㄧ殑鍖呭悕" /> -->
+ <!-- </intent-filter> -->
+ <!-- </receiver> -->
+
+
+ <!-- <!– User defined. 鐢ㄦ埛鑷畾涔夌殑骞挎挱鎺ユ敹鍣�–> -->
+ <receiver
+ android:name="com.secondworld.univeralsdk.JPushReceiver"
+ android:enabled="true" >
+ <intent-filter>
+
+ <!-- Required 鐢ㄦ埛娉ㄥ唽SDK鐨刬ntent -->
+ <action android:name="cn.jpush.android.intent.REGISTRATION" />
+ <!-- Required 鐢ㄦ埛鎺ユ敹SDK娑堟伅鐨刬ntent -->
+ <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
+ <!-- Required 鐢ㄦ埛鎺ユ敹SDK閫氱煡鏍忎俊鎭殑intent -->
+ <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
+ <!-- 鎺ユ敹缃戠粶鍙樺寲 杩炴帴/鏂紑 since 1.6.3 -->
+ <action android:name="cn.jpush.android.intent.CONNECTION" />
+
+ <category android:name="com.shandangceshi.snxxz" />
+ </intent-filter>
+ </receiver>
+
+ <!-- Required. For publish channel feature -->
+ <!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁PK鍒嗗彂娓犻亾銆� -->
+ <!-- 渚嬪: -->
+ <!-- 鍙戝埌 Google Play 鐨凙PK鍙互璁剧疆涓� google-play; -->
+ <!-- 鍙戝埌鍏朵粬甯傚満鐨� APK 鍙互璁剧疆涓� xxx-market銆� -->
+ <meta-data
+ android:name="JPUSH_CHANNEL"
+ android:value="developer-default" />
+ <!-- Required. AppKey copied from Portal -->
+ <meta-data
+ android:name="JPUSH_APPKEY"
+ android:value="22186239fee975f883198cf4" />
</application>
</manifest>
\ No newline at end of file
diff --git a/ChannelDiff/226114725/libs/app-game_226114725-release.aar b/ChannelDiff/226114725/libs/app-game_226114725-release.aar
index 5ee2ae8..94b83bc 100644
--- a/ChannelDiff/226114725/libs/app-game_226114725-release.aar
+++ b/ChannelDiff/226114725/libs/app-game_226114725-release.aar
Binary files differ
diff --git a/ChannelDiff/813015059/AndroidManifest.xml b/ChannelDiff/813015059/AndroidManifest.xml
index c6aea74..55dc636 100644
--- a/ChannelDiff/813015059/AndroidManifest.xml
+++ b/ChannelDiff/813015059/AndroidManifest.xml
@@ -24,6 +24,14 @@
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+ <permission
+ android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
+ android:protectionLevel="signature" />
+ <!-- Required -->
+ <permission android:name="com.ziyouyouxi07.snxxz.permission.JPUSH_MESSAGE" />
+
+ <uses-permission android:name="com.ziyouyouxi07.snxxz.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
@@ -56,16 +64,182 @@
</activity>
<!-- 閽堝7.0浠ヤ笂鐨刟pi寮�鏀剧殑鏂囦欢鏉冮檺 -->
- <!-- <provider -->
- <!-- android:name="android.support.v4.content.FileProvider" -->
- <!-- android:authorities="${appId}.fileProvider" -->
- <!-- android:grantUriPermissions="true" -->
- <!-- android:exported="false"> -->
- <!-- <meta-data -->
- <!-- android:name="android.support.FILE_PROVIDER_PATHS" -->
- <!-- android:resource="@xml/file_paths" /> -->
- <!-- </provider> -->
+ <provider
+ android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.ziyouyouxi07.snxxz.fileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true" >
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
+ <meta-data
+ android:name="yl_appid"
+ android:value="813015059" />
+ <meta-data
+ android:name="yl_channelid"
+ android:value="1000" />
+ <meta-data
+ android:name="yl_platform_id"
+ android:value="1000" />
+ <meta-data
+ android:name="TrackAppID"
+ android:value="0c5ad863fb8935d18b3ecefe05389701" />
+ <meta-data
+ android:name="TrackChannelID"
+ android:value="_default_" />
+
+ <!-- 浠婃棩澶存潯鐩稿叧閰嶇疆 -->
+ <meta-data
+ android:name="TouTiao_AppName"
+ android:value="${TT_AppName}" />
+ <meta-data
+ android:name="TouTiao_AppID"
+ android:value="${TT_AppID}" />
+ <meta-data
+ android:name="TouTiao_Chanel"
+ android:value="${TT_Chanel}" />
+
+ <!-- Required SDK 鏍稿績鍔熻兘 -->
+ <!-- 鍙厤缃產ndroid:process鍙傛暟灏哖ushService鏀惧湪鍏朵粬杩涚▼涓� -->
+ <service
+ android:name="cn.jpush.android.service.PushService"
+ android:exported="false"
+ android:process=":mult" >
+ <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:name="cn.jpush.android.service.DataProvider"
+ android:authorities="com.ziyouyouxi07.snxxz.DataProvider"
+ android:exported="true" />
+
+ <!-- since 1.8.0 option 鍙�夐」銆傜敤浜庡悓涓�璁惧涓笉鍚屽簲鐢ㄧ殑JPush鏈嶅姟鐩镐簰鎷夎捣鐨勫姛鑳姐�� -->
+ <!-- 鑻ヤ笉鍚敤璇ュ姛鑳藉彲鍒犻櫎璇ョ粍浠讹紝灏嗕笉鎷夎捣鍏朵粬搴旂敤涔熶笉鑳借鍏朵粬搴旂敤鎷夎捣 -->
+ <service
+ android:name="cn.jpush.android.service.DaemonService"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="cn.jpush.android.intent.DaemonService" />
+
+ <category android:name="com.ziyouyouxi07.snxxz" />
+ </intent-filter>
+ </service>
+
+ <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘 -->
+ <provider
+ android:name="cn.jpush.android.service.DownloadProvider"
+ android:authorities="com.ziyouyouxi07.snxxz.DownloadProvider"
+ 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.ziyouyouxi07.snxxz" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.USER_PRESENT" />
+ <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+ </intent-filter>
+ <!-- Optional -->
+ <intent-filter>
+ <action android:name="android.intent.action.PACKAGE_ADDED" />
+ <action android:name="android.intent.action.PACKAGE_REMOVED" />
+
+ <data android:scheme="package" />
+ </intent-filter>
+ </receiver>
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <activity
+ android:name="cn.jpush.android.ui.PushActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="false"
+ android:theme="@android:style/Theme.NoTitleBar" >
+ <intent-filter>
+ <action android:name="cn.jpush.android.ui.PushActivity" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.ziyouyouxi07.snxxz" />
+ </intent-filter>
+ </activity>
+ <!-- SDK鏍稿績鍔熻兘 -->
+ <activity
+ android:name="cn.jpush.android.ui.PopWinActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="false"
+ android:theme="@style/MyDialogStyle" >
+ <intent-filter>
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.ziyouyouxi07.snxxz" />
+ </intent-filter>
+ </activity>
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <service
+ android:name="cn.jpush.android.service.DownloadService"
+ android:enabled="true"
+ android:exported="false" />
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
+
+ <!-- Required since 3.0.7 -->
+ <!-- 鏂扮殑tag/alias鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氱殑骞挎挱 -->
+ <!-- 璇ュ箍鎾渶瑕佺户鎵縅Push鎻愪緵鐨凧PushMessageReceiver绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter -->
+ <!-- <receiver -->
+ <!-- android:name="鑷畾涔� Receiver" -->
+ <!-- android:enabled="true" > -->
+ <!-- <intent-filter> -->
+ <!-- <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" /> -->
+ <!-- <category android:name="鎮ㄥ簲鐢ㄧ殑鍖呭悕" /> -->
+ <!-- </intent-filter> -->
+ <!-- </receiver> -->
+
+
+ <!-- <!– User defined. 鐢ㄦ埛鑷畾涔夌殑骞挎挱鎺ユ敹鍣�–> -->
+ <receiver
+ android:name="com.secondworld.univeralsdk.JPushReceiver"
+ android:enabled="true" >
+ <intent-filter>
+
+ <!-- Required 鐢ㄦ埛娉ㄥ唽SDK鐨刬ntent -->
+ <action android:name="cn.jpush.android.intent.REGISTRATION" />
+ <!-- Required 鐢ㄦ埛鎺ユ敹SDK娑堟伅鐨刬ntent -->
+ <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
+ <!-- Required 鐢ㄦ埛鎺ユ敹SDK閫氱煡鏍忎俊鎭殑intent -->
+ <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
+ <!-- 鎺ユ敹缃戠粶鍙樺寲 杩炴帴/鏂紑 since 1.6.3 -->
+ <action android:name="cn.jpush.android.intent.CONNECTION" />
+
+ <category android:name="com.ziyouyouxi07.snxxz" />
+ </intent-filter>
+ </receiver>
+
+ <!-- Required. For publish channel feature -->
+ <!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁PK鍒嗗彂娓犻亾銆� -->
+ <!-- 渚嬪: -->
+ <!-- 鍙戝埌 Google Play 鐨凙PK鍙互璁剧疆涓� google-play; -->
+ <!-- 鍙戝埌鍏朵粬甯傚満鐨� APK 鍙互璁剧疆涓� xxx-market銆� -->
+ <meta-data
+ android:name="JPUSH_CHANNEL"
+ android:value="developer-default" />
+ <!-- Required. AppKey copied from Portal -->
+ <meta-data
+ android:name="JPUSH_APPKEY"
+ android:value="63f9523bf41727aaccfd258f" />
</application>
</manifest>
\ No newline at end of file
diff --git a/ChannelDiff/813015059/libs/app-game_813015059-release.aar b/ChannelDiff/813015059/libs/app-game_813015059-release.aar
index 5955857..8594408 100644
--- a/ChannelDiff/813015059/libs/app-game_813015059-release.aar
+++ b/ChannelDiff/813015059/libs/app-game_813015059-release.aar
Binary files differ
diff --git a/ChannelDiff/815035853/AndroidManifest.xml b/ChannelDiff/815035853/AndroidManifest.xml
index c6aea74..5559a09 100644
--- a/ChannelDiff/815035853/AndroidManifest.xml
+++ b/ChannelDiff/815035853/AndroidManifest.xml
@@ -24,6 +24,14 @@
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+ <permission
+ android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
+ android:protectionLevel="signature" />
+ <!-- Required -->
+ <permission android:name="com.ziyouyouxi05.snxxz.permission.JPUSH_MESSAGE" />
+
+ <uses-permission android:name="com.ziyouyouxi05.snxxz.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
@@ -56,16 +64,182 @@
</activity>
<!-- 閽堝7.0浠ヤ笂鐨刟pi寮�鏀剧殑鏂囦欢鏉冮檺 -->
- <!-- <provider -->
- <!-- android:name="android.support.v4.content.FileProvider" -->
- <!-- android:authorities="${appId}.fileProvider" -->
- <!-- android:grantUriPermissions="true" -->
- <!-- android:exported="false"> -->
- <!-- <meta-data -->
- <!-- android:name="android.support.FILE_PROVIDER_PATHS" -->
- <!-- android:resource="@xml/file_paths" /> -->
- <!-- </provider> -->
+ <provider
+ android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.ziyouyouxi05.snxxz.fileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true" >
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
+ <meta-data
+ android:name="yl_appid"
+ android:value="815035853" />
+ <meta-data
+ android:name="yl_channelid"
+ android:value="1000" />
+ <meta-data
+ android:name="yl_platform_id"
+ android:value="1000" />
+ <meta-data
+ android:name="TrackAppID"
+ android:value="9e16495be922a78c4dbef24d8adc9c36" />
+ <meta-data
+ android:name="TrackChannelID"
+ android:value="_default_" />
+
+ <!-- 浠婃棩澶存潯鐩稿叧閰嶇疆 -->
+ <meta-data
+ android:name="TouTiao_AppName"
+ android:value="${TT_AppName}" />
+ <meta-data
+ android:name="TouTiao_AppID"
+ android:value="${TT_AppID}" />
+ <meta-data
+ android:name="TouTiao_Chanel"
+ android:value="${TT_Chanel}" />
+
+ <!-- Required SDK 鏍稿績鍔熻兘 -->
+ <!-- 鍙厤缃產ndroid:process鍙傛暟灏哖ushService鏀惧湪鍏朵粬杩涚▼涓� -->
+ <service
+ android:name="cn.jpush.android.service.PushService"
+ android:exported="false"
+ android:process=":mult" >
+ <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:name="cn.jpush.android.service.DataProvider"
+ android:authorities="com.ziyouyouxi05.snxxz.DataProvider"
+ android:exported="true" />
+
+ <!-- since 1.8.0 option 鍙�夐」銆傜敤浜庡悓涓�璁惧涓笉鍚屽簲鐢ㄧ殑JPush鏈嶅姟鐩镐簰鎷夎捣鐨勫姛鑳姐�� -->
+ <!-- 鑻ヤ笉鍚敤璇ュ姛鑳藉彲鍒犻櫎璇ョ粍浠讹紝灏嗕笉鎷夎捣鍏朵粬搴旂敤涔熶笉鑳借鍏朵粬搴旂敤鎷夎捣 -->
+ <service
+ android:name="cn.jpush.android.service.DaemonService"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="cn.jpush.android.intent.DaemonService" />
+
+ <category android:name="com.ziyouyouxi05.snxxz" />
+ </intent-filter>
+ </service>
+
+ <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘 -->
+ <provider
+ android:name="cn.jpush.android.service.DownloadProvider"
+ android:authorities="com.ziyouyouxi05.snxxz.DownloadProvider"
+ 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.ziyouyouxi05.snxxz" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.USER_PRESENT" />
+ <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+ </intent-filter>
+ <!-- Optional -->
+ <intent-filter>
+ <action android:name="android.intent.action.PACKAGE_ADDED" />
+ <action android:name="android.intent.action.PACKAGE_REMOVED" />
+
+ <data android:scheme="package" />
+ </intent-filter>
+ </receiver>
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <activity
+ android:name="cn.jpush.android.ui.PushActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="false"
+ android:theme="@android:style/Theme.NoTitleBar" >
+ <intent-filter>
+ <action android:name="cn.jpush.android.ui.PushActivity" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.ziyouyouxi05.snxxz" />
+ </intent-filter>
+ </activity>
+ <!-- SDK鏍稿績鍔熻兘 -->
+ <activity
+ android:name="cn.jpush.android.ui.PopWinActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="false"
+ android:theme="@style/MyDialogStyle" >
+ <intent-filter>
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.ziyouyouxi05.snxxz" />
+ </intent-filter>
+ </activity>
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <service
+ android:name="cn.jpush.android.service.DownloadService"
+ android:enabled="true"
+ android:exported="false" />
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
+
+ <!-- Required since 3.0.7 -->
+ <!-- 鏂扮殑tag/alias鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氱殑骞挎挱 -->
+ <!-- 璇ュ箍鎾渶瑕佺户鎵縅Push鎻愪緵鐨凧PushMessageReceiver绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter -->
+ <!-- <receiver -->
+ <!-- android:name="鑷畾涔� Receiver" -->
+ <!-- android:enabled="true" > -->
+ <!-- <intent-filter> -->
+ <!-- <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" /> -->
+ <!-- <category android:name="鎮ㄥ簲鐢ㄧ殑鍖呭悕" /> -->
+ <!-- </intent-filter> -->
+ <!-- </receiver> -->
+
+
+ <!-- <!– User defined. 鐢ㄦ埛鑷畾涔夌殑骞挎挱鎺ユ敹鍣�–> -->
+ <receiver
+ android:name="com.secondworld.univeralsdk.JPushReceiver"
+ android:enabled="true" >
+ <intent-filter>
+
+ <!-- Required 鐢ㄦ埛娉ㄥ唽SDK鐨刬ntent -->
+ <action android:name="cn.jpush.android.intent.REGISTRATION" />
+ <!-- Required 鐢ㄦ埛鎺ユ敹SDK娑堟伅鐨刬ntent -->
+ <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
+ <!-- Required 鐢ㄦ埛鎺ユ敹SDK閫氱煡鏍忎俊鎭殑intent -->
+ <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
+ <!-- 鎺ユ敹缃戠粶鍙樺寲 杩炴帴/鏂紑 since 1.6.3 -->
+ <action android:name="cn.jpush.android.intent.CONNECTION" />
+
+ <category android:name="com.ziyouyouxi05.snxxz" />
+ </intent-filter>
+ </receiver>
+
+ <!-- Required. For publish channel feature -->
+ <!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁PK鍒嗗彂娓犻亾銆� -->
+ <!-- 渚嬪: -->
+ <!-- 鍙戝埌 Google Play 鐨凙PK鍙互璁剧疆涓� google-play; -->
+ <!-- 鍙戝埌鍏朵粬甯傚満鐨� APK 鍙互璁剧疆涓� xxx-market銆� -->
+ <meta-data
+ android:name="JPUSH_CHANNEL"
+ android:value="developer-default" />
+ <!-- Required. AppKey copied from Portal -->
+ <meta-data
+ android:name="JPUSH_APPKEY"
+ android:value="44329480f1b4ac22d737c559" />
</application>
</manifest>
\ No newline at end of file
diff --git a/ChannelDiff/815035853/libs/app-game_815035853-release.aar b/ChannelDiff/815035853/libs/app-game_815035853-release.aar
index dda416d..b84eea5 100644
--- a/ChannelDiff/815035853/libs/app-game_815035853-release.aar
+++ b/ChannelDiff/815035853/libs/app-game_815035853-release.aar
Binary files differ
diff --git a/ChannelDiff/822055139/AndroidManifest.xml b/ChannelDiff/822055139/AndroidManifest.xml
index c6aea74..dc1ed4b 100644
--- a/ChannelDiff/822055139/AndroidManifest.xml
+++ b/ChannelDiff/822055139/AndroidManifest.xml
@@ -24,6 +24,14 @@
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+ <permission
+ android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
+ android:protectionLevel="signature" />
+ <!-- Required -->
+ <permission android:name="com.ziyouyouxi01.snxxz.permission.JPUSH_MESSAGE" />
+
+ <uses-permission android:name="com.ziyouyouxi01.snxxz.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
@@ -56,16 +64,182 @@
</activity>
<!-- 閽堝7.0浠ヤ笂鐨刟pi寮�鏀剧殑鏂囦欢鏉冮檺 -->
- <!-- <provider -->
- <!-- android:name="android.support.v4.content.FileProvider" -->
- <!-- android:authorities="${appId}.fileProvider" -->
- <!-- android:grantUriPermissions="true" -->
- <!-- android:exported="false"> -->
- <!-- <meta-data -->
- <!-- android:name="android.support.FILE_PROVIDER_PATHS" -->
- <!-- android:resource="@xml/file_paths" /> -->
- <!-- </provider> -->
+ <provider
+ android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.ziyouyouxi01.snxxz.fileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true" >
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
+ <meta-data
+ android:name="yl_appid"
+ android:value="822055139" />
+ <meta-data
+ android:name="yl_channelid"
+ android:value="1000" />
+ <meta-data
+ android:name="yl_platform_id"
+ android:value="1000" />
+ <meta-data
+ android:name="TrackAppID"
+ android:value="a0304df6f4dfdd5bd7cbf6369f7f1c11" />
+ <meta-data
+ android:name="TrackChannelID"
+ android:value="_default_" />
+
+ <!-- 浠婃棩澶存潯鐩稿叧閰嶇疆 -->
+ <meta-data
+ android:name="TouTiao_AppName"
+ android:value="灏戝勾淇粰浼�" />
+ <meta-data
+ android:name="TouTiao_AppID"
+ android:value="151709" />
+ <meta-data
+ android:name="TouTiao_Chanel"
+ android:value="_default_" />
+
+ <!-- Required SDK 鏍稿績鍔熻兘 -->
+ <!-- 鍙厤缃產ndroid:process鍙傛暟灏哖ushService鏀惧湪鍏朵粬杩涚▼涓� -->
+ <service
+ android:name="cn.jpush.android.service.PushService"
+ android:exported="false"
+ android:process=":mult" >
+ <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:name="cn.jpush.android.service.DataProvider"
+ android:authorities="com.ziyouyouxi01.snxxz.DataProvider"
+ android:exported="true" />
+
+ <!-- since 1.8.0 option 鍙�夐」銆傜敤浜庡悓涓�璁惧涓笉鍚屽簲鐢ㄧ殑JPush鏈嶅姟鐩镐簰鎷夎捣鐨勫姛鑳姐�� -->
+ <!-- 鑻ヤ笉鍚敤璇ュ姛鑳藉彲鍒犻櫎璇ョ粍浠讹紝灏嗕笉鎷夎捣鍏朵粬搴旂敤涔熶笉鑳借鍏朵粬搴旂敤鎷夎捣 -->
+ <service
+ android:name="cn.jpush.android.service.DaemonService"
+ android:enabled="true"
+ android:exported="true" >
+ <intent-filter>
+ <action android:name="cn.jpush.android.intent.DaemonService" />
+
+ <category android:name="com.ziyouyouxi01.snxxz" />
+ </intent-filter>
+ </service>
+
+ <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘 -->
+ <provider
+ android:name="cn.jpush.android.service.DownloadProvider"
+ android:authorities="com.ziyouyouxi01.snxxz.DownloadProvider"
+ 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.ziyouyouxi01.snxxz" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.USER_PRESENT" />
+ <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+ </intent-filter>
+ <!-- Optional -->
+ <intent-filter>
+ <action android:name="android.intent.action.PACKAGE_ADDED" />
+ <action android:name="android.intent.action.PACKAGE_REMOVED" />
+
+ <data android:scheme="package" />
+ </intent-filter>
+ </receiver>
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <activity
+ android:name="cn.jpush.android.ui.PushActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="false"
+ android:theme="@android:style/Theme.NoTitleBar" >
+ <intent-filter>
+ <action android:name="cn.jpush.android.ui.PushActivity" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.ziyouyouxi01.snxxz" />
+ </intent-filter>
+ </activity>
+ <!-- SDK鏍稿績鍔熻兘 -->
+ <activity
+ android:name="cn.jpush.android.ui.PopWinActivity"
+ android:configChanges="orientation|keyboardHidden"
+ android:exported="false"
+ android:theme="@style/MyDialogStyle" >
+ <intent-filter>
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.ziyouyouxi01.snxxz" />
+ </intent-filter>
+ </activity>
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <service
+ android:name="cn.jpush.android.service.DownloadService"
+ android:enabled="true"
+ android:exported="false" />
+
+ <!-- Required SDK鏍稿績鍔熻兘 -->
+ <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
+
+ <!-- Required since 3.0.7 -->
+ <!-- 鏂扮殑tag/alias鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氱殑骞挎挱 -->
+ <!-- 璇ュ箍鎾渶瑕佺户鎵縅Push鎻愪緵鐨凧PushMessageReceiver绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter -->
+ <!-- <receiver -->
+ <!-- android:name="鑷畾涔� Receiver" -->
+ <!-- android:enabled="true" > -->
+ <!-- <intent-filter> -->
+ <!-- <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" /> -->
+ <!-- <category android:name="鎮ㄥ簲鐢ㄧ殑鍖呭悕" /> -->
+ <!-- </intent-filter> -->
+ <!-- </receiver> -->
+
+
+ <!-- <!– User defined. 鐢ㄦ埛鑷畾涔夌殑骞挎挱鎺ユ敹鍣�–> -->
+ <receiver
+ android:name="com.secondworld.univeralsdk.JPushReceiver"
+ android:enabled="true" >
+ <intent-filter>
+
+ <!-- Required 鐢ㄦ埛娉ㄥ唽SDK鐨刬ntent -->
+ <action android:name="cn.jpush.android.intent.REGISTRATION" />
+ <!-- Required 鐢ㄦ埛鎺ユ敹SDK娑堟伅鐨刬ntent -->
+ <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
+ <!-- Required 鐢ㄦ埛鎺ユ敹SDK閫氱煡鏍忎俊鎭殑intent -->
+ <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
+ <!-- 鎺ユ敹缃戠粶鍙樺寲 杩炴帴/鏂紑 since 1.6.3 -->
+ <action android:name="cn.jpush.android.intent.CONNECTION" />
+
+ <category android:name="com.ziyouyouxi01.snxxz" />
+ </intent-filter>
+ </receiver>
+
+ <!-- Required. For publish channel feature -->
+ <!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁PK鍒嗗彂娓犻亾銆� -->
+ <!-- 渚嬪: -->
+ <!-- 鍙戝埌 Google Play 鐨凙PK鍙互璁剧疆涓� google-play; -->
+ <!-- 鍙戝埌鍏朵粬甯傚満鐨� APK 鍙互璁剧疆涓� xxx-market銆� -->
+ <meta-data
+ android:name="JPUSH_CHANNEL"
+ android:value="developer-default" />
+ <!-- Required. AppKey copied from Portal -->
+ <meta-data
+ android:name="JPUSH_APPKEY"
+ android:value="1c060648058afe0b5faf72ca" />
</application>
</manifest>
\ No newline at end of file
diff --git a/ChannelDiff/822055139/libs/app-game_822055139-release.aar b/ChannelDiff/822055139/libs/app-game_822055139-release.aar
index cbf25bf..99099e4 100644
--- a/ChannelDiff/822055139/libs/app-game_822055139-release.aar
+++ b/ChannelDiff/822055139/libs/app-game_822055139-release.aar
Binary files differ
diff --git a/ChannelDiff/904100357/AndroidManifest.xml b/ChannelDiff/904100357/AndroidManifest.xml
deleted file mode 100644
index 23faa79..0000000
--- a/ChannelDiff/904100357/AndroidManifest.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.secondworld.univeralsdk"
- android:installLocation="auto"
- android:versionCode="1"
- android:versionName="1.1.0" >
-
- <uses-sdk
- android:minSdkVersion="16"
- android:targetSdkVersion="22" />
-
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.VIBRATE" />
- <uses-permission android:name="android.permission.GET_TASKS" />
- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
- <uses-permission android:name="android.permission.READ_LOGS" />
- <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
- <permission
- android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
- android:protectionLevel="signature" />
- <!-- Required -->
- <permission android:name="com.ziyouyouxi08.snxxz.permission.JPUSH_MESSAGE" />
-
- <uses-permission android:name="com.ziyouyouxi08.snxxz.permission.JPUSH_MESSAGE" />
- <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
- <uses-permission android:name="android.permission.RESTART_PACKAGES" />
-
- <application
- android:allowBackup="true"
- android:hardwareAccelerated="false"
- android:icon="@drawable/app_icon"
- android:isGame="true"
- android:label="@string/app_name"
- android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" >
- <activity
- android:name="com.secondworld.univeralsdk.MainActivity"
- android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
- android:label="@string/app_name"
- android:launchMode="singleTop"
- android:screenOrientation="portrait" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
- </intent-filter>
-
- <meta-data
- android:name="unityplayer.UnityActivity"
- android:value="true" />
- <meta-data
- android:name="unityplayer.SkipPermissionsDialog"
- android:value="true" />
- </activity>
-
- <!-- 閽堝7.0浠ヤ笂鐨刟pi寮�鏀剧殑鏂囦欢鏉冮檺 -->
- <provider
- android:name="android.support.v4.content.FileProvider"
- android:authorities="com.ziyouyouxi08.snxxz.fileProvider"
- android:exported="false"
- android:grantUriPermissions="true" >
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/file_paths" />
- </provider>
-
- <meta-data
- android:name="Mr_ADID"
- android:value="_2417" />
- <meta-data
- android:name="Mr_PLATFORM"
- android:value="_mrgame" />
- <meta-data
- android:name="Mr_GAME_ID"
- android:value="_498" />
-
- <!-- Required SDK 鏍稿績鍔熻兘 -->
- <!-- 鍙厤缃產ndroid:process鍙傛暟灏哖ushService鏀惧湪鍏朵粬杩涚▼涓� -->
- <service
- android:name="cn.jpush.android.service.PushService"
- android:exported="false"
- android:process=":mult" >
- <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:name="cn.jpush.android.service.DataProvider"
- android:authorities="com.ziyouyouxi08.snxxz.DataProvider"
- android:exported="true" />
-
- <!-- since 1.8.0 option 鍙�夐」銆傜敤浜庡悓涓�璁惧涓笉鍚屽簲鐢ㄧ殑JPush鏈嶅姟鐩镐簰鎷夎捣鐨勫姛鑳姐�� -->
- <!-- 鑻ヤ笉鍚敤璇ュ姛鑳藉彲鍒犻櫎璇ョ粍浠讹紝灏嗕笉鎷夎捣鍏朵粬搴旂敤涔熶笉鑳借鍏朵粬搴旂敤鎷夎捣 -->
- <service
- android:name="cn.jpush.android.service.DaemonService"
- android:enabled="true"
- android:exported="true" >
- <intent-filter>
- <action android:name="cn.jpush.android.intent.DaemonService" />
-
- <category android:name="com.ziyouyouxi08.snxxz" />
- </intent-filter>
- </service>
-
- <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘 -->
- <provider
- android:name="cn.jpush.android.service.DownloadProvider"
- android:authorities="com.ziyouyouxi08.snxxz.DownloadProvider"
- 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.ziyouyouxi08.snxxz" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.USER_PRESENT" />
- <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
- </intent-filter>
- <!-- Optional -->
- <intent-filter>
- <action android:name="android.intent.action.PACKAGE_ADDED" />
- <action android:name="android.intent.action.PACKAGE_REMOVED" />
-
- <data android:scheme="package" />
- </intent-filter>
- </receiver>
-
- <!-- Required SDK鏍稿績鍔熻兘 -->
- <activity
- android:name="cn.jpush.android.ui.PushActivity"
- android:configChanges="orientation|keyboardHidden"
- android:exported="false"
- android:theme="@android:style/Theme.NoTitleBar" >
- <intent-filter>
- <action android:name="cn.jpush.android.ui.PushActivity" />
-
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="com.ziyouyouxi08.snxxz" />
- </intent-filter>
- </activity>
- <!-- SDK鏍稿績鍔熻兘 -->
- <activity
- android:name="cn.jpush.android.ui.PopWinActivity"
- android:configChanges="orientation|keyboardHidden"
- android:exported="false"
- android:theme="@style/MyDialogStyle" >
- <intent-filter>
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="com.ziyouyouxi08.snxxz" />
- </intent-filter>
- </activity>
-
- <!-- Required SDK鏍稿績鍔熻兘 -->
- <service
- android:name="cn.jpush.android.service.DownloadService"
- android:enabled="true"
- android:exported="false" />
-
- <!-- Required SDK鏍稿績鍔熻兘 -->
- <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
-
- <!-- Required since 3.0.7 -->
- <!-- 鏂扮殑tag/alias鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氱殑骞挎挱 -->
- <!-- 璇ュ箍鎾渶瑕佺户鎵縅Push鎻愪緵鐨凧PushMessageReceiver绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter -->
- <!-- <receiver -->
- <!-- android:name="鑷畾涔� Receiver" -->
- <!-- android:enabled="true" > -->
- <!-- <intent-filter> -->
- <!-- <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" /> -->
- <!-- <category android:name="鎮ㄥ簲鐢ㄧ殑鍖呭悕" /> -->
- <!-- </intent-filter> -->
- <!-- </receiver> -->
-
-
- <!-- <!– User defined. 鐢ㄦ埛鑷畾涔夌殑骞挎挱鎺ユ敹鍣�–> -->
- <receiver
- android:name="com.secondworld.univeralsdk.JPushReceiver"
- android:enabled="true" >
- <intent-filter>
-
- <!-- Required 鐢ㄦ埛娉ㄥ唽SDK鐨刬ntent -->
- <action android:name="cn.jpush.android.intent.REGISTRATION" />
- <!-- Required 鐢ㄦ埛鎺ユ敹SDK娑堟伅鐨刬ntent -->
- <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
- <!-- Required 鐢ㄦ埛鎺ユ敹SDK閫氱煡鏍忎俊鎭殑intent -->
- <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
- <!-- 鎺ユ敹缃戠粶鍙樺寲 杩炴帴/鏂紑 since 1.6.3 -->
- <action android:name="cn.jpush.android.intent.CONNECTION" />
-
- <category android:name="com.ziyouyouxi08.snxxz" />
- </intent-filter>
- </receiver>
-
- <!-- Required. For publish channel feature -->
- <!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁PK鍒嗗彂娓犻亾銆� -->
- <!-- 渚嬪: -->
- <!-- 鍙戝埌 Google Play 鐨凙PK鍙互璁剧疆涓� google-play; -->
- <!-- 鍙戝埌鍏朵粬甯傚満鐨� APK 鍙互璁剧疆涓� xxx-market銆� -->
- <meta-data
- android:name="JPUSH_CHANNEL"
- android:value="developer-default" />
- <!-- Required. AppKey copied from Portal -->
- <meta-data
- android:name="JPUSH_APPKEY"
- android:value="803d5cb73efe51a59968bf52" />
- </application>
-
-</manifest>
\ No newline at end of file
diff --git a/ChannelDiff/904100357/libs/app-game_904100357-release.aar b/ChannelDiff/904100357/libs/app-game_904100357-release.aar
deleted file mode 100644
index cd38751..0000000
--- a/ChannelDiff/904100357/libs/app-game_904100357-release.aar
+++ /dev/null
Binary files differ
diff --git a/ChannelDiff/test/AndroidManifest.xml b/ChannelDiff/test/AndroidManifest.xml
index f993c49..0196a31 100644
--- a/ChannelDiff/test/AndroidManifest.xml
+++ b/ChannelDiff/test/AndroidManifest.xml
@@ -3,7 +3,7 @@
package="com.secondworld.univeralsdk"
android:installLocation="auto"
android:versionCode="1"
- android:versionName="1.0" >
+ android:versionName="1.1.0" >
<uses-sdk
android:minSdkVersion="16"
@@ -63,17 +63,6 @@
android:value="true" />
</activity>
- <!-- 閽堝7.0浠ヤ笂鐨刟pi寮�鏀剧殑鏂囦欢鏉冮檺 -->
- <provider
- android:name="android.support.v4.content.FileProvider"
- android:authorities="com.secondworld.snxxz.fileProvider"
- android:exported="false"
- android:grantUriPermissions="true" >
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/file_paths" />
- </provider>
-
<meta-data
android:name="yl_appid"
android:value="226114725" />
@@ -93,13 +82,13 @@
<!-- 浠婃棩澶存潯鐩稿叧閰嶇疆 -->
<meta-data
android:name="TouTiao_AppName"
- android:value="灏戝勾淇粰浼�" />
+ android:value="${TT_AppName}" />
<meta-data
android:name="TouTiao_AppID"
- android:value="151709" />
+ android:value="${TT_AppID}" />
<meta-data
android:name="TouTiao_Chanel"
- android:value="android-snxxz" />
+ android:value="${TT_Chanel}" />
<!-- Required SDK 鏍稿績鍔熻兘 -->
<!-- 鍙厤缃產ndroid:process鍙傛暟灏哖ushService鏀惧湪鍏朵粬杩涚▼涓� -->
diff --git a/ChannelDiff/test/libs/app-secondworld-release.aar b/ChannelDiff/test/libs/app-secondworld-release.aar
index ed01808..74b2a5a 100644
--- a/ChannelDiff/test/libs/app-secondworld-release.aar
+++ b/ChannelDiff/test/libs/app-secondworld-release.aar
Binary files differ
diff --git a/Project/app/build.gradle b/Project/app/build.gradle
index d208d09..ad19641 100644
--- a/Project/app/build.gradle
+++ b/Project/app/build.gradle
@@ -25,7 +25,7 @@
flavorDimensions "default"
productFlavors {
- game_904100357 {
+ game_498 {
dimension "default"
manifestPlaceholders.put("appId", "com.ziyouyouxi08.snxxz")
manifestPlaceholders.put("JpushAppKey", "803d5cb73efe51a59968bf52")
@@ -37,7 +37,7 @@
implementation files('libs/mrgame-201806061118.jar')
}
}
- // 灏戝勾淇粰浼�
+ // 灏戝勾淇粰浼� - 鏂�
game_822055139 {
dimension "default"
manifestPlaceholders.put("appId", "com.ziyouyouxi01.snxxz")
@@ -150,18 +150,18 @@
implementation files('libs/buglyagent.jar')
}
-task autoCopy_904100357_Manifest(type: Copy) {
- dependsOn 'assembleGame_904100357Release'
- from zipTree("build/outputs/aar/app-game_904100357-release.aar")
+task autoCopy_498_Manifest(type: Copy) {
+ dependsOn 'assembleGame_498Release'
+ from zipTree("build/outputs/aar/app-game_498-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\ChannelDiff\\904100357\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\498\\"
}
-task autoCopy_904100357(type: Copy) {
- dependsOn autoCopy_904100357_Manifest
+task autoCopy_498(type: Copy) {
+ dependsOn autoCopy_498_Manifest
from "build/outputs/aar/"
- include "app-game_904100357-release.aar"
- into "C:\\Unity3D_SDK\\ChannelDiff\\904100357\\libs\\"
+ include "app-game_498-release.aar"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\498\\libs\\"
}
task autoCopy_815035853_Manifest(type: Copy) {
diff --git a/Project/app/src/game_226114725/java/AndroidManifest.xml b/Project/app/src/game_226114725/AndroidManifest.xml
similarity index 100%
rename from Project/app/src/game_226114725/java/AndroidManifest.xml
rename to Project/app/src/game_226114725/AndroidManifest.xml
diff --git a/Project/app/src/game_813015059/java/AndroidManifest.xml b/Project/app/src/game_813015059/AndroidManifest.xml
similarity index 100%
rename from Project/app/src/game_813015059/java/AndroidManifest.xml
rename to Project/app/src/game_813015059/AndroidManifest.xml
diff --git a/Project/app/src/game_815035853/java/AndroidManifest.xml b/Project/app/src/game_815035853/AndroidManifest.xml
similarity index 100%
rename from Project/app/src/game_815035853/java/AndroidManifest.xml
rename to Project/app/src/game_815035853/AndroidManifest.xml
diff --git a/Project/app/src/game_822055139/java/AndroidManifest.xml b/Project/app/src/game_822055139/AndroidManifest.xml
similarity index 100%
rename from Project/app/src/game_822055139/java/AndroidManifest.xml
rename to Project/app/src/game_822055139/AndroidManifest.xml
diff --git a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
index b1c7c64..73b3532 100644
--- a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -109,7 +109,6 @@
int _money = (int) (_json.getDouble("money"));
LogUtil.i(TAG, "閲戦: " + _money);
-
EventUtils.setPurchase("",
_json.getString("title"),
_json.getString("cpInfo"),
--
Gitblit v1.8.0