数据库修改备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/DatabaseManager.java

@@ -3,6 +3,8 @@ package com.xzjmyk.pm.activity.db;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
+import com.xzjmyk.pm.activity.ui.erp.db.DBOpenHelper;
+
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class DatabaseManager {
@@ -22,8 +24,7 @@ public class DatabaseManager {
 
     public static synchronized DatabaseManager getInstance() {
         if (instance == null) {
-            throw new IllegalStateException(DatabaseManager.class.getSimpleName() +
-                    " is not initialized, call initializeInstance(..) method first.");
+            initializeInstance(DBOpenHelper.getInstance());
         }
         return instance;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkActivity.java

@@ -82,7 +82,6 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
     private long selectTime;
     private boolean isAdmin = false;
     private boolean isChangePoi = false;
-
     private BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {

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

@@ -9,6 +9,7 @@ import android.util.Log;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.PersonalSubscriptionBean;
 import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
+import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.B2BMsg;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
@@ -26,7 +27,6 @@ import java.util.Map;
  * @注释:数据库管理类
  */
 public class DBManager {
-    private DBOpenHelper helper;
 
     public SQLiteDatabase getDb() {
         return db;
@@ -38,10 +38,12 @@ public class DBManager {
 
     private SQLiteDatabase db;
 
-
+    public DBManager() {
+        db = DatabaseManager.getInstance().openDatabase();
+    }
+    @Deprecated
     public DBManager(Context ct) {
-        helper = DBOpenHelper.getInstance();
-        db = helper.getWritableDatabase();
+        this();
     }
 
     public void saveB2bMsg(B2BMsg entity) {
@@ -481,7 +483,7 @@ public class DBManager {
         Cursor cursor = null;
         try {
             if (!db.isOpen())
-                db = helper.getWritableDatabase();
+                db = DatabaseManager.getInstance().openDatabase();
             cursor = db.query(table, null, selection, selectionArgs, groupBy, having, orderBy);
             while (cursor.moveToNext()) {
                 EmployeesEntity model = new EmployeesEntity();
@@ -524,7 +526,7 @@ public class DBManager {
         try {
             String master = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master");
             if (!db.isOpen())
-                db = helper.getWritableDatabase();
+                db = DatabaseManager.getInstance().openDatabase();
             String sql = "SELECT * FROM EMPLOYEES WHERE WHICHSYS=\'" + master + "\' AND EM_DEFAULTORID IN(" + defaulid + ") ";
             Cursor cursor = db.rawQuery(sql, null);
             count = cursor.getCount();
@@ -798,6 +800,6 @@ public class DBManager {
      * close database
      */
     public void closeDB() {
-        db.close();
+        DatabaseManager.getInstance().closeDatabase();
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -48,7 +48,6 @@ import static com.xzjmyk.pm.activity.util.BaiduMapUtil.getInstence;
  * 班次的管理器,先不处理数据库数据
  * Created by Bitliker on 2016/12/12.
  */
-
 public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresenter {
     private final int WORK_LOG = 0x12;
     private final int WORK_DATA = 0x11;