fixed 增加今日头条sdk;

client_Hale

2018-08-21 2a4727a346fef2ae347e1bad707f359e7be73b9c

fixed 增加今日头条sdk;

fixed 接入今日头条sdk;

 Android/226114725/libs/applog-release.aar

Binary files differ

 Android/813015059/libs/applog-release.aar

Binary files differ

 Android/test/lib/app-secondworld-release.aar

Binary files differ

 Android/test/libs/applog-release.aar

Binary files differ

 Project/app/build.gradle

@@ -30,6 +30,9 @@
            manifestPlaceholders.put("TrackAppID", "5ae23b6b905f98d9b8bd542debf35678")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", 151709)
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")
        }
        djx {
            dimension "default"
@@ -37,6 +40,9 @@
            manifestPlaceholders.put("TrackAppID", "fa550076116709861b7e9b61bb401710")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", 151709)
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")
        }
        lxj {
            dimension "default"
@@ -44,6 +50,9 @@
            manifestPlaceholders.put("TrackAppID", "0c5ad863fb8935d18b3ecefe05389701")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "c848276e83ce1f5761ff4b27")
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", 151709)
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")
        }
        secondworld {
            dimension "default"
@@ -51,6 +60,9 @@
            manifestPlaceholders.put("TrackAppID", "5ae23b6b905f98d9b8bd542debf35678")
            manifestPlaceholders.put("TrackChannelID", "_default_")
            manifestPlaceholders.put("JpushAppKey", "22186239fee975f883198cf4")
            manifestPlaceholders.put("TT_AppName", "少年修仙传")
            manifestPlaceholders.put("TT_AppID", 151709)
            manifestPlaceholders.put("TT_Chanel", "android-snxxz")
        }
    }
}
@@ -71,6 +83,7 @@
    implementation files('libs/okio.jar')
    implementation files('libs/tracking1.3.0.jar')
    compile(name: 'freesdk-release', ext: 'aar')
    compile(name: 'applog-release', ext: 'aar')
    provided files('libs/unity-classes.jar')
}


 Project/app/libs/applog-release.aar

Binary files differ

 Project/app/proguard-rules.pro

@@ -41,5 +41,9 @@
-keep class android.support.** { *;}
-dontwarn com.reyun.tracking.**
-keep class com.reyun.tracking.** { *;}
-dontwarn com.ss.**
-keep class com.ss.tracking.** { *;}
-dontwarn com.bytedance.**
-keep class com.bytedance.** { *;}

-keep class com.secondworld.univeralsdk.** { *;}

 Project/app/src/main/AndroidManifest.xml

@@ -87,6 +87,17 @@
            android:name="TrackChannelID"
            android:value="${TrackChannelID}" />

        <!-- ä»Šæ—¥å¤´æ¡ç›¸å…³é…ç½® -->
        <meta-data
            android:name="TouTiao_AppName"
            android:value="${TT_AppName}" />
        <meta-data
            android:name="TouTiao_AppID"
            android:value="${TT_AppID}" />
        <meta-data
            android:name="TouTiao_Chanel"
            android:value="${TT_Chanel}" />

        <!-- Required SDK æ ¸å¿ƒåŠŸèƒ½-->
        <!-- å¯é…ç½®android:process参数将PushService放在其他进程中 -->
        <service

 Project/app/src/main/java/com/secondworld/univeralsdk/FreePlatformUtil.java

@@ -8,6 +8,8 @@
import com.allugame.freesdk.entities.FreeOrder;
import com.allugame.freesdk.port.FreePlatform;
import com.reyun.tracking.sdk.Tracking;
import com.ss.android.common.applog.TeaAgent;
import com.ss.android.common.lib.EventUtils;

import org.json.JSONException;
import org.json.JSONObject;
@@ -102,6 +104,7 @@
                    case FreeCallbackCode.LOGOUT_SUCCESS:
                        m_Message.put("code", CodeA2U.FreePlatformLogoutOk);
                        UniversalUtil.sendMessageToUnity(m_Message);
                        EventUtils.setLogin("mobile",true);
                        break;
                    case FreeCallbackCode.LOGOUT_FAILURE:
                        m_Message.put("code", CodeA2U.FreePlatformLogoutFail);
@@ -141,6 +144,7 @@
                _registerMsg.put("account", account);
                UniversalUtil.sendMessageToUnity(_registerMsg);
                Tracking.setRegisterWithAccountID(account);
                EventUtils.setRegister("mobile",true);
            }
        });
    }

 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);

                        // èŽ·å–热云的appID以及渠道名称
                        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,
@@ -313,6 +315,13 @@
                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_AppID"))
                                              .setAid(UniversalUtil.getMetaInt(activity,"TouTiao_AppID"))
                                              .createTeaConfig());
                TeaAgent.setDebug(true);

                final long _waitingTime = System.currentTimeMillis();

@@ -353,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();

 Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java

