Merge branch 'MoneyNote3.0' of http://git.quyaqu.com/xieshengqi/MoneyMoreMoreNote into MoneyNote3.0

app/src/main/java/com/kuxuan/moneynote/ui/activitys/account/AccountPresenter.java

 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.kuxuan.moneynote.R;
+import com.kuxuan.moneynote.api.ExceptionHandle;
+import com.kuxuan.moneynote.api.MyObsever;
+import com.kuxuan.moneynote.api.RetrofitClient;
+import com.kuxuan.moneynote.db.CategoryDaoOperator;
+import com.kuxuan.moneynote.db.UpDataOperator;
+import com.kuxuan.moneynote.json.BeanNewJson;
 import com.kuxuan.moneynote.json.CategoryJson;
 import com.kuxuan.moneynote.json.CategoryList;
 import com.kuxuan.moneynote.json.netbody.BillBody;
+import com.kuxuan.moneynote.json.netbody.UpDataBody;
 import com.kuxuan.moneynote.listener.MVPListener;
 import com.kuxuan.moneynote.ui.activitys.category.CategoryActivity;
 import com.kuxuan.moneynote.ui.adapter.AccountAdapter;
+import com.kuxuan.moneynote.utils.LoginStatusUtil;
 import com.kuxuan.moneynote.utils.UIHelper;
