From 57a8388fa0f81f34497cdc668ed17c2ea95b02a7 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 25 十月 2018 11:14:43 +0800
Subject: [PATCH] update 增加拷贝单个文件接口
---
ChannelDiff/Android/test/AndroidManifest.xml | 9 +-
Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java | 5 +
ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar | 0
ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar | 0
ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar | 0
ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar | 0
Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java | 3 +
ChannelDiff/Android/test/libs/app-secondworld-release.aar | 0
Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java | 25 ++++++++
ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar | 0
Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java | 2
Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java | 2
Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java | 3 +
Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java | 3 +
Project/sp_sdk/src/game_spxjgame/java/com/secondworld/univeralsdk/H2EngineSDK.java | 3 +
Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java | 25 ++++++++
ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar | 0
Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java | 3 +
Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java | 3 +
Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java | 3 +
Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java | 2
Project/app/src/main/java/com/secondworld/univeralsdk/FileUtil.java | 25 ++++++++
Project/js_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java | 25 ++++++++
ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar | 0
Project/app/src/secondworld/java/com/secondworld/univeralsdk/H2EngineSDK.java | 3 +
25 files changed, 135 insertions(+), 9 deletions(-)
diff --git a/ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar b/ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar
index 2ba046f..bae01b3 100644
--- a/ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar
+++ b/ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar b/ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar
index c6b4e2d..e9abd93 100644
--- a/ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar
+++ b/ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar b/ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar
index fe1715c..72347a2 100644
--- a/ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar
+++ b/ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar b/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
index 4f6c128..5f7b8dd 100644
--- a/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
+++ b/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
index c732944..0541a9c 100644
--- a/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
+++ b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar b/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
index cdbcd0a..d54ef8f 100644
--- a/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
+++ b/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar b/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
index 27781f1..6d5cfba 100644
--- a/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
+++ b/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/test/AndroidManifest.xml b/ChannelDiff/Android/test/AndroidManifest.xml
index bd8036d..75a6a3e 100644
--- a/ChannelDiff/Android/test/AndroidManifest.xml
+++ b/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" />
diff --git a/ChannelDiff/Android/test/libs/app-secondworld-release.aar b/ChannelDiff/Android/test/libs/app-secondworld-release.aar
index 4a0ab17..3c648a9 100644
--- a/ChannelDiff/Android/test/libs/app-secondworld-release.aar
+++ b/ChannelDiff/Android/test/libs/app-secondworld-release.aar
Binary files differ
diff --git a/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 02f39a2..063dbbf 100644
--- a/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/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;
diff --git a/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java
index f99f207..18ce941 100644
--- a/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/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;
diff --git a/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java
index f99f207..18ce941 100644
--- a/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/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;
diff --git a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 0b9640e..f1ddd9f 100644
--- a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/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;
diff --git a/Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java b/Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
index 3c36627..0089ebb 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
+++ b/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;
/**
* --------------------------------------------------------------------------------------------
* 浠ヤ笅涓哄悇鑷」鐩甋DK鐩稿叧
diff --git a/Project/app/src/main/java/com/secondworld/univeralsdk/FileUtil.java b/Project/app/src/main/java/com/secondworld/univeralsdk/FileUtil.java
index fbb1a8d..a2814fd 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/FileUtil.java
+++ b/Project/app/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
diff --git a/Project/app/src/secondworld/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/secondworld/java/com/secondworld/univeralsdk/H2EngineSDK.java
index f99f207..18ce941 100644
--- a/Project/app/src/secondworld/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/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;
diff --git a/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 22f703f..867a71c 100644
--- a/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/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;
diff --git a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
index 7a30a74..ef44ba0 100644
--- a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
+++ b/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;
/**
* --------------------------------------------------------------------------------------------
* 浠ヤ笅涓哄悇鑷」鐩甋DK鐩稿叧
diff --git a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java
index fbb1a8d..3ffcb8b 100644
--- a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java
+++ b/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
diff --git a/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 11fb965..18dbf74 100644
--- a/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/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;
diff --git a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
index 7a30a74..ef44ba0 100644
--- a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
+++ b/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;
/**
* --------------------------------------------------------------------------------------------
* 浠ヤ笅涓哄悇鑷」鐩甋DK鐩稿叧
diff --git a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java
index fbb1a8d..3ffcb8b 100644
--- a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java
+++ b/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
diff --git a/Project/sp_sdk/src/game_spxjgame/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/sp_sdk/src/game_spxjgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
index f6b43fb..fec27cc 100644
--- a/Project/sp_sdk/src/game_spxjgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/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;
diff --git a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java b/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
index 7a30a74..fbbff1d 100644
--- a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
+++ b/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;
/**
* --------------------------------------------------------------------------------------------
* 浠ヤ笅涓哄悇鑷」鐩甋DK鐩稿叧
diff --git a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java b/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java
index fbb1a8d..3ffcb8b 100644
--- a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/FileUtil.java
+++ b/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
--
Gitblit v1.8.0