From e8895951735d4ddb94bbf1030c1ba93e30b028f5 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 14 八月 2018 17:42:30 +0800
Subject: [PATCH] fixed 灵仙记极光推送appkey配置错误; 打包添加极光推送appKey配置
---
渠道差异/灵仙记/AndroidManifest.xml | 6 ++----
渠道差异/灵仙记/libs/app-lxj-release.aar | 0
Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java | 13 +++++++++++++
Project/app/build.gradle | 4 ++++
Project/app/src/main/AndroidManifest.xml | 4 ++--
5 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/Project/app/build.gradle b/Project/app/build.gradle
index 4183072..69836f1 100644
--- a/Project/app/build.gradle
+++ b/Project/app/build.gradle
@@ -29,24 +29,28 @@
manifestPlaceholders.put("appId", "com.shandangceshi.snxxz")
manifestPlaceholders.put("TrackAppID", "5ae23b6b905f98d9b8bd542debf35678")
manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
}
djx {
dimension "default"
manifestPlaceholders.put("appId", "com.shandangceshi.snxxz")
manifestPlaceholders.put("TrackAppID", "fa550076116709861b7e9b61bb401710")
manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
}
lxj {
dimension "default"
manifestPlaceholders.put("appId", "com.zyxhgame.game007")
manifestPlaceholders.put("TrackAppID", "0c5ad863fb8935d18b3ecefe05389701")
manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "c848276e83ce1f5761ff4b27")
}
secondworld {
dimension "default"
manifestPlaceholders.put("appId", "com.secondworld.snxxz")
manifestPlaceholders.put("TrackAppID", "5ae23b6b905f98d9b8bd542debf35678")
manifestPlaceholders.put("TrackChannelID", "_default_")
+ manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
}
}
}
diff --git a/Project/app/src/main/AndroidManifest.xml b/Project/app/src/main/AndroidManifest.xml
index 82b0a9b..36e0f94 100644
--- a/Project/app/src/main/AndroidManifest.xml
+++ b/Project/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
<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="${appId}.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
+ <permission android:name="${appId}.permission.JPUSH_MESSAGE" />
<uses-permission android:name="${appId}.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
@@ -220,7 +220,7 @@
<!-- Required. AppKey copied from Portal -->
<meta-data
android:name="JPUSH_APPKEY"
- android:value="22186239fee975f883198cf4" />
+ android:value="${JpushAppKey}" />
</application>
diff --git a/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 24805e3..2934e45 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -307,9 +307,14 @@
// ------------------------------- 鑷敱SDK -------------------------------
FreePlatformUtil.getInstace().init(activity);
+ LogUtil.i(TAG,"姝ラ: 1");
// ------------------------------- 鏋佸厜鎺ㄩ�� -------------------------------
JPushInterface.setDebugMode(true);
+ LogUtil.i(TAG,"姝ラ: 2");
JPushInterface.init(activity);
+ LogUtil.i(TAG,"姝ラ: 3");
+
+ final long _waitingTime = System.currentTimeMillis();
while (true)
{
@@ -318,6 +323,14 @@
{
break;
}
+
+ long _escapeTime = System.currentTimeMillis() - _waitingTime;
+
+ if (_escapeTime > 3000)
+ {
+ LogUtil.w(TAG,"绛夊緟鑾峰彇鏋佸厜鎺ㄩ�乺egistrationID瓒呮椂: 3绉�");
+ break;
+ }
}
_msgStruct.clear();
diff --git "a/\346\270\240\351\201\223\345\267\256\345\274\202/\347\201\265\344\273\231\350\256\260/AndroidManifest.xml" "b/\346\270\240\351\201\223\345\267\256\345\274\202/\347\201\265\344\273\231\350\256\260/AndroidManifest.xml"
index 0d0e24b..1455342 100644
--- "a/\346\270\240\351\201\223\345\267\256\345\274\202/\347\201\265\344\273\231\350\256\260/AndroidManifest.xml"
+++ "b/\346\270\240\351\201\223\345\267\256\345\274\202/\347\201\265\344\273\231\350\256\260/AndroidManifest.xml"
@@ -29,9 +29,7 @@
android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
android:protectionLevel="signature" />
<!-- Required -->
- <permission
- android:name="com.zyxhgame.game007.permission.JPUSH_MESSAGE"
- android:protectionLevel="signature" />
+ <permission android:name="com.zyxhgame.game007.permission.JPUSH_MESSAGE" />
<uses-permission android:name="com.zyxhgame.game007.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
@@ -230,7 +228,7 @@
<!-- Required. AppKey copied from Portal -->
<meta-data
android:name="JPUSH_APPKEY"
- android:value="22186239fee975f883198cf4" />
+ android:value="c848276e83ce1f5761ff4b27" />
</application>
</manifest>
\ No newline at end of file
diff --git "a/\346\270\240\351\201\223\345\267\256\345\274\202/\347\201\265\344\273\231\350\256\260/libs/app-lxj-release.aar" "b/\346\270\240\351\201\223\345\267\256\345\274\202/\347\201\265\344\273\231\350\256\260/libs/app-lxj-release.aar"
index c0af35e..8c1a8c2 100644
--- "a/\346\270\240\351\201\223\345\267\256\345\274\202/\347\201\265\344\273\231\350\256\260/libs/app-lxj-release.aar"
+++ "b/\346\270\240\351\201\223\345\267\256\345\274\202/\347\201\265\344\273\231\350\256\260/libs/app-lxj-release.aar"
Binary files differ
--
Gitblit v1.8.0