From 57dd93853f33fecc117753e4ca0fb23a334e0bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 28 Jul 2020 11:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/utils/sqlite/BaseDao.kt     | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/BaseDao.kt b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/BaseDao.kt
index c755822a6b..c2b4f2f5c2 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/BaseDao.kt
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/BaseDao.kt
@@ -3,6 +3,7 @@ package com.mogo.utils.sqlite
 import android.content.ContentValues
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
+import com.mogo.utils.logger.Logger
 import com.mogo.utils.sqlite.annotation.DbField
 import com.mogo.utils.sqlite.annotation.DbTable
 import java.lang.reflect.Field
@@ -15,13 +16,17 @@ import java.util.*
  */
 //T必须指明上界是Any且不为null，下面会用到反射获取对象实例，默认是Any?
 open class BaseDao<T : Any> : IBaseDao<T> {
+    private val TAG = "BaseDao"
 
     //数据库操作的引用
     private var sqLiteDatabase: SQLiteDatabase? = null
+
     //要操作的数据实体的引用
     private var entityClass: Class<T>? = null
+
     //要操作的数据表名称
     private var tableName: String? = null
+
     //记录数据表是否存在
     private var isInit = false
 
@@ -44,6 +49,8 @@ open class BaseDao<T : Any> : IBaseDao<T> {
 
             //执行Sql进行自动建表
             val createTableSql = getCreateTableSql()
+            Logger.d(TAG, "执行SQL：$createTableSql")
+
             sqLiteDatabase.execSQL(createTableSql)
 
             //初始化缓存空间
@@ -156,11 +163,11 @@ open class BaseDao<T : Any> : IBaseDao<T> {
         return if (sqLiteDatabase != null && sqLiteDatabase!!.isOpen) {
             //受影响行数
             sqLiteDatabase!!
-                .delete(
-                    tableName,
-                    condition.getWhereCause(),
-                    condition.getWhereArgs()
-                )
+                    .delete(
+                            tableName,
+                            condition.getWhereCause(),
+                            condition.getWhereArgs()
+                    )
         } else {
             -1
         }
@@ -175,12 +182,12 @@ open class BaseDao<T : Any> : IBaseDao<T> {
         return if (sqLiteDatabase != null && sqLiteDatabase!!.isOpen) {
             //受影响行数
             sqLiteDatabase!!
-                .update(
-                    tableName,
-                    getContentValuesForInsert(newEntity),
-                    condition.getWhereCause(),
-                    condition.getWhereArgs()
-                )
+                    .update(
+                            tableName,
+                            getContentValuesForInsert(newEntity),
+                            condition.getWhereCause(),
+                            condition.getWhereArgs()
+                    )
         } else {
             -1
         }
@@ -218,16 +225,16 @@ open class BaseDao<T : Any> : IBaseDao<T> {
             try {
                 //查询数据库
                 cursor = sqLiteDatabase!!
-                    .query(
-                        tableName,
-                        null,
-                        condition.getWhereCause(),
-                        condition.getWhereArgs(),
-                        null,
-                        null,
-                        orderBy,
-                        limitString
-                    )
+                        .query(
+                                tableName,
+                                null,
+                                condition.getWhereCause(),
+                                condition.getWhereArgs(),
+                                null,
+                                null,
+                                orderBy,
+                                limitString
+                        )
                 //将查到结果添加到返回集合中
                 result.addAll(getQueryResult(cursor, where))
             } catch (e: Exception) {