+import com.kuxuan.sqlite.db.CategoryDB;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
 /**
  * @author HFRX hfrx1314@qq.com
  * @version 1.0.0
         mModel.addAccountForDB(new MVPListener<Object>() {
             @Override
             public void onSuccess(Object content) {
-                view.hideProgress();
-                view.finishActivity();
+
+                if (LoginStatusUtil.isLoginin()) {
+                    //同步一下
+                    syncForAdd();
+                } else {
+                    view.hideProgress();
+                    view.finishActivity();
+                }
             }
 
             @Override
             public void onFail(String msg) {
-                    view.hideProgress();
+                view.hideProgress();
                 view.showMsg(msg);
             }
         }, billBody, name);
     }
 
+    private void syncForUpdata(final BillBody billBody) {
+        if (LoginStatusUtil.isLoginin()) {
+            final CategoryDaoOperator categoryDaoOperator = CategoryDaoOperator.newInstance();
+            final ArrayList<CategoryDB> needUpdataJson = categoryDaoOperator.getNeedUpdataJson();
+            String json = UpDataOperator.getInstance().getJson(needUpdataJson);
+            RetrofitClient.getApiService().upData(new UpDataBody(0, json)).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BeanNewJson<Object>>() {
+                @Override
+                public void onError(ExceptionHandle.ResponeThrowable e) {
+                    view.hideProgress();
+                    view.setResultData(billBody);
+                }
+
+                @Override
+                public void onSuccess(BeanNewJson<Object> objectBeanNewJson) {
+                    //更新数据库
+                    for (CategoryDB categoryDB : needUpdataJson) {
+                        if (categoryDB.getStatus() == 1) {
+                            categoryDaoOperator.deleteData(categoryDB.getBill_id());
+                        } else {
+                            categoryDaoOperator.updataNoNeedSynce(categoryDB.getBill_id());
+                        }
+                    }
+                    view.hideProgress();
+                    view.setResultData(billBody);
+                }
+            });
+        }
+    }
+
+    private void syncForAdd() {
+        if (LoginStatusUtil.isLoginin()) {
+            final CategoryDaoOperator categoryDaoOperator = CategoryDaoOperator.newInstance();
+            final ArrayList<CategoryDB> needUpdataJson = categoryDaoOperator.getNeedUpdataJson();
+            String json = UpDataOperator.getInstance().getJson(needUpdataJson);
+            RetrofitClient.getApiService().upData(new UpDataBody(0, json)).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BeanNewJson<Object>>() {
+                @Override
+                public void onError(ExceptionHandle.ResponeThrowable e) {
+                    view.hideProgress();
+                    view.finishActivity();
+                }
+
+                @Override
+                public void onSuccess(BeanNewJson<Object> objectBeanNewJson) {
+                    //更新数据库
+                    for (CategoryDB categoryDB : needUpdataJson) {
+                        if (categoryDB.getStatus() == 1) {
+                            categoryDaoOperator.deleteData(categoryDB.getBill_id());
+                        } else {
+                            categoryDaoOperator.updataNoNeedSynce(categoryDB.getBill_id());
+                        }
+                    }
+                    view.hideProgress();
+                    view.finishActivity();
+                }
+            });
+        }
+    }
+
     @Override
     void uploadBill(final BillBody billBody, int online_OR_Offline, String name, String bill_id) {
 // TODO: 2018/4/3 需要做没有网络和有网络的处理
         mModel.uploadBillForDB(new MVPListener<Object>() {
             @Override
             public void onSuccess(Object content) {
-                view.hideProgress();
-                view.setResultData(billBody);
+                if (LoginStatusUtil.isLoginin()) {
+                    syncForUpdata(billBody);
+                } else {
+                    view.hideProgress();
+                    view.setResultData(billBody);
+                }
             }
 
             @Override

app/src/main/java/com/kuxuan/moneynote/ui/activitys/edit/EditBillActivity.java

 import android.widget.TextView;
 
 import com.kuxuan.moneynote.R;
+import com.kuxuan.moneynote.api.ExceptionHandle;
+import com.kuxuan.moneynote.api.MyObsever;
+import com.kuxuan.moneynote.api.RetrofitClient;
 import com.kuxuan.moneynote.base.BaseActivity;
 import com.kuxuan.moneynote.common.Constant;
 import com.kuxuan.moneynote.db.CategoryDaoOperator;
+import com.kuxuan.moneynote.db.UpDataOperator;
+import com.kuxuan.moneynote.json.BeanNewJson;
 import com.kuxuan.moneynote.json.TypeDataJson;
+import com.kuxuan.moneynote.json.netbody.UpDataBody;
 import com.kuxuan.moneynote.ui.activitys.account.AccountActivity;
 import com.kuxuan.moneynote.ui.activitys.eventbus.RefreshEvent;
 import com.kuxuan.moneynote.ui.weight.CustormDialog;
 import com.kuxuan.moneynote.utils.LoginStatusUtil;
 import com.kuxuan.moneynote.utils.TimeUtlis;
 import com.kuxuan.moneynote.utils.UIHelper;
+import com.kuxuan.sqlite.db.CategoryDB;
 import com.umeng.analytics.MobclickAgent;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.util.ArrayList;
+
 import butterknife.Bind;
 import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 编辑类别
 //            });
 //
 //        } else {
-        closeProgressDialog();
+
         //在没登录的状态下是真删，否则是假删
+        categoryDaoOperator.updataIsDelete(bill_db_id, true);
         if (LoginStatusUtil.isLoginin()) {
-            categoryDaoOperator.updataIsDelete(bill_db_id, true);
-
+            sync();
         } else {
             categoryDaoOperator.deleteData(bill_db_id);
+            EventBus.getDefault().post(new RefreshEvent());
+            closeProgressDialog();
+            finish();
         }
-        EventBus.getDefault().post(new RefreshEvent());
-        finish();
+
 //        }
     }
 
+    /**
+     * 同步数据
+     */
+    private void sync() {
+        if (LoginStatusUtil.isLoginin()) {
+            final CategoryDaoOperator categoryDaoOperator = CategoryDaoOperator.newInstance();
+            final ArrayList<CategoryDB> needUpdataJson = categoryDaoOperator.getNeedUpdataJson();
+            String json = UpDataOperator.getInstance().getJson(needUpdataJson);
+            RetrofitClient.getApiService().upData(new UpDataBody(0, json)).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BeanNewJson<Object>>() {
+                @Override
+                public void onError(ExceptionHandle.ResponeThrowable e) {
+                    categoryDaoOperator.updataIsDelete(bill_db_id, true);
+                    EventBus.getDefault().post(new RefreshEvent());
+                    closeProgressDialog();
+                    finish();
+                }
+
+                @Override
+                public void onSuccess(BeanNewJson<Object> objectBeanNewJson) {
+                    //更新数据库
+                    for (CategoryDB categoryDB : needUpdataJson) {
+                        if (categoryDB.getStatus() == 1) {
+                            categoryDaoOperator.deleteData(categoryDB.getBill_id());
+                        } else {
+                            categoryDaoOperator.updataNoNeedSynce(categoryDB.getBill_id());
+                        }
+                    }
+                    EventBus.getDefault().post(new RefreshEvent());
+                    closeProgressDialog();
+                    finish();
+                }
+            });
+        }
+    }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {

app/src/main/java/com/kuxuan/moneynote/ui/adapter/ReportAdapter.java

                     item.setOutmoney((long) Float.parseFloat(typeDataJson.getAccount()));
                     data = JavaFormatUtils.getData(item.getOutmoney() / item.getAllMoney() * 100);
                     helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount()))+ "");
