From 4093f02494ecfe727fb8bfabc6d0f1b47cd4f7f8 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 20 六月 2019 17:00:43 +0800
Subject: [PATCH] update 易乐极光推送
---
ChannelDiff/Android/yilexbqy/AndroidManifest.xml | 2 +-
Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/H2EngineSDK.java | 2 +-
ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar | 0
Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/YLPlatformUtil.java | 5 -----
Project/yl_sdk/build.gradle | 3 ++-
5 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ChannelDiff/Android/yilexbqy/AndroidManifest.xml b/ChannelDiff/Android/yilexbqy/AndroidManifest.xml
index 69cfb4e..d222887 100644
--- a/ChannelDiff/Android/yilexbqy/AndroidManifest.xml
+++ b/ChannelDiff/Android/yilexbqy/AndroidManifest.xml
@@ -394,7 +394,7 @@
android:value="developer-default" /> <!-- Required. AppKey copied from Portal -->
<meta-data
android:name="JPUSH_APPKEY"
- android:value="de9e26bb35598bd8c602e1d9" />
+ android:value="75cabb6bec28ffc681878516" />
</application>
</manifest>
\ No newline at end of file
diff --git a/ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar b/ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar
index 5279917..e6152fc 100644
--- a/ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar
+++ b/ChannelDiff/Android/yilexbqy/libs/yl_sdk-game_ylgame-release.aar
Binary files differ
diff --git a/Project/yl_sdk/build.gradle b/Project/yl_sdk/build.gradle
index 97feed7..acf13ba 100644
--- a/Project/yl_sdk/build.gradle
+++ b/Project/yl_sdk/build.gradle
@@ -27,13 +27,14 @@
productFlavors {
game_ylgame {
dimension "default"
- manifestPlaceholders.put("JpushAppKey", "de9e26bb35598bd8c602e1d9")
// --------------------------------------------------------------
+ // manifestPlaceholders.put("JpushAppKey", "de9e26bb35598bd8c602e1d9") //1.6
// manifestPlaceholders.put("appId", "com.android.yiru.menghtj") //1.6
// manifestPlaceholders.put("TrackAppID", "ffae98b68ba32b45a6d5fbd1203b9ae1") // 1.6
// manifestPlaceholders.put("TT_AppName", "menghuantianjiao") // 1.6
// manifestPlaceholders.put("TT_AppID", "155534") // 1.6
// --------------------------------------------------------------
+ manifestPlaceholders.put("JpushAppKey", "75cabb6bec28ffc681878516") // 2.0
manifestPlaceholders.put("appId", "com.yiru.menhtj") //2.0
manifestPlaceholders.put("TrackAppID", "34984be594b93353e6fd41d0b4f3b78d") // 2.0
manifestPlaceholders.put("TT_AppName", "mhtj_new") // 2.0
diff --git a/Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 80a52fd..b43cf49 100644
--- a/Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -327,7 +327,7 @@
return;
}
- PushEnable = activity.getPackageName().equals("com.android.yiru.menghtj");
+ PushEnable = activity.getPackageName().equals("com.yiru.menhtj");
new Thread(new Runnable()
{
diff --git a/Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/YLPlatformUtil.java b/Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/YLPlatformUtil.java
index 3fc7b5a..e924f4f 100644
--- a/Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/YLPlatformUtil.java
+++ b/Project/yl_sdk/src/game_ylgame/java/com/secondworld/univeralsdk/YLPlatformUtil.java
@@ -10,16 +10,11 @@
import com.aoyou.sdk.domain.PaymentCallbackInfo;
import com.aoyou.sdk.domain.PaymentErrorMsg;
import com.reyun.tracking.sdk.Tracking;
-import com.squareup.okhttp.Callback;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
import com.ss.android.common.lib.EventUtils;
import org.json.JSONException;
import org.json.JSONObject;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
--
Gitblit v1.8.0