5.7.1 数据库用一个

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java

@@ -53,7 +53,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
             db.execSQL(Constants.TABLE_MISSION);//外勤计划
             db.execSQL(Constants.WORK_LOCATION);//
             db.execSQL(Constants.EM_ERPNEWS);//
-//            db.execSQL(Constants.CREATE_BANNER);//
+            db.execSQL(Constants.CREATE_BANNER);//
         } catch (Exception e) {
 
         }
@@ -91,7 +91,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
         db.execSQL("DROP TABLE IF EXISTS workdata");
         db.execSQL("DROP TABLE IF EXISTS work_location");
         db.execSQL("DROP TABLE IF EXISTS em_erpnews");
-//        db.execSQL("DROP TABLE IF EXISTS step");
+        db.execSQL("DROP TABLE IF EXISTS step");
     }
 
     /**

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java

@@ -166,11 +166,11 @@ public class Constants {
             + ")";
 
 
-//    //用于创建Banner表
-//    public static final String CREATE_BANNER = "create table step ("
-//            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
-//            + "curDate TEXT, "
-//            + "totalSteps TEXT)";
+    //用于创建Banner表
+    public static final String CREATE_BANNER = "create table step ("
+            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + "curDate TEXT, "
+            + "totalSteps TEXT)";
 
     //已订阅号表
     public static final String TABLE_MY_SUBSCRIPTION = "CREATE TABLE MySubs "

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/db/StepDBOpenHelper.java

@@ -5,9 +5,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
 /**
- * Created by fySpring
- * Date : 2017/1/16
- * To do :
+ * Created by FANGlh on 2017/4/13.
+ * function:
  */
 
 public class StepDBOpenHelper extends SQLiteOpenHelper {

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/db/StepDataDao.java

@@ -5,23 +5,22 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.newpedo.bean.StepEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Created by fySpring
- * Date : 2017/3/24
+ * Created by FANGLH
+ * Date : 2017/4/13
  * To do :
  */
 
 public class StepDataDao {
-    private StepDBOpenHelper stepHelper;
-    private SQLiteDatabase stepDb;
 
     public StepDataDao(Context context) {
-        stepHelper = new StepDBOpenHelper(context);
+
     }
 
     /**
@@ -30,14 +29,13 @@ public class StepDataDao {
      * @param stepEntity
      */
     public void addNewData(StepEntity stepEntity) {
-        stepDb = stepHelper.getReadableDatabase();
-
+        //TODO 获取db的方式统一使用这个，以后的方法里面使用到db的也用这个方式获取，不然有可能出现闪退
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
         ContentValues values = new ContentValues();
         values.put("curDate", stepEntity.getCurDate());
         values.put("totalSteps", stepEntity.getSteps());
         stepDb.insert("step", null, values);
-
-        stepDb.close();
+        DatabaseManager.getInstance().closeDatabase();
     }
 
     /**
@@ -47,7 +45,7 @@ public class StepDataDao {
      * @return
      */
     public StepEntity getCurDataByDate(String curDate) {
-        stepDb = stepHelper.getReadableDatabase();
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
         StepEntity stepEntity = null;
         Cursor cursor = stepDb.query("step", null, null, null, null, null, null);
         while (cursor.moveToNext()) {
@@ -60,8 +58,8 @@ public class StepDataDao {
             }
         }
         //关闭
-        stepDb.close();
         cursor.close();
+        DatabaseManager.getInstance().closeDatabase();
         return stepEntity;
     }
 
@@ -72,7 +70,7 @@ public class StepDataDao {
      */
     public List<StepEntity> getAllDatas() {
         List<StepEntity> dataList = new ArrayList<>();
-        stepDb = stepHelper.getReadableDatabase();
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
         Cursor cursor = stepDb.rawQuery("select * from step", null);
 
         while (cursor.moveToNext()) {
@@ -83,24 +81,25 @@ public class StepDataDao {
         }
 
         //关闭数据库
-        stepDb.close();
         cursor.close();
+        DatabaseManager.getInstance().closeDatabase();
         return dataList;
     }
 
     /**
      * 更新数据
+     *
      * @param stepEntity
      */
     public void updateCurData(StepEntity stepEntity) {
-        stepDb = stepHelper.getReadableDatabase();
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
 
         ContentValues values = new ContentValues();
-        values.put("curDate",stepEntity.getCurDate());
+        values.put("curDate", stepEntity.getCurDate());
         values.put("totalSteps", stepEntity.getSteps());
         stepDb.update("step", values, "curDate=?", new String[]{stepEntity.getCurDate()});
 
-        stepDb.close();
+        DatabaseManager.getInstance().closeDatabase();
     }
 
 
@@ -110,10 +109,10 @@ public class StepDataDao {
      * @param curDate
      */
     public void deleteCurData(String curDate) {
-        stepDb = stepHelper.getReadableDatabase();
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
 
         if (stepDb.isOpen())
             stepDb.delete("step", "curDate", new String[]{curDate});
-        stepDb.close();
+        DatabaseManager.getInstance().closeDatabase();
     }
 }