-                    helper.progressBar.setProgress((int) (item.getOutmoney() * 100 / item.getAllMoney()));
+                    helper.progressBar.setProgress(Math.round(item.getOutmoney() * 100 / item.getAllMoney()));
                     break;
                 case 1:
                     item.setInmoney((long) Float.parseFloat(typeDataJson.getAccount()));
                     data = JavaFormatUtils.getData(item.getInmoney() / item.getAllMoney() * 100);
 //                    JavaFormatUtils.formatFloatNumber(Float.parseFloat(typeDataJson.getAccount())
                     helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount()))+ "");
-                    helper.progressBar.setProgress((int) (item.getInmoney() * 100 / item.getAllMoney()));
+                    helper.progressBar.setProgress(Math.round(item.getInmoney() * 100 / item.getAllMoney()));
                     break;
             }
                 helper.name_text.setText(typeDataJson.getName() + "  " + data + "%");
                     float f = item.getOutmoney() / item.getAllMoney();
                     data = JavaFormatUtils.getData(f * 100);
                     helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount())) + "");
-                    helper.progressBar.setProgress((int) (item.getOutmoney() * 100 / item.getAllMoney()));
+                    helper.progressBar.setProgress(Math.round(item.getOutmoney() * 100 / item.getAllMoney()));
                     break;
                 case 1:
                     item.setInmoney((long)Float.parseFloat(typeDataJson.getAccount()));
                     data = JavaFormatUtils.getData(item.getInmoney() / item.getAllMoney() * 100);
                     helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount()))+ "");
-                    helper.progressBar.setProgress((int) (item.getInmoney() * 100 / item.getAllMoney()));
+                    helper.progressBar.setProgress(Math.round(item.getInmoney() * 100 / item.getAllMoney()));
                     break;
             }
             String day = typeDataJson.getDay();

app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialPresent.java

         if (isLogin) {
             //获取数据
             view.showLogin();
-
         } else {
             view.showNoLogin();
         }

