From 6f5a7b2cf52e2816d664ddaa14dc76b5c2d5d0a3 Mon Sep 17 00:00:00 2001
From: MacBuilder <MacBuilder@secondworld.com>
Date: 星期二, 28 八月 2018 15:12:32 +0800
Subject: [PATCH] Merge commit 'e48629bda8952502013db4dec2cccd7ca7308783'
---
ChannelDiff/815035853/libs/app-game_815035853-release.aar | 0
ChannelDiff/226114725/libs/app-game_226114725-release.aar | 0
Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java | 24 ++++++++++++------------
渠道列表.xlsx | 0
Android/release/libs/freesdk-release.aar | 0
ChannelDiff/813015059/libs/app-game_813015059-release.aar | 0
ChannelDiff/822055139/libs/app-game_822055139-release.aar | 0
Project/app/build.gradle | 2 +-
SDK相关/自由SDK/FreeSDK_ANDROID/freesdk-release.aar | 0
ChannelDiff/813015059/AndroidManifest.xml | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Android/release/libs/freesdk-release.aar b/Android/release/libs/freesdk-release.aar
index 3199e54..4eca827 100644
--- a/Android/release/libs/freesdk-release.aar
+++ b/Android/release/libs/freesdk-release.aar
Binary files differ
diff --git a/ChannelDiff/226114725/libs/app-game_226114725-release.aar b/ChannelDiff/226114725/libs/app-game_226114725-release.aar
index db814f3..331031b 100644
--- a/ChannelDiff/226114725/libs/app-game_226114725-release.aar
+++ b/ChannelDiff/226114725/libs/app-game_226114725-release.aar
Binary files differ
diff --git a/ChannelDiff/813015059/AndroidManifest.xml b/ChannelDiff/813015059/AndroidManifest.xml
index 11733c6..1f753c1 100644
--- a/ChannelDiff/813015059/AndroidManifest.xml
+++ b/ChannelDiff/813015059/AndroidManifest.xml
@@ -239,7 +239,7 @@
<!-- Required. AppKey copied from Portal -->
<meta-data
android:name="JPUSH_APPKEY"
- android:value="a0d746ccb32b9b0e5ce7c7be" />
+ android:value="63f9523bf41727aaccfd258f" />
</application>
</manifest>
\ No newline at end of file
diff --git a/ChannelDiff/813015059/libs/app-game_813015059-release.aar b/ChannelDiff/813015059/libs/app-game_813015059-release.aar
index 5bf62a1..b5a1899 100644
--- a/ChannelDiff/813015059/libs/app-game_813015059-release.aar
+++ b/ChannelDiff/813015059/libs/app-game_813015059-release.aar
Binary files differ
diff --git a/ChannelDiff/815035853/libs/app-game_815035853-release.aar b/ChannelDiff/815035853/libs/app-game_815035853-release.aar
index e570180..a64831c 100644
--- a/ChannelDiff/815035853/libs/app-game_815035853-release.aar
+++ b/ChannelDiff/815035853/libs/app-game_815035853-release.aar
Binary files differ
diff --git a/ChannelDiff/822055139/libs/app-game_822055139-release.aar b/ChannelDiff/822055139/libs/app-game_822055139-release.aar
index 6211660..853fafe 100644
--- a/ChannelDiff/822055139/libs/app-game_822055139-release.aar
+++ b/ChannelDiff/822055139/libs/app-game_822055139-release.aar
Binary files differ
diff --git a/Project/app/build.gradle b/Project/app/build.gradle
index 15e32f1..2564fb0 100644
--- a/Project/app/build.gradle
+++ b/Project/app/build.gradle
@@ -61,7 +61,7 @@
manifestPlaceholders.put("FreeSDK_PlatformID", "1000")
manifestPlaceholders.put("TrackAppID", "0c5ad863fb8935d18b3ecefe05389701")
manifestPlaceholders.put("TrackChannelID", "_default_")
- manifestPlaceholders.put("JpushAppKey", "a0d746ccb32b9b0e5ce7c7be")
+ manifestPlaceholders.put("JpushAppKey", "63f9523bf41727aaccfd258f")
manifestPlaceholders.put("TT_AppName", "灏戝勾淇粰浼�")
manifestPlaceholders.put("TT_AppID", "151709")
manifestPlaceholders.put("TT_Chanel", "android-snxxz")
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 01bf5b1..b52cbf8 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -198,22 +198,22 @@
{
Intent _intent = new Intent(Intent.ACTION_VIEW);
- if (Build.VERSION.SDK_INT >= 23)
- {
- _intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- Uri _contentUri = FileProvider.getUriForFile(activity,
- "com.shandangceshi.snxxz.fileProvider",
- _file);
- _intent.setDataAndType(_contentUri, "application/vnd.android.package-archive");
-
- }
- else
- {
+// if (Build.VERSION.SDK_INT >= 23)
+// {
+// _intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+// Uri _contentUri = FileProvider.getUriForFile(activity,
+// "com.shandangceshi.snxxz.fileProvider",
+// _file);
+// _intent.setDataAndType(_contentUri, "application/vnd.android.package-archive");
+//
+// }
+// else
+// {
_intent.setDataAndType(Uri.fromFile(_file),
"application/vnd.android.package-archive");
_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- }
+// }
activity.startActivity(_intent);
diff --git "a/SDK\347\233\270\345\205\263/\350\207\252\347\224\261SDK/FreeSDK_ANDROID/freesdk-release.aar" "b/SDK\347\233\270\345\205\263/\350\207\252\347\224\261SDK/FreeSDK_ANDROID/freesdk-release.aar"
index 800b019..4eca827 100644
--- "a/SDK\347\233\270\345\205\263/\350\207\252\347\224\261SDK/FreeSDK_ANDROID/freesdk-release.aar"
+++ "b/SDK\347\233\270\345\205\263/\350\207\252\347\224\261SDK/FreeSDK_ANDROID/freesdk-release.aar"
Binary files differ
diff --git "a/\346\270\240\351\201\223\345\210\227\350\241\250.xlsx" "b/\346\270\240\351\201\223\345\210\227\350\241\250.xlsx"
index bb8f786..517d701 100644
--- "a/\346\270\240\351\201\223\345\210\227\350\241\250.xlsx"
+++ "b/\346\270\240\351\201\223\345\210\227\350\241\250.xlsx"
Binary files differ
--
Gitblit v1.8.0