From 6ff2aba6dc039e3b30a2bdcdcb76553f0db2c958 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期日, 28 四月 2019 22:49:09 +0800
Subject: [PATCH] update 易乐更新
---
/dev/null | 0
ChannelDiff/Android/yilegame/AndroidManifest.xml | 112 ++++++++++++++++++++++++++++++++------------------------
ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar | 0
3 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/ChannelDiff/Android/yilegame/AndroidManifest.xml b/ChannelDiff/Android/yilegame/AndroidManifest.xml
index 8bcb8a3..523af7a 100644
--- a/ChannelDiff/Android/yilegame/AndroidManifest.xml
+++ b/ChannelDiff/Android/yilegame/AndroidManifest.xml
@@ -9,28 +9,58 @@
android:minSdkVersion="16"
android:targetSdkVersion="22" />
+ <!-- WIFI INTERNET -->
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_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.WAKE_LOCK" /> -->
+
+
+ <!-- 寮圭獥 鐗规畩鏉冮檺 -->
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+ <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
+ <!-- 鑾峰彇杩戞湡浠诲姟 -->
+ <uses-permission android:name="android.permission.GET_TASKS" />
+ <!-- 鍗遍櫓鏉冮檺 -->
<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" />
+ <!-- 鍦⊿DCard涓垱寤轰笌鍒犻櫎鏂囦欢鏉冮檺 鍗遍櫓 -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <!-- 鍦⊿DCard涓垱寤轰笌鍒犻櫎鏂囦欢鏉冮檺 -->
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+ <!-- 瀛樺偍鏉冮檺 6.0浠ュ悗杩囨椂锛孧ODE_PRIVATE -->
+ <uses-permission android:name="android.permission.MODE_WORLD_READABLE" />
+ <!-- 鎺ユ敹鐭俊楠岃瘉鐮� -->
+ <uses-permission android:name="android.permission.RECEIVE_SMS" />
+
+ <!-- 鏀粯蹇呰鏉冮檺 -->
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+ <uses-permission-sdk-23 android:name="android.permission.CHANGE_CONFIGURATION" />
+
+ <!-- 鎺ユ敹鐭俊楠岃瘉鐮� -->
+ <uses-permission android:name="android.permission.RECEIVE_SMS" />
+
+ <supports-screens
+ android:anyDensity="true"
+ android:largeScreens="true"
+ android:normalScreens="true"
+ android:resizeable="true"
+ android:smallScreens="true" />
+
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
<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" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
- <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
-
- <!-- 鎺ユ敹鐭俊楠岃瘉鐮� -->
- <uses-permission android:name="android.permission.RECEIVE_SMS" />
<permission
android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
@@ -87,12 +117,6 @@
android:resource="@xml/file_paths" />
</provider>
- <!-- <meta-data -->
- <!-- android:name="TrackAppID" -->
- <!-- android:value="${TrackAppID}" /> -->
- <!-- <meta-data -->
- <!-- android:name="TrackChannelID" -->
- <!-- android:value="${TrackChannelID}" /> -->
<activity
android:name="com.aoyou.sdk.ui.LoginActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -153,7 +177,31 @@
android:screenOrientation="behind"
android:windowSoftInputMode="adjustResize|stateHidden" >
</activity>
+ <activity
+ android:name="com.aoyou.sdk.ui.WeChatPayActivity"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:screenOrientation="portrait" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <!-- 鍚姩璇彞闇�瑕佹敞閲婅皟 -->
+ <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+ <data
+ android:host="MainActivity"
+ android:scheme="com.aoyou.sdk" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+
+ <data android:scheme="" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name="com.aoyou.sdk.ui.WxH5PayActivity"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:screenOrientation="portrait" >
+ </activity>
<!-- 寰俊鐧诲綍鍥炶皟鐣岄潰 -->
<activity
android:name="com.aoyou.sdk.wxapi.WXEntryActivity"
@@ -207,38 +255,6 @@
<meta-data
android:name="TouTiao_Chanel"
android:value="_default_" />
-
- <!-- 浠ヤ笅涓轰笁鏂规敮浠橀〉闈� -->
- <!-- 寰敮浠楽DK鐣岄潰 -->
- <!-- 鏄剧ず缃戦〉鐣岄潰 -->
- <activity
- android:name="com.iapppay.sdk.main.WebActivity"
- android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" />
- <activity
- android:name="com.iapppay.ui.activity.PersonCenterActivity"
- android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection" />
-
- <!-- 鏀堕摱鍙�-鏅�� -->
- <activity
- android:name="com.iapppay.ui.activity.PayHubActivity"
- android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection" />
-
- <!-- 閫夋嫨鍏呭�奸噾棰濈晫闈� -->
- <activity
- android:name="com.iapppay.ui.activity.SelectAmountActivity"
- android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection"
- android:launchMode="singleTask" />
- <activity
- android:name="com.iapppay.ui.activity.ChargeActivity"
- android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection"
- android:launchMode="singleTask" />
- <!-- 娓告垙鍗″拰璇濊垂鍗＄晫闈� -->
- <activity
- android:name="com.iapppay.ui.card.GamepayActivity"
- android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection"
- android:launchMode="singleTask" />
-
<meta-data
android:name="android.max_aspect"
android:value="1075838976.000000" />
diff --git a/ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar b/ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar
index 75b61dd..b17c66c 100644
--- a/ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar
+++ b/ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar
Binary files differ
diff --git a/Project/yl_sdk/libs/iapppay_plugin.jar b/Project/yl_sdk/libs/iapppay_plugin.jar
deleted file mode 100644
index c6043cf..0000000
--- a/Project/yl_sdk/libs/iapppay_plugin.jar
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0