release V503

解决数据库升级创建table脚本错误造成的功能异常。

diff --git a/app/release/ICSer_V502_2008181704_release.apk b/app/release/ICSer_V503_2008181921_release.apk
similarity index 79%
rename from app/release/ICSer_V502_2008181704_release.apk
rename to app/release/ICSer_V503_2008181921_release.apk
index 5cebee5..b087b88 100644 (file)
Binary files a/app/release/ICSer_V502_2008181704_release.apk and b/app/release/ICSer_V503_2008181921_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 8368a44..c64cfe5 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":502,"versionName":"2008181704","enabled":true,"outputFile":"ICSer_V502_2008181704_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V502_2008181704_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":503,"versionName":"2008181921","enabled":true,"outputFile":"ICSer_V503_2008181921_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V503_2008181921_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java b/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java
index d948d2c..06bbaa7 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java
@@ -8,7 +8,8 @@ import com.enqualcomm.support.utils.ICLogger;
 \r
 \r
 public class MySqlitOpenHelper extends SQLiteOpenHelper {\r
-  public MySqlitOpenHelper(Context paramContext) { super(paramContext, "data", null, 8); }\r
+  private static int dbVersion=9;\r
+  public MySqlitOpenHelper(Context paramContext) { super(paramContext, "data", null, dbVersion); }\r
   \r
   public void onCreate(SQLiteDatabase sqlite) {\r
     sqlite.execSQL("CREATE TABLE CONTACT(_id INTEGER PRIMARY KEY AUTOINCREMENT ,CATEGORY INTEGER ,NAME TEXT ,NUMBER TEXT ,ICON TEXT ,EXTRA TEXT)");\r
@@ -67,16 +68,16 @@ Pushtxt、message
   }\r
   \r
   public void onUpgrade(SQLiteDatabase sqlite, int oldDBversion, int newDBversion) {\r
-    if (oldDBversion <8) {\r
-      ICLogger.i("数据库升级 to 8 ");\r
+    if (oldDBversion <dbVersion) {\r
+      ICLogger.i("数据库升级 to "+dbVersion);\r
       sqlite.execSQL("DROP TABLE IF EXISTS MESSAGE");\r
       sqlite.execSQL("DROP TABLE IF EXISTS EVENT_MESSAGE");\r
       sqlite.execSQL("DROP TABLE IF EXISTS ANTIOFF");\r
       sqlite.execSQL("DROP TABLE IF EXISTS SLEEP_RECORDS");\r
       sqlite.execSQL("DROP TABLE IF EXISTS SLEEP_STATUS");\r
-      sqlite.execSQL("DROP TABLE IF EXISTS SLEEP_STATUS");\r
       sqlite.execSQL("DROP TABLE IF EXISTS SIT");\r
       sqlite.execSQL("DROP TABLE IF EXISTS ALARM_MSG_RECORDS");\r
+\r
     /*\r
 系统对话消息表，包含微聊，系统推送文本，上传图片，上传语音等一系列消息。\r
 Pushtxt、message\r
@@ -103,10 +104,10 @@ Pushtxt、message
 根据时间段进行检测，时间段内，根据翻滚次数确认其睡眠类型。如深度睡眠或者浅睡。\r
 2个数据库翻滚次数记录，当每日睡眠情况统计计算，检测时间段记在settings里，就不放在数据库了。\r
 */\r
-      /*每次打点的记录表*/\r
-      sqlite.execSQL("CREATE TABLE SLEEP_RECORDS(_id INTEGER PRIMARY KEY AUTOINCREMENT ,DATE TEXT, TIME TEXT ,ROLLTIMES INTEGER ,STATUS TEXT ,REM TEXT)");\r
+      /*每次打点的记录表  SLEEP_DATE 代表记录睡眠的日期，例如 22日上午7:00的计入到21日的睡眠记录中。 DATE代表记录的时间，此出应该等于上文的 22日 7:00 */\r
+      sqlite.execSQL("CREATE TABLE SLEEP_RECORDS(_id INTEGER PRIMARY KEY AUTOINCREMENT ,SLEEP_DATE TEXT,DATE TEXT, STEPCOUNT INTEGER ,ROLLTIMES INTEGER ,STATUS TEXT )");\r
       /*计算后的分值，每天会在睡眠结束后计算Records获得*/\r
-      sqlite.execSQL("CREATE TABLE SLEEP_STATUS(_id INTEGER PRIMARY KEY AUTOINCREMENT ,TIME TEXT , DEEP_SLEEP INTEGER , LIGHT_SLEEP INTEGER ,SCORE INTEGER )");\r
+      sqlite.execSQL("CREATE TABLE SLEEP_STATUS(_id INTEGER PRIMARY KEY AUTOINCREMENT , DATE TEXT , DEEP_SLEEP INTEGER , LIGHT_SLEEP INTEGER ,SCORE INTEGER )");\r
 \r
 /*久坐\r
 根据时间段进行检测，时间段内，根据计步变化确认其是否在坐着。\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 2349f1d..b2601e6 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Aug 18 17:04:17 CST 2020\r
-VERSION_CODE=502\r
+#Tue Aug 18 19:21:41 CST 2020\r
+VERSION_CODE=503\r