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'
---
Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
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..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);
@@ -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);
--
Gitblit v1.8.0