Merge commit 'ab36230278c858a46b798c20c1c262c2763b94a0'

MacBuilder

2018-10-26 acd57fcd6db739dddf69e219638acab7a28b01c4

Merge commit 'ab36230278c858a46b798c20c1c262c2763b94a0'

 ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar

Binary files differ

 ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar

Binary files differ

 ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar

Binary files differ

 ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar

Binary files differ

 ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar

Binary files differ

 ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar

Binary files differ

 ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar

Binary files differ

 ChannelDiff/Android/test/AndroidManifest.xml

@@ -232,13 +232,12 @@
            android:value="1075838976.000000" />
        <meta-data
            android:name="com.samsung.android.keepalive.density"
            android:value="true" />
        <meta-data
            android:name="android.notch_support"
            android:value="true" />
            android:value="true" /> <!-- <meta-data -->
        <!-- android:name="android.notch_support" -->
        <!-- android:value="true" /> -->
        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" />
            android:value="none" />
        <meta-data
            android:name="android.vendor.full_screen"
            android:value="true" />

 ChannelDiff/Android/test/libs/app-secondworld-release.aar

Binary files differ

 Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -51,6 +51,9 @@
                case CodeU2A.AssetCopy:
                    FileUtil.copyAssets(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
                    FileUtil.copy(_activity, _json.getString("fileName"));
                    break;
                case CodeU2A.BatteryListenStart:
                    BatteryUtil.getInstance().start(_activity);
                    break;

 Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -59,6 +59,9 @@
                case CodeU2A.AssetCopy:
                    FileUtil.copyAssets(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
                    FileUtil.copy(_activity, _json.getString("fileName"));
                    break;
                case CodeU2A.BatteryListenStart:
                    BatteryUtil.getInstance().start(_activity);
                    break;

 Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -59,6 +59,9 @@
                case CodeU2A.AssetCopy:
                    FileUtil.copyAssets(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
                    FileUtil.copy(_activity, _json.getString("fileName"));
                    break;
                case CodeU2A.BatteryListenStart:
                    BatteryUtil.getInstance().start(_activity);
                    break;

 Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -54,6 +54,9 @@
                case CodeU2A.AssetCopy:
                    FileUtil.copyAssets(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
                    FileUtil.copy(_activity, _json.getString("fileName"));
                    break;
                case CodeU2A.BatteryListenStart:
                    BatteryUtil.getInstance().start(_activity);
                    break;

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

@@ -54,7 +54,7 @@
     * å¤–部存储根目录地址
     */
    public static final int ExteneralStorage = 11;

    public static final int CopyOneAsset = 12;
    /**
     * --------------------------------------------------------------------------------------------
     * ä»¥ä¸‹ä¸ºå„自项目SDK相关

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

@@ -104,6 +104,38 @@
        }).start();
    }

    public static void copy(Context context, String fileName)
    {
        String _originalPath = "android" + File.separator + fileName;
        String _destPath = context.getExternalFilesDir(
                "").getAbsolutePath() + File.separator + fileName;
        String _destDir = _destPath.substring(0, _destPath.lastIndexOf('/') + 1);
        File _file = new File(_destDir);
        if(!_file.exists())
        {
            LogUtil.i(TAG,"单独拷贝 => ä¸å­˜åœ¨æŒ‡å®šè·¯å¾„: " + _destDir + ", è¿™é‡Œåˆ›å»º...");
            _file.mkdir();
        }
        try
        {
            InputStream _is = context.getAssets().open(_originalPath);
            FileOutputStream _fos = new FileOutputStream(new File(_destPath));
            byte[] _buffer = new byte[1024];
            int _byteCount;
            while ((_byteCount = _is.read(_buffer)) != -1)
            {
                _fos.write(_buffer, 0, _byteCount);
            }
            _fos.flush();
            _is.close();
            _fos.close();
            LogUtil.i("FileUtil", "单独拷贝 => æ–‡ä»¶: " + _originalPath + " å·²æ‹·è´è‡³: " + _destPath);
        } catch (Exception e)
        {
            e.printStackTrace();
        }
    }
    
    public static void copy(Context context, String original, String dest)
    {
        try

 Project/app/src/secondworld/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -59,6 +59,9 @@
                case CodeU2A.AssetCopy:
                    FileUtil.copyAssets(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
                    FileUtil.copy(_activity, _json.getString("fileName"));
                    break;
                case CodeU2A.BatteryListenStart:
                    BatteryUtil.getInstance().start(_activity);
                    break;

 Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -54,6 +54,9 @@
                case CodeU2A.AssetCopy:
                    FileUtil.copyAssets(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
                    FileUtil.copy(_activity, _json.getString("fileName"));
                    break;
                case CodeU2A.BatteryListenStart:
                    BatteryUtil.getInstance().start(_activity);
                    break;

 Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java

@@ -54,7 +54,7 @@
     * å¤–部存储根目录地址
     */
    public static final int ExteneralStorage = 11;

    public static final int CopyOneAsset = 12;
    /**
     * --------------------------------------------------------------------------------------------
     * ä»¥ä¸‹ä¸ºå„自项目SDK相关

 Project/js_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java

@@ -104,6 +104,31 @@
        }).start();
    }

    public static void copy(Context context, String fileName)
    {
        String _originalPath = "android" + File.separator + fileName;
        String _destPath = context.getExternalFilesDir(
                "").getAbsolutePath() + File.separator + fileName;
        try
        {
            InputStream _is = context.getAssets().open(_originalPath);
            FileOutputStream _fos = new FileOutputStream(new File(_destPath));
            byte[] _buffer = new byte[1024];
            int _byteCount;
            while ((_byteCount = _is.read(_buffer)) != -1)
            {
                _fos.write(_buffer, 0, _byteCount);
            }
            _fos.flush();
            _is.close();
            _fos.close();
            LogUtil.i("FileUtil", "单独拷贝 => æ–‡ä»¶: " + _originalPath + " å·²æ‹·è´è‡³: " + _destPath);
        } catch (Exception e)
        {
            e.printStackTrace();
        }
    }

    public static void copy(Context context, String original, String dest)
    {
        try

 Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -54,6 +54,9 @@
                case CodeU2A.AssetCopy:
                    FileUtil.copyAssets(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
                    FileUtil.copy(_activity,_json.getString("fileName"));
                    break;
                case CodeU2A.BatteryListenStart:
                    BatteryUtil.getInstance().start(_activity);
                    break;

 Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java

@@ -54,7 +54,7 @@
     * å¤–部存储根目录地址
     */
    public static final int ExteneralStorage = 11;

    public static final int CopyOneAsset = 12;
    /**
     * --------------------------------------------------------------------------------------------
     * ä»¥ä¸‹ä¸ºå„自项目SDK相关

 Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java

@@ -104,6 +104,31 @@
        }).start();
    }

    public static void copy(Context context, String fileName)
    {
        String _originalPath = "android" + File.separator + fileName;
        String _destPath = context.getExternalFilesDir(
                "").getAbsolutePath() + File.separator + fileName;
        try
        {
            InputStream _is = context.getAssets().open(_originalPath);
            FileOutputStream _fos = new FileOutputStream(new File(_destPath));
            byte[] _buffer = new byte[1024];
            int _byteCount;
            while ((_byteCount = _is.read(_buffer)) != -1)
            {
                _fos.write(_buffer, 0, _byteCount);
            }
            _fos.flush();
            _is.close();
            _fos.close();
            LogUtil.i("FileUtil", "单独拷贝 => æ–‡ä»¶: " + _originalPath + " å·²æ‹·è´è‡³: " + _destPath);
        } catch (Exception e)
        {
            e.printStackTrace();
        }
    }

    public static void copy(Context context, String original, String dest)
    {
        try

 Project/sp_sdk/src/game_spxjgame/java/com/secondworld/univeralsdk/H2EngineSDK.java

@@ -54,6 +54,9 @@
                case CodeU2A.AssetCopy:
                    FileUtil.copyAssets(_activity);
                    break;
                case CodeU2A.CopyOneAsset:
                    FileUtil.copy(_activity,_json.getString("fileName"));
                    break;
                case CodeU2A.BatteryListenStart:
                    BatteryUtil.getInstance().start(_activity);
                    break;

 Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java

@@ -54,7 +54,10 @@
     * å¤–部存储根目录地址
     */
    public static final int ExteneralStorage = 11;

    /**
     * æ‹·è´å•ä¸€Asset文件
     */
    public static final int CopyOneAsset = 12;
    /**
     * --------------------------------------------------------------------------------------------
     * ä»¥ä¸‹ä¸ºå„自项目SDK相关

 Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java

@@ -104,6 +104,31 @@
        }).start();
    }

    public static void copy(Context context, String fileName)
    {
        String _originalPath = "android" + File.separator + fileName;
        String _destPath = context.getExternalFilesDir(
                "").getAbsolutePath() + File.separator + fileName;
        try
        {
            InputStream _is = context.getAssets().open(_originalPath);
            FileOutputStream _fos = new FileOutputStream(new File(_destPath));
            byte[] _buffer = new byte[1024];
            int _byteCount;
            while ((_byteCount = _is.read(_buffer)) != -1)
            {
                _fos.write(_buffer, 0, _byteCount);
            }
            _fos.flush();
            _is.close();
            _fos.close();
            LogUtil.i("FileUtil", "单独拷贝 => æ–‡ä»¶: " + _originalPath + " å·²æ‹·è´è‡³: " + _destPath);
        } catch (Exception e)
        {
            e.printStackTrace();
        }
    }

    public static void copy(Context context, String original, String dest)
    {
        try

 SDKÏà¹Ø/¼«ËÙSDK/iOS/ÉÙÄêÓù½£¾÷/¡¶ÉÙÄêÓù½£¾÷¡·²ÎÊý.txt

New file
@@ -0,0 +1,11 @@
游戏名称：少年御剑诀
Apple ID：1440102069
包名：com.yaohuan.snyjj
appid：1075
SID：59
秘钥：782c2c4785aa5fe14fa5efb8f2e8a3fa

证书密码：1

沙箱测试账号    Yjj20181025@126.com
沙箱测试账号密码    Yjj20181025

 SDKÏà¹Ø/¼«ËÙSDK/iOS/ÉÙÄêÓù½£¾÷/ÉÙÄêÓù½£¾÷-ÄÚ¹º²ÎÊýɳÏäÐÅÏ¢-1025.xlsx

Binary files differ

 SDKÏà¹Ø/¼«ËÙSDK/iOS/ÉÙÄêÓù½£¾÷/±³¾°Í¼¡¢ICON¡¢LOGO/1024X1024.png

 SDKÏà¹Ø/¼«ËÙSDK/iOS/ÉÙÄêÓù½£¾÷/±³¾°Í¼¡¢ICON¡¢LOGO/512X512.png

 SDKÏà¹Ø/¼«ËÙSDK/iOS/ÉÙÄêÓù½£¾÷/±³¾°Í¼¡¢ICON¡¢LOGO/logo.png

 SDKÏà¹Ø/¼«ËÙSDK/iOS/ÉÙÄêÓù½£¾÷/±³¾°Í¼¡¢ICON¡¢LOGO/Æô¶¯Ò³±³¾°Í¼.png

 SDKÏà¹Ø/¼«ËÙSDK/iOS/ÉÙÄêÓù½£¾÷/±³¾°Í¼¡¢ICON¡¢LOGO/µÇ¼ҳ±³¾°Í¼.png

 SDKÏà¹Ø/¼«ËÙSDK/iOS/ÉÙÄêÓù½£¾÷/Ö¤ÊéºÍSDK.zip

Binary files differ