未订阅添加字段备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/SubscriptionNumber.java

@@ -12,6 +12,15 @@ public class SubscriptionNumber {
     private String type;//订阅号类别
     private String master;//订阅号所属账套
     private String username;//订阅号所属账号
+    private int removed;//是否被本地移除
+
+    public int getRemoved() {
+        return removed;
+    }
+
+    public void setRemoved(int removed) {
+        this.removed = removed;
+    }
 
     public String getUsername() {
         return username;

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

@@ -482,20 +482,21 @@ public class DBManager {
      * ************* 未订阅表AllSubs操作  ***************************************
      *************************************************************************/
     public void saveToAllSubs(SubscriptionNumber subscriptionNumber) {
-        String saveSql = "replace into AllSubs(subs_id,subs_title,subs_kind,subs_status,subs_type,subs_master,subs_username) values (?,?,?,?,?,?,?)";
+        String saveSql = "replace into AllSubs(subs_id,subs_title,subs_kind,subs_status,subs_type,subs_master,subs_username,subs_removed) values (?,?,?,?,?,?,?,?)";
         SQLiteStatement sqLiteStatement = db.compileStatement(saveSql);
-        sqLiteStatement.bindLong(1,subscriptionNumber.getId());
+        sqLiteStatement.bindLong(1, subscriptionNumber.getId());
         sqLiteStatement.bindString(2, subscriptionNumber.getTitle());
         sqLiteStatement.bindString(3, subscriptionNumber.getKind());
         sqLiteStatement.bindLong(4, subscriptionNumber.getStatus());
         sqLiteStatement.bindString(5, subscriptionNumber.getType());
         sqLiteStatement.bindString(6, subscriptionNumber.getMaster());
         sqLiteStatement.bindString(7, subscriptionNumber.getUsername());
+        sqLiteStatement.bindLong(8, subscriptionNumber.getRemoved());
         sqLiteStatement.execute();
     }
 
     public void saveListToAllSubs(List<SubscriptionNumber> subscriptionNumbers){
-        String saveSql = "replace into AllSubs(subs_id,subs_title,subs_kind,subs_status,subs_type,subs_master,subs_username) values (?,?,?,?,?,?,?)";
+        String saveSql = "replace into AllSubs(subs_id,subs_title,subs_kind,subs_status,subs_type,subs_master,subs_username,subs_removed) values (?,?,?,?,?,?,?,?)";
         SQLiteStatement sqLiteStatement = db.compileStatement(saveSql);
         for (int i = 0; i < subscriptionNumbers.size(); i++) {
             SubscriptionNumber subscriptionNumber = subscriptionNumbers.get(i);
@@ -506,6 +507,7 @@ public class DBManager {
             sqLiteStatement.bindString(5, subscriptionNumber.getType());
             sqLiteStatement.bindString(6, subscriptionNumber.getMaster());
             sqLiteStatement.bindString(7, subscriptionNumber.getUsername());
+            sqLiteStatement.bindLong(8, subscriptionNumber.getRemoved());
             sqLiteStatement.execute();
         }
     }
@@ -526,6 +528,7 @@ public class DBManager {
             subscriptionNumber.setType(cursor.getString(cursor.getColumnIndex("subs_type")));
             subscriptionNumber.setMaster(cursor.getString(cursor.getColumnIndex("subs_master")));
             subscriptionNumber.setUsername(cursor.getString(cursor.getColumnIndex("subs_username")));
+            subscriptionNumber.setRemoved(cursor.getInt(cursor.getColumnIndex("subs_removed")));
             subscriptionNumbers.add(subscriptionNumber);
         }
         cursor.close();
@@ -581,7 +584,7 @@ public class DBManager {
         sqLiteStatement.bindString(3, personalSubscriptionBean.getKIND());
         sqLiteStatement.bindString(4, personalSubscriptionBean.getTYPE());
         sqLiteStatement.bindLong(5, personalSubscriptionBean.getISAPPLED());
-        sqLiteStatement.bindString(6,personalSubscriptionBean.getMASTER());
+        sqLiteStatement.bindString(6, personalSubscriptionBean.getMASTER());
         sqLiteStatement.bindString(7,personalSubscriptionBean.getUSERNAME());
         sqLiteStatement.execute();
     }
@@ -596,7 +599,7 @@ public class DBManager {
             sqLiteStatement.bindString(3, personalSubscriptionBean.getKIND());
             sqLiteStatement.bindString(4, personalSubscriptionBean.getTYPE());
             sqLiteStatement.bindLong(5, personalSubscriptionBean.getISAPPLED());
-            sqLiteStatement.bindString(6,personalSubscriptionBean.getMASTER());
+            sqLiteStatement.bindString(6, personalSubscriptionBean.getMASTER());
             sqLiteStatement.bindString(7,personalSubscriptionBean.getUSERNAME());
             sqLiteStatement.execute();
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java

@@ -11,7 +11,6 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -289,12 +288,12 @@ public class SubscriptionAllFragment extends BaseFragment{
         try {
             List<SubscriptionNumber> dbSubscriptionNumbers
                     = mDbManager.queryFromAllSubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
-//            if (dbSubscriptionNumbers == null || dbSubscriptionNumbers.size() == 0) {
-            if (true) {
+            if (dbSubscriptionNumbers == null || dbSubscriptionNumbers.size() == 0) {
+//            if (true) {
                 sendAllSubscriptionRequest();
 //                Toast.makeText(getActivity(), "网络加载", Toast.LENGTH_SHORT).show();
             } else {
-                Toast.makeText(getActivity(), "本地加载", Toast.LENGTH_SHORT).show();
+//                Toast.makeText(getActivity(), "本地加载", Toast.LENGTH_SHORT).show();
                 if (keyStrings.size() == 0) {
                     mSubsTypeAdapter.notifyDataSetChanged();
                     initKeyStrings();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionMyFragment.java

@@ -105,12 +105,13 @@ public class SubscriptionMyFragment extends BaseFragment {
 
     @Override
     protected void initDatas() {
-        List<PersonalSubscriptionBean> dbPersonalSubscriptionBeans = mDbManager.queryFromMySubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
+//        List<PersonalSubscriptionBean> dbPersonalSubscriptionBeans = mDbManager.queryFromMySubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
 //        if (dbPersonalSubscriptionBeans == null || dbPersonalSubscriptionBeans.size() == 0){
         if (true){
 //            Toast.makeText(getActivity(), "网络加载", Toast.LENGTH_SHORT).show();
             sendSubscriptionRequest();
         }else {
+            List<PersonalSubscriptionBean> dbPersonalSubscriptionBeans = mDbManager.queryFromMySubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
             Toast.makeText(getActivity(), "本地加载", Toast.LENGTH_SHORT).show();
             mPersonalSubscriptionBeans.clear();
             mPersonalSubscriptionBeans.addAll(dbPersonalSubscriptionBeans);

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

@@ -93,7 +93,8 @@ public class Constants {
             + "subs_status integer,"
             + "subs_type varchar(50),"
             + "subs_master varchar(50),"
-            + "subs_username varchar(50)"
+            + "subs_username varchar(50),"
+            + "subs_removed integer"
             +")";
 
     //已订阅号表