From 241e7efb009cc7cc7e991da49937ee11e1c01bbd Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 16:05:18 +0800
Subject: [PATCH] fixed 针对头条android版本23修改为22, 库及相应逻辑修改提交
---
渠道差异/灵仙记/libs/app-lxj-release.aar | 0
渠道差异/少年修仙传/libs/app-snxxz-release.aar | 0
Android/226114725/libs/applog-release.aar | 0
Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java | 2 +-
Android/test/libs/app-secondworld-release.aar | 0
Android/813015059/libs/applog-release.aar | 0
Project/app/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java | 2 +-
渠道差异/斗剑仙/libs/app-djx-release.aar | 0
Android/test/libs/applog-release.aar | 0
Project/app/build.gradle | 8 ++++----
Android/test/AndroidManifest.xml | 15 ++++++++++++---
11 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/Android/226114725/libs/applog-release.aar b/Android/226114725/libs/applog-release.aar
index 1988ed0..67c90d2 100644
--- a/Android/226114725/libs/applog-release.aar
+++ b/Android/226114725/libs/applog-release.aar
Binary files differ
diff --git a/Android/813015059/libs/applog-release.aar b/Android/813015059/libs/applog-release.aar
index 1988ed0..8522af1 100644
--- a/Android/813015059/libs/applog-release.aar
+++ b/Android/813015059/libs/applog-release.aar
Binary files differ
diff --git a/Android/test/AndroidManifest.xml b/Android/test/AndroidManifest.xml
index 94df5df..f993c49 100644
--- a/Android/test/AndroidManifest.xml
+++ b/Android/test/AndroidManifest.xml
@@ -29,9 +29,7 @@
android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
android:protectionLevel="signature" />
<!-- Required -->
- <permission
- android:name="com.secondworld.snxxz.permission.JPUSH_MESSAGE"
- android:protectionLevel="signature" />
+ <permission android:name="com.secondworld.snxxz.permission.JPUSH_MESSAGE" />
<uses-permission android:name="com.secondworld.snxxz.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
@@ -92,6 +90,17 @@
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="android-snxxz" />
+
<!-- Required SDK 鏍稿績鍔熻兘 -->
<!-- 鍙厤缃產ndroid:process鍙傛暟灏哖ushService鏀惧湪鍏朵粬杩涚▼涓� -->
<service
diff --git a/Android/test/libs/app-secondworld-release.aar b/Android/test/libs/app-secondworld-release.aar
index 026df30..e19210c 100644
--- a/Android/test/libs/app-secondworld-release.aar
+++ b/Android/test/libs/app-secondworld-release.aar
Binary files differ
diff --git a/Android/test/libs/applog-release.aar b/Android/test/libs/applog-release.aar
index 1988ed0..a83accc 100644
--- a/Android/test/libs/applog-release.aar
+++ b/Android/test/libs/applog-release.aar
Binary files differ
diff --git a/Project/app/build.gradle b/Project/app/build.gradle
index 83c63e1..3e7ef4f 100644
--- a/Project/app/build.gradle
+++ b/Project/app/build.gradle
@@ -41,7 +41,7 @@
manifestPlaceholders.put("TrackChannelID", "_default_")
manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
manifestPlaceholders.put("TT_AppName", "灏戝勾淇粰浼�")
- manifestPlaceholders.put("TT_AppID", 151709)
+ manifestPlaceholders.put("TT_AppID", "151709")
manifestPlaceholders.put("TT_Chanel", "android-snxxz")
}
lxj {
@@ -51,7 +51,7 @@
manifestPlaceholders.put("TrackChannelID", "_default_")
manifestPlaceholders.put("JpushAppKey", "c848276e83ce1f5761ff4b27")
manifestPlaceholders.put("TT_AppName", "灏戝勾淇粰浼�")
- manifestPlaceholders.put("TT_AppID", 151709)
+ manifestPlaceholders.put("TT_AppID", "151709")
manifestPlaceholders.put("TT_Chanel", "android-snxxz")
}
secondworld {
@@ -61,7 +61,7 @@
manifestPlaceholders.put("TrackChannelID", "_default_")
manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
manifestPlaceholders.put("TT_AppName", "灏戝勾淇粰浼�")
- manifestPlaceholders.put("TT_AppID", 151709)
+ manifestPlaceholders.put("TT_AppID", "151709")
manifestPlaceholders.put("TT_Chanel", "android-snxxz")
}
}
@@ -140,6 +140,6 @@
dependsOn autoCopySecondWorldAndroidManifest
from 'build/outputs/aar/'
include "app-secondworld-release.aar"
- into 'C:\\Unity3D_SDK\\Android\\test\\lib\\'
+ into 'C:\\Unity3D_SDK\\Android\\test\\libs\\'
}
\ No newline at end of file
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 dab14fa..01bf5b1 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -318,7 +318,7 @@
// ------------------------------- 浠婂ぉ澶存潯 -----------------------
TeaAgent.init(TeaConfigBuilder.create(activity)
.setAppName(UniversalUtil.getMetaString(activity,"TouTiao_AppName"))
- .setChannel(UniversalUtil.getMetaString(activity,"TouTiao_AppID"))
+ .setChannel(UniversalUtil.getMetaString(activity,"TouTiao_Chanel"))
.setAid(UniversalUtil.getMetaInt(activity,"TouTiao_AppID"))
.createTeaConfig());
TeaAgent.setDebug(true);
diff --git a/Project/app/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java b/Project/app/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java
index f51d2b6..9f841c6 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java
@@ -22,7 +22,6 @@
import android.support.v4.content.PermissionChecker;
import android.widget.Toast;
-import com.reyun.tracking.sdk.Tracking;
import com.unity3d.player.UnityPlayer;
import org.json.JSONObject;
@@ -375,6 +374,7 @@
public static int getMetaInt(Activity activity, String key)
{
+ LogUtil.i(TAG, "灏嗚鑾峰彇鐨凪etaKey: " + key);
PackageManager _pkgMgr = activity.getPackageManager();
ApplicationInfo _appInfo;
try
diff --git "a/\346\270\240\351\201\223\345\267\256\345\274\202/\345\260\221\345\271\264\344\277\256\344\273\231\344\274\240/libs/app-snxxz-release.aar" "b/\346\270\240\351\201\223\345\267\256\345\274\202/\345\260\221\345\271\264\344\277\256\344\273\231\344\274\240/libs/app-snxxz-release.aar"
index 9e54444..e6afdd4 100644
--- "a/\346\270\240\351\201\223\345\267\256\345\274\202/\345\260\221\345\271\264\344\277\256\344\273\231\344\274\240/libs/app-snxxz-release.aar"
+++ "b/\346\270\240\351\201\223\345\267\256\345\274\202/\345\260\221\345\271\264\344\277\256\344\273\231\344\274\240/libs/app-snxxz-release.aar"
Binary files differ
diff --git "a/\346\270\240\351\201\223\345\267\256\345\274\202/\346\226\227\345\211\221\344\273\231/libs/app-djx-release.aar" "b/\346\270\240\351\201\223\345\267\256\345\274\202/\346\226\227\345\211\221\344\273\231/libs/app-djx-release.aar"
index 34328e0..60c9dfe 100644
--- "a/\346\270\240\351\201\223\345\267\256\345\274\202/\346\226\227\345\211\221\344\273\231/libs/app-djx-release.aar"
+++ "b/\346\270\240\351\201\223\345\267\256\345\274\202/\346\226\227\345\211\221\344\273\231/libs/app-djx-release.aar"
Binary files differ
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 8bee16d..7925a62 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