From: snickersun <scy@incartech.cn>
Date: Tue, 18 Aug 2020 11:22:39 +0000 (+0800)
Subject: release V503
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=a2bc33b785a186c41ffb5af4f4e41fdfa3e5d399;p=protocol_srv.git

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