From 43421dbe42aca67918b0109d6ea3aa67a818b9d8 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 09 十月 2018 10:59:55 +0800
Subject: [PATCH] update 极速sdk相关
---
/dev/null | 130 -------------
Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/H2EngineSDK.java | 2
SDK相关/极速SDK/归档 5.zip | 0
ChannelDiff/Android/jisugame/libs/js_sdk-game_jsgame-release.aar | 0
Project/js_sdk/src/main/AndroidManifest.xml | 151 +++++++++++++-
ChannelDiff/Android/jisugame/AndroidManifest.xml | 250 +++++++++++++++++++++++++
SDK相关/极速SDK/SDK替换文件.zip | 0
SDK相关/猫耳SDK/iOS对接/素材/说明.txt | 4
GradleDiff/jisugame/mainTemplate.gradle | 59 +++++
9 files changed, 453 insertions(+), 143 deletions(-)
diff --git a/ChannelDiff/Android/jisugame/AndroidManifest.xml b/ChannelDiff/Android/jisugame/AndroidManifest.xml
new file mode 100644
index 0000000..2f03a7f
--- /dev/null
+++ b/ChannelDiff/Android/jisugame/AndroidManifest.xml
@@ -0,0 +1,250 @@
+<?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" />
+
+ <!-- Required -->
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.CALL_PHONE" />
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+ <uses-permission android:name="android.permission.GET_TASKS" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.VIBRATE" />
+ <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
+ <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <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" />
+
+ <permission android:name="com.lingleigame.shaonianqixiachuan.permission.JPUSH_MESSAGE" />
+
+ <uses-permission android:name="com.lingleigame.shaonianqixiachuan.permission.JPUSH_MESSAGE" />
+ <uses-permission android:name="android.permission.RESTART_PACKAGES" /> <!-- 濡傛灉鎮ㄥ綋鍓嶅簲鐢ㄧ▼搴忔湁鑷繁鐨凙pplication锛屽垯蹇呴』缁ф壙com.linglei.sdk.openapi.LLApplication -->
+ <!-- 濡傛灉娌℃湁锛岃鎸囧畾application鐨刵ame灞炴�т负com.linglei.sdk.openapi.LLApplication -->
+ <application
+ android:name="com.linglei.sdklib.open.LLApplication"
+ 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" >
+
+ <!-- Required APPID -->
+ <meta-data
+ android:name="LL_APPID"
+ android:value="1073" />
+
+ <!-- Required 闂睆椤� 鍔″繀鎶奡DK鍚姩椤� action 鍜� category 淇敼涓轰互涓嬪�硷紝灞忓箷鏂瑰悜璇锋寚瀹氱珫灞忔垨妯睆 -->
+ <activity
+ android:name="com.linglei.sdklib.auth.SplashActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:screenOrientation="landscape"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ <!-- Required SDK鍐呴儴鐣岄潰 灞忓箷鏂瑰悜璇锋寚瀹氱珫灞忔垨妯睆, 涓婚鍔″繀涓嶈淇敼 -->
+ <activity
+ android:name="com.linglei.sdklib.auth.AuthActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:screenOrientation="landscape"
+ android:theme="@style/llsdk_dialog" />
+
+ <!-- Required 鍏叡鐣岄潰 灞忓箷鏂瑰悜璇锋寚瀹氱珫灞忔垨妯睆 -->
+ <activity
+ android:name="com.linglei.sdklib.auth.CommonActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:screenOrientation="landscape"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+
+ <!-- Required SDK鏍稿績鏈嶅姟 -->
+ <service
+ android:name="com.linglei.sdklib.open.LLService"
+ android:exported="false" />
+
+ <meta-data
+ android:name="android.max_aspect"
+ android:value="1075838976.000000" />
+ <meta-data
+ android:name="com.samsung.android.keepalive.density"
+ android:value="true" /> <!-- <meta-data -->
+ <!-- android:name="android.notch_support" -->
+ <!-- android:value="true" /> -->
+ <meta-data
+ android:name="notch.config"
+ android:value="none" />
+ <meta-data
+ android:name="android.vendor.full_screen"
+ android:value="true" />
+
+ <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="singleTask"
+ android:screenOrientation="sensorLandscape" >
+ <intent-filter>
+ <action android:name="com.lingleigame.shaonianqixiachuan.MAIN" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <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" />
+ <meta-data
+ android:name="android.vendor.home_indicator"
+ android:value="hide" />
+ <meta-data
+ android:name="android.max_aspect"
+ android:value="1075419520.000000" />
+ <meta-data
+ android:name="com.samsung.android.keepalive.density"
+ android:value="true" />
+ </activity> <!-- 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.lingleigame.shaonianqixiachuan.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.lingleigame.shaonianqixiachuan" />
+ </intent-filter>
+ </service> <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘 -->
+ <provider
+ android:name="cn.jpush.android.service.DownloadProvider"
+ android:authorities="com.lingleigame.shaonianqixiachuan.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.lingleigame.shaonianqixiachuan" />
+ </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.lingleigame.shaonianqixiachuan" />
+ </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.lingleigame.shaonianqixiachuan" />
+ </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.lingleigame.shaonianqixiachuan" />
+ </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/Android/jsgame/libs/js_sdk-game_jsgame-release.aar b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jsgame-release.aar
similarity index 95%
rename from ChannelDiff/Android/jsgame/libs/js_sdk-game_jsgame-release.aar
rename to ChannelDiff/Android/jisugame/libs/js_sdk-game_jsgame-release.aar
index 459054c..bc182f3 100644
--- a/ChannelDiff/Android/jsgame/libs/js_sdk-game_jsgame-release.aar
+++ b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jsgame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/jsgame/AndroidManifest.xml b/ChannelDiff/Android/jsgame/AndroidManifest.xml
deleted file mode 100644
index 6dd50ef..0000000
--- a/ChannelDiff/Android/jsgame/AndroidManifest.xml
+++ /dev/null
@@ -1,130 +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" />
-
- <!-- Required -->
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.CALL_PHONE" />
- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
- <uses-permission android:name="android.permission.GET_TASKS" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
- <uses-permission android:name="android.permission.VIBRATE" />
- <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
- <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <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" /> <!-- 濡傛灉鎮ㄥ綋鍓嶅簲鐢ㄧ▼搴忔湁鑷繁鐨凙pplication锛屽垯蹇呴』缁ф壙com.linglei.sdk.openapi.LLApplication -->
- <!-- 濡傛灉娌℃湁锛岃鎸囧畾application鐨刵ame灞炴�т负com.linglei.sdk.openapi.LLApplication -->
- <application
- android:name="com.linglei.sdklib.open.LLApplication"
- 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" >
-
- <!-- Required APPID -->
- <meta-data
- android:name="LL_APPID"
- android:value="1073" />
-
- <!-- Required 闂睆椤� 鍔″繀鎶奡DK鍚姩椤� action 鍜� category 淇敼涓轰互涓嬪�硷紝灞忓箷鏂瑰悜璇锋寚瀹氱珫灞忔垨妯睆 -->
- <activity
- android:name="com.linglei.sdklib.auth.SplashActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:screenOrientation="landscape"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- <!-- Required SDK鍐呴儴鐣岄潰 灞忓箷鏂瑰悜璇锋寚瀹氱珫灞忔垨妯睆, 涓婚鍔″繀涓嶈淇敼 -->
- <activity
- android:name="com.linglei.sdklib.auth.AuthActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:screenOrientation="landscape"
- android:theme="@style/llsdk_dialog" />
-
- <!-- Required 鍏叡鐣岄潰 灞忓箷鏂瑰悜璇锋寚瀹氱珫灞忔垨妯睆 -->
- <activity
- android:name="com.linglei.sdklib.auth.CommonActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:screenOrientation="landscape"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
-
- <!-- Required SDK鏍稿績鏈嶅姟 -->
- <service
- android:name="com.linglei.sdklib.open.LLService"
- android:exported="false" />
-
- <meta-data
- android:name="android.max_aspect"
- android:value="1075838976.000000" />
- <meta-data
- android:name="com.samsung.android.keepalive.density"
- android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
- <meta-data
- android:name="notch.config"
- android:value="portrait|landscape" />
- <meta-data
- android:name="android.vendor.full_screen"
- android:value="true" />
-
- <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="singleTask"
- android:screenOrientation="sensorLandscape" >
- <intent-filter>
- <action android:name="com.lingleigame.shaonianqixiachuan.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" />
- <meta-data
- android:name="android.vendor.home_indicator"
- android:value="hide" />
- <meta-data
- android:name="android.max_aspect"
- android:value="1075419520.000000" />
- <meta-data
- android:name="com.samsung.android.keepalive.density"
- android:value="true" />
- </activity>
- </application>
-
-</manifest>
\ No newline at end of file
diff --git a/GradleDiff/jisugame/mainTemplate.gradle b/GradleDiff/jisugame/mainTemplate.gradle
new file mode 100644
index 0000000..a845dc5
--- /dev/null
+++ b/GradleDiff/jisugame/mainTemplate.gradle
@@ -0,0 +1,59 @@
+// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN
+buildscript {
+ repositories {
+ jcenter()
+ }
+
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.1.0'
+ }
+}
+
+allprojects {
+ repositories {
+ flatDir {
+ dirs 'libs'
+ }
+ }
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+**DEPS**}
+
+android {
+ compileSdkVersion **APIVERSION**
+ buildToolsVersion '**BUILDTOOLS**'
+
+ defaultConfig {
+ targetSdkVersion **TARGETSDKVERSION**
+ applicationId '**APPLICATIONID**'
+ ndk {
+ abiFilters **ABIFILTERS**
+ }
+ }
+
+ lintOptions {
+ abortOnError false
+ }
+
+ aaptOptions {
+ noCompress '.unity3d', '.ress', '.resource', '.obb'
+ }
+
+**SIGN**
+ buildTypes {
+ debug {
+ jniDebuggable true
+ }
+ release {
+ // Set minifyEnabled to true if you want to run ProGuard on your project
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-unity.txt'
+ **SIGNCONFIG**
+ }
+ }
+
+}
diff --git a/Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
index cc0b3b7..28bc5e2 100644
--- a/Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -327,7 +327,7 @@
_msgStruct.clear();
_msgStruct.put("code", CodeA2U.SdkInitComplete);
- _msgStruct.put("channelPlatform", "mr");
+ _msgStruct.put("channelPlatform", "js");
UniversalUtil.sendMessageToUnity(_msgStruct);
LogUtil.i(TAG, "鍒濆鍖栨墽琛屽畬姣�");
diff --git a/Project/js_sdk/src/main/AndroidManifest.xml b/Project/js_sdk/src/main/AndroidManifest.xml
index 8a457e6..13fd6e6 100644
--- a/Project/js_sdk/src/main/AndroidManifest.xml
+++ b/Project/js_sdk/src/main/AndroidManifest.xml
@@ -27,6 +27,10 @@
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+ <permission android:name="${appId}.permission.JPUSH_MESSAGE" />
+ <uses-permission android:name="${appId}.permission.JPUSH_MESSAGE" />
+ <uses-permission android:name="android.permission.RESTART_PACKAGES"/>
+
<application
android:allowBackup="true"
android:icon="@drawable/app_icon"
@@ -63,8 +67,7 @@
android:screenOrientation="sensorLandscape">
<intent-filter>
<action android:name="${appId}.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
@@ -89,16 +92,140 @@
</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>-->
+ <!-- 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="${appId}.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="${appId}" />
+ </intent-filter>
+ </service>
+
+ <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘-->
+ <provider
+ android:name="cn.jpush.android.service.DownloadProvider"
+ android:authorities="${appId}.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="${appId}" />
+ </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="${appId}" />
+ </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="${appId}" />
+ </intent-filter>
+ </activity>
+
+ <!-- Required SDK鏍稿績鍔熻兘-->
+ <service
+ android:name="cn.jpush.android.service.DownloadService"
+ android:enabled="true"
+ android:exported="false"></service>
+
+ <!-- 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="${appId}" />
+ </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="${JpushAppKey}" />
</application>
diff --git "a/SDK\347\233\270\345\205\263/\346\236\201\351\200\237SDK/SDK\346\233\277\346\215\242\346\226\207\344\273\266.zip" "b/SDK\347\233\270\345\205\263/\346\236\201\351\200\237SDK/SDK\346\233\277\346\215\242\346\226\207\344\273\266.zip"
new file mode 100644
index 0000000..4f3945f
--- /dev/null
+++ "b/SDK\347\233\270\345\205\263/\346\236\201\351\200\237SDK/SDK\346\233\277\346\215\242\346\226\207\344\273\266.zip"
Binary files differ
diff --git "a/SDK\347\233\270\345\205\263/\346\236\201\351\200\237SDK/\345\275\222\346\241\243 5.zip" "b/SDK\347\233\270\345\205\263/\346\236\201\351\200\237SDK/\345\275\222\346\241\243 5.zip"
new file mode 100644
index 0000000..25718d9
--- /dev/null
+++ "b/SDK\347\233\270\345\205\263/\346\236\201\351\200\237SDK/\345\275\222\346\241\243 5.zip"
Binary files differ
diff --git "a/SDK\347\233\270\345\205\263/\347\214\253\350\200\263SDK/iOS\345\257\271\346\216\245/\347\264\240\346\235\220/\350\257\264\346\230\216.txt" "b/SDK\347\233\270\345\205\263/\347\214\253\350\200\263SDK/iOS\345\257\271\346\216\245/\347\264\240\346\235\220/\350\257\264\346\230\216.txt"
index 97e76fe..40755e7 100644
--- "a/SDK\347\233\270\345\205\263/\347\214\253\350\200\263SDK/iOS\345\257\271\346\216\245/\347\264\240\346\235\220/\350\257\264\346\230\216.txt"
+++ "b/SDK\347\233\270\345\205\263/\347\214\253\350\200\263SDK/iOS\345\257\271\346\216\245/\347\264\240\346\235\220/\350\257\264\346\230\216.txt"
@@ -2,3 +2,7 @@
包名：逍遥仙灵游
密码：1234
Game ID：572
+
+
+sajkjk@123.com
+Kjijii123
\ No newline at end of file
--
Gitblit v1.8.0