app/src/main/java/com/kuxuan/moneynote/ui/fragments/reportsingle/ReportSingleDBOpertor.java

      * @return
      */
     public ArrayList<NewChartData> getWeekTabData(HashMap<String, Integer> maps, int type) {
-        if(maps==null){
+        if (maps == null) {
             return null;
         }
         int startYear = maps.get("startYear");
      * @param categoryDaoOperator
      * @return
      */
-    public NewCategoryJson getWeekNewCategoryJson(ArrayList<String> datasLists, CategoryDaoOperator categoryDaoOperator, int category_id,int type) {
+    public NewCategoryJson getWeekNewCategoryJson(ArrayList<String> datasLists, CategoryDaoOperator categoryDaoOperator, int category_id, int type) {
         NewCategoryJson newCategoryJson = new NewCategoryJson();
         ArrayList<TypeDataJson> typeDataJsonLists = new ArrayList<>();
         ArrayList<TimeDataJson> timeDataJsonsLists = new ArrayList<>();
             int year = Integer.parseInt(split[0]);
             int month = Integer.parseInt(split[1]);
             int day = Integer.parseInt(split[2]);
-            ArrayList<CategoryDB> weekData = categoryDaoOperator.getWeekData(year, month, day, type,category_id);
+            ArrayList<CategoryDB> weekData = categoryDaoOperator.getWeekData(year, month, day, type, category_id);
             if (category_id != -1) {
                 detialDataLists.addAll(changJson(weekData, category_id));
             } else {
                 account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
-            newCategoryJson.setCategory(typeDataJsonLists);
+            newCategoryJson.setCategory(categLists);
         } else {
             double account = 0;
             for (TypeDataJson typeDataJson : detialDataLists) {
      * @param categoryDaoOperator
      * @return
      */
-    public NewCategoryJson getMonthNewCategoryJson(int year, int month, CategoryDaoOperator categoryDaoOperator,int type, int category_id) {
+    public NewCategoryJson getMonthNewCategoryJson(int year, int month, CategoryDaoOperator categoryDaoOperator, int type, int category_id) {
 
         NewCategoryJson newCategoryJson = new NewCategoryJson();
         ArrayList<TypeDataJson> typeDataJsonLists = new ArrayList<>();
         ArrayList<TimeDataJson> timeDataJsonsLists = new ArrayList<>();
         ArrayList<TypeDataJson> detialDataLists = new ArrayList<>();
-        ArrayList<CategoryDB> weekData = categoryDaoOperator.getMonthData(year, month, type,category_id);
+        ArrayList<CategoryDB> weekData = categoryDaoOperator.getMonthData(year, month, type, category_id);
         if (category_id == -1)
             typeDataJsonLists.addAll(changJson(weekData));
         else
             detialDataLists.addAll(changJson(weekData, category_id));
         int monthDay = CalanderUtil.getMonthDay(year, month);
         for (int i = 1; i <= monthDay; i++) {
-            TimeDataJson timeDataJson = getMonthTimeDataJson(year, month, i, categoryDaoOperator, category_id,type);
+            TimeDataJson timeDataJson = getMonthTimeDataJson(year, month, i, categoryDaoOperator, category_id, type);
             if (timeDataJson != null) {
                 timeDataJsonsLists.add(timeDataJson);
             }
                 account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
-            newCategoryJson.setCategory(typeDataJsonLists);
+            newCategoryJson.setCategory(categLists);
         } else {
             double account = 0;
             for (TypeDataJson typeDataJson : detialDataLists) {
      * @param categoryDaoOperator
      * @return
      */
-    public NewCategoryJson getYearNewCategoryJson(int year, CategoryDaoOperator categoryDaoOperator,int type, int category_id) {
+    public NewCategoryJson getYearNewCategoryJson(int year, CategoryDaoOperator categoryDaoOperator, int type, int category_id) {
         NewCategoryJson newCategoryJson = new NewCategoryJson();
         ArrayList<TypeDataJson> typeDataJsonLists = new ArrayList<>();
         ArrayList<TypeDataJson> detialDataLists = new ArrayList<>();
         ArrayList<TimeDataJson> timeDataJsonsLists = new ArrayList<>();
-        ArrayList<CategoryDB> weekData = categoryDaoOperator.getYearData(year,type, category_id);
+        ArrayList<CategoryDB> weekData = categoryDaoOperator.getYearData(year, type, category_id);
         if (category_id == -1)
             typeDataJsonLists.addAll(changJson(weekData));
         else
             detialDataLists.addAll(changJson(weekData, category_id));
         for (int i = 1; i <= 12; i++) {
-            TimeDataJson timeDataJson = getYearTimeDataJson(year, i, categoryDaoOperator, type,category_id);
+            TimeDataJson timeDataJson = getYearTimeDataJson(year, i, categoryDaoOperator, type, category_id);
             if (timeDataJson != null) {
                 timeDataJsonsLists.add(timeDataJson);
             }
                 account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
-            newCategoryJson.setCategory(typeDataJsonLists);
+            newCategoryJson.setCategory(categLists);
         } else {
             double account = 0;
             for (TypeDataJson typeDataJson : detialDataLists) {
      * @param day
      * @return
      */
-    private TimeDataJson getMonthTimeDataJson(int year, int month, int day, CategoryDaoOperator categoryDaoOperator, int category_id,int type) {
+    private TimeDataJson getMonthTimeDataJson(int year, int month, int day, CategoryDaoOperator categoryDaoOperator, int category_id, int type) {
         TimeDataJson timeDataJson = new TimeDataJson();
         timeDataJson.setDay(String.format("%02d", day) + "");
         ArrayList<PopCharData> data = new ArrayList<>();
-        ArrayList<CategoryDB> weekData = categoryDaoOperator.getWeekData(year, month, day, type,category_id);
+        ArrayList<CategoryDB> weekData = categoryDaoOperator.getWeekData(year, month, day, type, category_id);
         for (int i = 0; i < weekData.size(); i++) {
             PopCharData typeDataJson = new PopCharData();
             typeDataJson.setCategory_id(weekData.get(i).getCategory_id());
      * @param categoryDaoOperator
      * @return
      */
-    private TimeDataJson getYearTimeDataJson(int year, int month, CategoryDaoOperator categoryDaoOperator, int type,int category_id) {
+    private TimeDataJson getYearTimeDataJson(int year, int month, CategoryDaoOperator categoryDaoOperator, int type, int category_id) {
         TimeDataJson timeDataJson = new TimeDataJson();
         timeDataJson.setDay(String.format("%02d", month) + "");
         ArrayList<PopCharData> data = new ArrayList<>();
-        ArrayList<CategoryDB> monthData = categoryDaoOperator.getMonthData(year, month,type, category_id);
+        ArrayList<CategoryDB> monthData = categoryDaoOperator.getMonthData(year, month, type, category_id);
         for (int i = 0; i < monthData.size(); i++) {
             PopCharData typeDataJson = new PopCharData();
             typeDataJson.setCategory_id(monthData.get(i).getCategory_id());
                         t = new TypeDataJson();
                         t.setName(typeDataJson.getName());
                         t.setCategory_id(typeDataJson.getCategory_id());
+                        t.setDetail_icon(typeDataJson.getDetail_icon());
+                        t.setSmall_icon(typeDataJson.getSmall_icon());
                         t.setAccount(typeDataJson.getAccount());
                         t.setType(typeDataJson.getType());
                     } else {
     }
 
     /**
+     * 数据归类(最外层的数据)
+     *
+     * @param list
+     * @return
+     */
+    private ArrayList<TypeDataJson> changJsonNoDetial(ArrayList<CategoryDB> list) {
+        ArrayList<TypeDataJson> datas = new ArrayList<>();
+        ArrayList<String> idLists = new ArrayList<>();
+
+        for (int i = 0; i < list.size(); i++) {
+            if (!isInLists(list.get(i).getCategory_id() + "", idLists)) {
+                idLists.add(list.get(i).getCategory_id() + "");
+            }
+        }
+//        for (int i = 0; i < list.size(); i++) {
+//            TypeDataJson typeDataJson = new TypeDataJson();
+//            typeDataJson.setBill_id(list.get(i).getBill_id());
+//            typeDataJson.setCategory_id(list.get(i).getCategory_id());
+//            typeDataJson.setType(list.get(i).getType());
+//            typeDataJson.setDetail_icon(list.get(i).getImage_path());
+//            typeDataJson.setSmall_icon(list.get(i).getImage_path());
+//            typeDataJson.setName(list.get(i).getName());
+//            typeDataJson.setAccount(list.get(i).getAccount() + "");
+//            datas.add(typeDataJson);
+//        }
+
+        for (int i = 0; i < idLists.size(); i++) {
+            TypeDataJson typeDataJson = new TypeDataJson();
+            typeDataJson.setBill_id(list.get(i).getBill_id());
+            typeDataJson.setCategory_id(list.get(i).getCategory_id());
+            typeDataJson.setType(list.get(i).getType());
+            typeDataJson.setDetail_icon(list.get(i).getImage_path());
+            typeDataJson.setSmall_icon(list.get(i).getImage_path());
+            typeDataJson.setName(list.get(i).getName());
+            double account = 0;
+            for (CategoryDB categoryDB : list) {
+                if (String.valueOf(categoryDB.getCategory_id()).equals(idLists.get(i))) {
+                    account += categoryDB.getAccount();
+                }
+            }
+            typeDataJson.setAccount(account + "");
+        }
+        return datas;
+    }
+
+
+    private boolean isInLists(String id, ArrayList<String> lists) {
+        boolean isIn = false;
+        for (String i : lists) {
+            if (i.equals(id)) {
+                isIn = true;
+                break;
+            }
+        }
+        return isIn;
+    }
+
+
+    /**
      * 详情页本地数据转化
      *
      * @param list
         ArrayList<TypeDataJson> datas = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             TypeDataJson typeDataJson = new TypeDataJson();
-            typeDataJson.setBill_id( list.get(i).getBill_id());
+            typeDataJson.setBill_id(list.get(i).getBill_id());
             typeDataJson.setDetail_icon(list.get(i).getImage_path());
             typeDataJson.setSmall_icon(list.get(i).getImage_path());
             typeDataJson.setDay(list.get(i).getYear() + "-" + String.format("%02d", list.get(i).getMonth()) + "-" + String.format("%02d", list.get(i).getDay()));

app/src/main/java/com/kuxuan/moneynote/utils/CalanderUtil.java

         ArrayList<String> data = new ArrayList<String>();
         Calendar cal = getCalendarFormYear(startYear);
         cal.set(Calendar.WEEK_OF_YEAR, week);
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
         int year = cal.get(Calendar.YEAR);
         int month = (cal.get(Calendar.MONTH) + 1);
         int day = cal.get(Calendar.DAY_OF_MONTH);