@@ -61,7 +61,7 @@
    @Override
    protected void onStart()
    {
        H2EngineSDK.onStart();
        H2EngineSDK.onStart(this);

        super.onStart();
        LogUtil.i(TAG, "onStart");
@@ -70,7 +70,7 @@
    @Override
    protected void onStop()
    {
        H2EngineSDK.onStop();
        H2EngineSDK.onStop(this);

        super.onStop();
        LogUtil.i(TAG, "onStop");
@@ -79,7 +79,7 @@
    @Override
    protected void onResume()
    {
        H2EngineSDK.onResume();
        H2EngineSDK.onResume(this);

        super.onResume();
        LogUtil.i(TAG, "onResume");
@@ -132,7 +132,7 @@
    @Override
    protected void onPause()
    {
        H2EngineSDK.onPause();
        H2EngineSDK.onPause(this);

        super.onPause();
        LogUtil.i(TAG, "onPause");
@@ -141,7 +141,7 @@
    @Override
    protected void onDestroy()
    {
        H2EngineSDK.onDestroy();
        H2EngineSDK.onDestroy(this);

        super.onDestroy();
        LogUtil.i(TAG, "onDestroy");
@@ -150,7 +150,7 @@
    @Override
    protected void onRestart()
    {
        H2EngineSDK.onRestart();
        H2EngineSDK.onRestart(this);

        super.onRestart();
        LogUtil.i(TAG, "onRestart");

 Project/app/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java

@@ -8,6 +8,7 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PermissionInfo;
@@ -21,6 +22,7 @@
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;
@@ -354,4 +356,37 @@

        return true;
    }

    public static String getMetaString(Activity activity, String key)
    {
        PackageManager _pkgMgr = activity.getPackageManager();
        ApplicationInfo _appInfo;
        try
        {
            _appInfo = _pkgMgr.getApplicationInfo(activity.getPackageName(),
                                                  PackageManager.GET_META_DATA);
            return _appInfo.metaData.getString(key);
        } catch (PackageManager.NameNotFoundException e)
        {
            e.printStackTrace();
        }
        return null;
    }

    public static int getMetaInt(Activity activity, String key)
    {
        PackageManager _pkgMgr = activity.getPackageManager();
        ApplicationInfo _appInfo;
        try
        {
            _appInfo = _pkgMgr.getApplicationInfo(activity.getPackageName(),
                                                  PackageManager.GET_META_DATA);
            return _appInfo.metaData.getInt(key);
        } catch (PackageManager.NameNotFoundException e)
        {
            e.printStackTrace();
        }
        return -1;
    }

}

 SDKÏà¹Ø/Í·ÌõAndroid¶ËlogSDK2.0.1/.DS_Store

Binary files differ

 SDKÏà¹Ø/Í·ÌõAndroid¶ËlogSDK2.0.1/SDK¼¯³É²âÊÔ-6.28.pdf

Binary files differ

 SDKÏà¹Ø/Í·ÌõAndroid¶ËlogSDK2.0.1/applog-release.aar

Binary files differ

 SDKÏà¹Ø/Í·ÌõAndroid¶ËlogSDK2.0.1/½ÓÈëʵÀý´úÂë/__MACOSX/applogtobdemo/._.DS_Store

Binary files differ

 SDKÏà¹Ø/Í·ÌõAndroid¶ËlogSDK2.0.1/½ÓÈëʵÀý´úÂë/__MACOSX/applogtobdemo/app/._.DS_Store

Binary files differ

 SDKÏà¹Ø/Í·ÌõAndroid¶ËlogSDK2.0.1/½ÓÈëʵÀý´úÂë/applogtobdemo

New file
@@ -1 +1 @@
Subproject commit 0000000000000000000000000000000000000000
Subproject commit b6f6b5881a290f6fb1732bf76d738c07c1723b6b

 SDKÏà¹Ø/Í·ÌõAndroid¶ËlogSDK2.0.1/½ÓÈëÎĵµ_2.0.1.pdf

Binary files differ

 SDKÏà¹Ø/×ÔÓÉSDK/FreeSDK_ANDROID/freesdk-release.aar

Binary files differ

 ÇþµÀ²îÒì/ÉÙÄêÐÞÏÉ´«/AndroidManifest.xml

@@ -29,9 +29,7 @@
        android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
        android:protectionLevel="signature" />
    <!-- Required -->
    <permission
        android:name="com.shandangceshi.snxxz.permission.JPUSH_MESSAGE"
        android:protectionLevel="signature" />
    <permission android:name="com.shandangceshi.snxxz.permission.JPUSH_MESSAGE" />

    <uses-permission android:name="com.shandangceshi.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 æ ¸å¿ƒåŠŸèƒ½ -->
        <!-- å¯é…ç½®android:process参数将PushService放在其他进程中 -->
        <service

 ÇþµÀ²îÒì/ÉÙÄêÐÞÏÉ´«/libs/app-snxxz-release.aar

Binary files differ

 ÇþµÀ²îÒì/¶·½£ÏÉ/AndroidManifest.xml

@@ -29,9 +29,7 @@
        android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
        android:protectionLevel="signature" />
    <!-- Required -->
    <permission
        android:name="com.shandangceshi.snxxz.permission.JPUSH_MESSAGE"
        android:protectionLevel="signature" />
    <permission android:name="com.shandangceshi.snxxz.permission.JPUSH_MESSAGE" />

    <uses-permission android:name="com.shandangceshi.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 æ ¸å¿ƒåŠŸèƒ½ -->
        <!-- å¯é…ç½®android:process参数将PushService放在其他进程中 -->
        <service

 ÇþµÀ²îÒì/¶·½£ÏÉ/libs/app-djx-release.aar

Binary files differ

 ÇþµÀ²îÒì/ÁéÏɼÇ/AndroidManifest.xml

@@ -90,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 æ ¸å¿ƒåŠŸèƒ½ -->
        <!-- å¯é…ç½®android:process参数将PushService放在其他进程中 -->
        <service

 ÇþµÀ²îÒì/ÁéÏɼÇ/libs/app-lxj-release.aar

Binary files differ