From 1c5a8f542bc6b4e912f2d44d029e91ae9a605dcd Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Fri, 27 Oct 2023 17:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E7=BA=BF=E7=A8=8B?=
=?UTF-8?q?=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/navinfo/omqs/db/ImportOMDBHelper.kt | 46 ++++++++++---------
.../java/com/navinfo/omqs/util/CMLog.java | 8 ++--
vtm | 2 +-
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
index dd8f24cb..292ea3fa 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -216,7 +216,6 @@ class ImportOMDBHelper @AssistedInject constructor(
val next = iterator.next()
val realm = Realm.getInstance(currentInstallTaskConfig)
realm.executeTransaction {
- Log.e("jingo", "安装数据 Realm数据插入")
it.copyToRealm(next)
}
realm.close()
@@ -241,19 +240,9 @@ class ImportOMDBHelper @AssistedInject constructor(
}
Log.e("jingo", "安装结束")
} catch (e: Exception) {
- Log.e("jingo", "安装报错 ${e.message}")
+ Log.e("jingo", "安装报错1 ${e.message}")
return false
}
-
-
-// }.collect() { list ->
-// if (list == null) {
-// realm.close()
-// } else {
-// realm.executeTransaction {
-// it.copyToRealm(list)
-// }
-// }
return true
}
@@ -271,7 +260,11 @@ class ImportOMDBHelper @AssistedInject constructor(
//单个表要素统计
var elementIndex = 0
val currentConfig = currentEntry.value
-
+// CMLog.writeLogtoFile(
+// ImportOMDBHelper::class.java.name,
+// "importOmdbZipFile",
+// "${currentConfig.table}开始"
+// )
try {
var realm: Realm? = null
if (!isEmit) {
@@ -281,16 +274,23 @@ class ImportOMDBHelper @AssistedInject constructor(
val txtFile = unZipFiles.find {
it.name == currentConfig.table
}
- if (txtFile != null) {
+ if (txtFile != null && txtFile.exists()) {
val fileReader = FileReader(txtFile)
val bufferedReader = BufferedReader(fileReader)
var line: String? = bufferedReader.readLine()
-
+ var time = System.currentTimeMillis()
+ var newTime = 0L
while (line != null) {
if (line == null || line.trim() == "") {
line = bufferedReader.readLine()
continue
}
+ newTime = System.currentTimeMillis()
+ Log.e(
+ "jingo",
+ "安装数据 ${currentConfig.table} $elementIndex ${listRenderEntity.size} ${newTime - time}"
+ )
+ time = newTime
elementIndex += 1
val map = gson.fromJson<Map<String, Any>>(
line, object : TypeToken<Map<String, Any>>() {}.type
@@ -699,7 +699,7 @@ class ImportOMDBHelper @AssistedInject constructor(
)
if (isEmit) {
f.send(listRenderEntity)
- delay(100)
+ delay(20)
} else {
realm!!.copyToRealm(listRenderEntity)
realm!!.commitTransaction()
@@ -712,13 +712,15 @@ class ImportOMDBHelper @AssistedInject constructor(
}
line = bufferedReader.readLine()
}
- Log.e(
- "jingo",
- "安装数据 ${currentConfig.table} $elementIndex ${listRenderEntity.size}"
- )
+// CMLog.writeLogtoFile(
+// ImportOMDBHelper::class.java.name,
+// "importOmdbZipFile",
+// "结束===总量$elementIndex"
+// )
+
if (isEmit) {
f.send(listRenderEntity)
- delay(100)
+ delay(20)
} else {
bufferedReader.close()
@@ -733,7 +735,7 @@ class ImportOMDBHelper @AssistedInject constructor(
Log.e("jingo", "安装报错 ${currentConfig.table} ${elementIndex} ${e.message}")
throw e
}
- Log.e("jingo", "安装完成 ${currentConfig.table}")
+ Log.e("jingo", "完成 ${currentConfig.table}")
}
diff --git a/app/src/main/java/com/navinfo/omqs/util/CMLog.java b/app/src/main/java/com/navinfo/omqs/util/CMLog.java
index 4dff58e0..6eb82f97 100644
--- a/app/src/main/java/com/navinfo/omqs/util/CMLog.java
+++ b/app/src/main/java/com/navinfo/omqs/util/CMLog.java
@@ -214,7 +214,7 @@ public class CMLog {
if (!flag&&MYLOG_WRITE_TO_FILE) {
flag = true;
try {
- Log.e("jingo", "日志写入0");
+ Log.e("qj", "日志写入0");
// 新建或打开日志文件
Date nowtime = new Date();
String needWriteFiel = logfile.format(nowtime);
@@ -232,11 +232,11 @@ public class CMLog {
new File(Constant.USER_DATA_LOG_PATH).mkdirs();
}
File file = new File(Constant.USER_DATA_LOG_PATH, needWriteFiel + MYLOGFILEName);
- Log.e("jingo", "日志写入1");
+ Log.e("qj", "日志写入1");
if (!file.exists())
file.createNewFile();
- Log.e("jingo", "日志写入2");
+ Log.e("qj", "日志写入2");
FileWriter filerWriter = new FileWriter(file, true);//后面这个参数代表是不是要接上文件中原来的数据，不进行覆盖
BufferedWriter bufWriter = new BufferedWriter(filerWriter);
@@ -244,7 +244,7 @@ public class CMLog {
bufWriter.newLine();
bufWriter.close();
filerWriter.close();
- Log.e("jingo", "日志写入结束");
+ Log.e("qj", "日志写入结束");
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/vtm b/vtm
index 9e0cc6dc..c046e788 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 9e0cc6dcdce04d1082ed6459e8810d6329e8cfdc
+Subproject commit c046e788f5c739612a31c308639fca2de639669a