9527 新版本unity sdk修改

lwb

2020-11-20 cce268c744be182640eafc07de9a640d3480f150

9527 新版本unity sdk修改

 Channel/Android/test/debug/libs/library-debug-test.aar

Binary files differ

 Channel/Android/test/release/libs/library-release-test.aar

Binary files differ

 SdkProject/library/build.gradle

@@ -155,7 +155,7 @@
    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
    implementation 'androidx.navigation:navigation-fragment:2.3.1'
    implementation 'androidx.navigation:navigation-ui:2.3.1'
    implementation 'com.github.pqpo:Log4a:1.4.2@aar'
//    implementation 'com.github.pqpo:Log4a:1.4.2@aar'

    implementation fileTree(dir: 'libs', include: ['*.jar'], exclude: ['unity-classes.jar'])
    compileOnly files('libs/unity-classes.jar')

 SdkProject/library/src/main/java/com/secondworld/sdk/GameApp.java

@@ -1,9 +1,6 @@
package com.secondworld.sdk;

import android.app.AlarmManager;
import android.app.Application;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Handler;

 SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdCopyOneAsset.java

@@ -1,8 +1,8 @@
package com.secondworld.sdk.command;

import com.secondworld.sdk.AsyncTaskOperator;
import com.secondworld.sdk.utils.CodeU2A;
import com.secondworld.sdk.utils.FileUtil;
import com.secondworld.sdk.utils.LogUtil;

import org.json.JSONObject;

@@ -14,8 +14,13 @@

    @Override
    public void process(JSONObject json) {
        AsyncTaskOperator.I.run(() -> {
            FileUtil.copyOneAsset(json.toString());
        });
//        AsyncTaskOperator.I.run(() -> {
        try {
            String fileName = json.getString("fileName");
            FileUtil.copyOneAsset(fileName);
        } catch (Exception e) {
            LogUtil.e("CmdCopyOneAsset", e);
        }
//        });
    }
}

 SdkProject/library/src/main/java/com/secondworld/sdk/utils/LogUtil.java

@@ -5,19 +5,6 @@

import com.secondworld.sdk.BuildConfig;

import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;

import me.pqpo.librarylog4a.Level;
import me.pqpo.librarylog4a.Log4a;
import me.pqpo.librarylog4a.LogData;
import me.pqpo.librarylog4a.appender.AndroidAppender;
import me.pqpo.librarylog4a.appender.FileAppender;
import me.pqpo.librarylog4a.formatter.DateFileFormatter;
import me.pqpo.librarylog4a.interceptor.Interceptor;
import me.pqpo.librarylog4a.logger.AppenderLogger;

public class LogUtil {

@@ -28,73 +15,71 @@
    private static final String GLOBAL_TAG = "H2EngineSDK";

    public static void Init(Context context) {
        int level = Level.VERBOSE;
        Interceptor wrapInterceptor = new Interceptor() {
            @Override
            public boolean intercept(LogData logData) {
                logData.tag = "-" + logData.tag + "：";
                return true;
            }
        };
        AndroidAppender androidAppender = new AndroidAppender.Builder()
                .setLevel(level)
                .addInterceptor(wrapInterceptor)
                .create();

        File logDir = new File(context.getExternalCacheDir() + "/logs/");
        String buffer_path = logDir.getAbsolutePath() + File.separator + ".logCache";
        String time = new SimpleDateFormat("yyyy_MM_dd", Locale.getDefault()).format(new Date());
        String log_path = logDir.getAbsolutePath() + File.separator + time + ".txt";
        FileAppender fileAppender = new FileAppender.Builder(context)
                .setLogFilePath(log_path)
                .setLevel(level)
                .addInterceptor(wrapInterceptor)
                .setBufferFilePath(buffer_path)
                .setFormatter(new DateFileFormatter())
                .setCompress(false)
                .setBufferSize(BUFFER_SIZE)
                .create();

        AppenderLogger logger = new AppenderLogger.Builder()
                .addAppender(fileAppender)
                .create();

        Log4a.setLogger(logger);
//        int level = Level.VERBOSE;
//        Interceptor wrapInterceptor = logData -> {
//            logData.tag = GLOBAL_TAG + "-" + logData.tag + "：";
//            return true;
//        };
//        AndroidAppender androidAppender = new AndroidAppender.Builder()
//                .setLevel(level)
//                .addInterceptor(wrapInterceptor)
//                .create();
//
//        File logDir = new File(context.getExternalCacheDir() + "/logs/");
//        String buffer_path = logDir.getAbsolutePath() + File.separator + ".logCache";
//        String time = new SimpleDateFormat("yyyy_MM_dd", Locale.getDefault()).format(new Date());
//        String log_path = logDir.getAbsolutePath() + File.separator + time + ".txt";
//        FileAppender fileAppender = new FileAppender.Builder(context)
//                .setLogFilePath(log_path)
//                .setLevel(level)
//                .addInterceptor(wrapInterceptor)
//                .setBufferFilePath(buffer_path)
//                .setFormatter(new DateFileFormatter())
//                .setCompress(false)
//                .setBufferSize(BUFFER_SIZE)
//                .create();
//
//        AppenderLogger logger = new AppenderLogger.Builder()
//                .addAppender(fileAppender)
////                .addAppender(androidAppender)
//                .create();
//
//        Log4a.setLogger(logger);
    }

    private static void print(int level, String tag, String msg, boolean debug) {
        if (DEBUG || debug)//控制台输出
            Log.println(level, String.format("%s-%s", GLOBAL_TAG, tag), msg);
        else//写入本地文件
            Log4a.println(level, tag, msg);
//        if (DEBUG || debug)//控制台输出
        Log.println(level, String.format("%s-%s", GLOBAL_TAG, tag), msg);
//        else//写入本地文件
//        Log4a.println(level, tag, msg);
    }

    public static void debug(String tag, String msg) {
        print(Level.ERROR, tag, msg, true);
        print(Log.ERROR, tag, msg, true);
    }

    public static void v(String tag, String msg) {
        print(Level.VERBOSE, tag, msg, false);
        print(Log.VERBOSE, tag, msg, false);
    }

    public static void d(String tag, String msg) {
        print(Level.DEBUG, tag, msg, false);
        print(Log.DEBUG, tag, msg, false);
    }

    public static void i(String tag, String msg) {
        print(Level.INFO, tag, msg, false);
        print(Log.INFO, tag, msg, false);
    }

    public static void w(String tag, String msg) {
        print(Level.WARN, tag, msg, false);
        print(Log.WARN, tag, msg, false);
    }

    public static void e(String tag, String msg) {
        print(Level.ERROR, tag, msg, false);
        print(Log.ERROR, tag, msg, false);
    }

    public static void e(String tag, Exception e) {
        print(Level.ERROR, tag, Log.getStackTraceString(e), false);
        print(Log.ERROR, tag, Log.getStackTraceString(e), false);
    }

}