From cade6ab147082968ef4d2a0d4a082e6f80002193 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 12:03:14 +0800
Subject: [PATCH] Fixed AndroidSDK自由sdk配置部分抽取, 库重新提交
---
Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 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 24805e3..01bf5b1 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -20,6 +20,9 @@
import com.allugame.freesdk.port.FreePlatform;
import com.reyun.tracking.sdk.Tracking;
+import com.ss.android.common.applog.TeaAgent;
+import com.ss.android.common.applog.TeaConfigBuilder;
+import com.ss.android.common.lib.EventUtils;
import com.unity3d.player.UnityPlayer;
import org.json.JSONException;
@@ -110,26 +113,25 @@
_json.getString("payType"),
_json.getString("moneyType"),
(float) _json.getDouble("money"));
+
+ int _money = (int)(_json.getDouble("money"));
+
+ LogUtil.i(TAG,"閲戦: " + _money);
+
+ EventUtils.setPurchase(null,
+ null,
+ null,
+ 1,
+ _json.getString("payType"),
+ _json.getString("moneyType"),
+ true,
+ _money);
break;
case CodeU2A.ClientPackage:
- // ------------------------------- 鐑簯鐩稿叧 -------------------------------
- PackageManager _pkgMgr = _activity.getPackageManager();
- ApplicationInfo _appInfo;
- try
- {
- _appInfo = _pkgMgr.getApplicationInfo(_activity.getPackageName(),
- PackageManager.GET_META_DATA);
-
- // 鑾峰彇鐑簯鐨刟ppID浠ュ強娓犻亾鍚嶇О
- String _trackAppID = _appInfo.metaData.getString("TrackAppID");
- String _trackChanelID = _json.getString("clientPkgID");
- LogUtil.i(TAG, "鐑簯AppID涓�: " + _trackAppID + ", 鐑簯娓犻亾ID: " + _trackChanelID);
- // 鍒濆鍖栫儹浜�
- Tracking.initWithKeyAndChannelId(_activity, _trackAppID, _trackChanelID);
- } catch (PackageManager.NameNotFoundException e)
- {
- e.printStackTrace();
- }
+ // 鍒濆鍖栫儹浜�
+ Tracking.initWithKeyAndChannelId(_activity,
+ UniversalUtil.getMetaString(_activity,"TrackAppID"),
+ _json.getString("clientPkgID"));
break;
case CodeU2A.JPushAddLocalMessage:
addLocalNotification(_activity,
@@ -307,15 +309,35 @@
// ------------------------------- 鑷敱SDK -------------------------------
FreePlatformUtil.getInstace().init(activity);
+ LogUtil.i(TAG,"姝ラ: 1");
// ------------------------------- 鏋佸厜鎺ㄩ�� -------------------------------
JPushInterface.setDebugMode(true);
+ LogUtil.i(TAG,"姝ラ: 2");
JPushInterface.init(activity);
+ LogUtil.i(TAG,"姝ラ: 3");
+ // ------------------------------- 浠婂ぉ澶存潯 -----------------------
+ TeaAgent.init(TeaConfigBuilder.create(activity)
+ .setAppName(UniversalUtil.getMetaString(activity,"TouTiao_AppName"))
+ .setChannel(UniversalUtil.getMetaString(activity,"TouTiao_Chanel"))
+ .setAid(UniversalUtil.getMetaInt(activity,"TouTiao_AppID"))
+ .createTeaConfig());
+ TeaAgent.setDebug(true);
+
+ final long _waitingTime = System.currentTimeMillis();
while (true)
{
// 绛夊緟鑾峰彇鏋佸厜registrationID
if (!JPushInterface.getRegistrationID(activity).equals(""))
{
+ break;
+ }
+
+ long _escapeTime = System.currentTimeMillis() - _waitingTime;
+
+ if (_escapeTime > 3000)
+ {
+ LogUtil.w(TAG,"绛夊緟鑾峰彇鏋佸厜鎺ㄩ�乺egistrationID瓒呮椂: 3绉�");
break;
}
}
@@ -340,33 +362,35 @@
FreePlatform.getInstance().onCreate();
}
- public static void onNewIntent(Intent intent) { }
+ public static void onNewIntent(final Intent intent) { }
- public static void onConfigurationChanged(Configuration newConfig) {}
+ public static void onConfigurationChanged(final Configuration newConfig) {}
- public static void onRestart() { }
+ public static void onRestart(final Activity activity) { }
- public static void onStart()
+ public static void onStart(final Activity activity)
{
FreePlatform.getInstance().onStart();
}
- public static void onPause()
+ public static void onPause(final Activity activity)
{
FreePlatform.getInstance().onPause();
+ TeaAgent.onPause(activity);
}
- public static void onResume()
+ public static void onResume(final Activity activity)
{
FreePlatform.getInstance().onResume();
+ TeaAgent.onResume(activity);
}
- public static void onStop()
+ public static void onStop(final Activity activity)
{
FreePlatform.getInstance().onStop();
}
- public static void onDestroy()
+ public static void onDestroy(final Activity activity)
{
FreePlatform.getInstance().onDestory();
Tracking.exitSdk();
--
Gitblit v1.8.0