app/src/main/java/com/kuxuan/moneynote/db/CategoryDaoOperator.java

@@ -2,9 +2,11 @@ package com.kuxuan.moneynote.db;
 
 import com.kuxuan.moneynote.MyApplication;
 import com.kuxuan.moneynote.common.Constant;
+import com.kuxuan.moneynote.json.BillJsonList;
 import com.kuxuan.moneynote.json.TimeJson;
 import com.kuxuan.moneynote.utils.LoginStatusUtil;
 import com.kuxuan.moneynote.utils.SPUtil;
+import com.kuxuan.moneynote.utils.TextSetUtil;
 import com.kuxuan.moneynote.utils.TimeUtlis;
 import com.kuxuan.sqlite.dao.CategoryDBDao;
 import com.kuxuan.sqlite.db.CategoryDB;
@@ -312,7 +314,28 @@ public class CategoryDaoOperator {
 
 
     /**
-     * 获取一个月的数据
+     * 获取某年某月支出或者收入的数据
+     * @param year
+     * @param month
+     * @param type
+     * @return
+     */
+    public ArrayList<CategoryDB> getMonthData(int year,int month,int type){
+
+        CategoryDBDao categoryDBDao = DbManager.getInstance().getmDaoSession().getCategoryDBDao();
+        ArrayList<CategoryDB> list = null;
+
+        try {
+            list = (ArrayList<CategoryDB>) categoryDBDao.queryBuilder().where(CategoryDBDao.Properties.Year.eq(year),CategoryDBDao.Properties.Month.eq(month),CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.User_id.eq(LoginStatusUtil.getLoginUserId())).list();
+        } catch (Exception e) {
+        }
+
+        return list;
+    }
+
+
+    /**
+     * 获取某个类别的一个月的数据
      *
      * @param year
      * @param month
@@ -330,6 +353,76 @@ public class CategoryDaoOperator {
         return (ArrayList<CategoryDB>) list;
     }
 
+    public BillJsonList getMonthData(int year,int month){
+
+        BillJsonList billJsonList = null;
+
+        CategoryDaoOperator categoryDaoOperator  = CategoryDaoOperator.newInstance();
+
+        //收入 type ==1
+        ArrayList<CategoryDB> categoryDBArrayList_Income = categoryDaoOperator.getMonthData(year,month,1);
+
+        double income = 0;
+
+        for (int i =0 ;i < categoryDBArrayList_Income.size();i++){
+
+            income = income + categoryDBArrayList_Income.get(i).getAccount();
+
+        }
+
+        ArrayList<CategoryDB> categoryDBArrayList_expenditure = categoryDaoOperator.getMonthData(year,month,2);
+
+        double expenditure = 0;
+
+        for (int i =0 ;i < categoryDBArrayList_expenditure.size();i++){
+
+            expenditure = expenditure + categoryDBArrayList_expenditure.get(i).getAccount();
+
+        }
+
+        double surplus = 0;
+
+        surplus = income - expenditure;
+
+
+        String incomeStr = TextSetUtil.formatFloatNumber(income);
+        String expenditureStr = TextSetUtil.formatFloatNumber(expenditure);
+        String surplusStr = TextSetUtil.formatFloatNumber(surplus);
+
+
+        return new BillJsonList(incomeStr,expenditureStr,surplusStr,month+"");
+    }
+
+
+    /**
+     * 获取某年的支出或者收入的数据
+     * @param year
+     * @param type
+     * @return
+     */
+    public ArrayList<CategoryDB> getYearData(int year,int type){
+
+        CategoryDBDao categoryDBDao = DbManager.getInstance().getmDaoSession().getCategoryDBDao();
+
+        ArrayList<CategoryDB> list = null;
+
+        try{
+          list = (ArrayList<CategoryDB>) categoryDBDao.queryBuilder().where(CategoryDBDao.Properties.Year.eq(year),CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.User_id.eq(LoginStatusUtil.getLoginUserId())).list();
+        }catch (Exception e){
+
+        }
+
+        return list;
+    }
+
+
+    /**
+     * 获取某个类别的一年月的数据
+     * @param year
+     * @param type
+     * @param category_id
+     * @return
+     */
     public ArrayList<CategoryDB> getYearData(int year, int type, int category_id) {
         CategoryDBDao categoryDBDao = DbManager.getInstance().getmDaoSession().getCategoryDBDao();
         List<CategoryDB> list = null;

app/src/main/java/com/kuxuan/moneynote/json/BillJsonList.java

@@ -21,6 +21,9 @@ public class BillJsonList {
         this.month = month;
     }
 
+    public BillJsonList(){}
+
+
     public String getIncome() {
         return income;
     }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/bill/BillActivity.java

@@ -36,6 +36,7 @@ public class BillActivity extends MVPFragmentActivity<BillPresenter, BillModel>
     TextView mPayText;
     Calendar cal;
     int year;
+    private int finalyear;
     private static final String TAG = "BillActivity";
     @Override
     public void showProgress() {
@@ -63,7 +64,7 @@ public class BillActivity extends MVPFragmentActivity<BillPresenter, BillModel>
         TextSetUtil.setTextForMoey("0",mPayText);
         cal = Calendar.getInstance();
         year = cal.get(Calendar.YEAR);
-
+        finalyear = cal.get(Calendar.YEAR);
         final Drawable drawable = ContextCompat.getDrawable(this,R.mipmap.pull_down_selector_normal);
         //设置title
         getTitleView(1).setTitle(getResources().getString(R.string.bill)).
@@ -102,10 +103,11 @@ public class BillActivity extends MVPFragmentActivity<BillPresenter, BillModel>
                         PickerUtil.onYearPicker(BillActivity.this, new NumberPicker.OnNumberPickListener() {
                             @Override
                             public void onNumberPicked(int i, Number number) {
-                                if (number.intValue()<=year) {
-                                    mPresenter.getBillData(number.intValue());
+                                if (number.intValue()<=finalyear) {
+//                                    mPresenter.getBillData(number.intValue());
                                     getTitleView(1).setRight_text(number.intValue()+"");
                                     year = number.intValue();
+                                    setOfflineBillData();
                                 }else{
                                     Toast.makeText(BillActivity.this, "您选择的年不能大于当前年", Toast.LENGTH_SHORT).show();
                                 }
@@ -113,9 +115,15 @@ public class BillActivity extends MVPFragmentActivity<BillPresenter, BillModel>
                         },year);
                     }
                 });
-        mPresenter.getBillData(year);
+//        mPresenter.getBillData(year);
         mPresenter.initRecyclerView(this, mRecyclerView);
+        setOfflineBillData();
+
+    }
+
+    private void setOfflineBillData() {
 
+        mPresenter.getOfflineData(year);
 
     }
 

app/src/main/java/com/kuxuan/moneynote/ui/activitys/bill/BillContract.java

@@ -48,6 +48,8 @@ public interface BillContract {
         abstract void addData(Time time);
         abstract void getBillData(int year);
 
+        abstract void getOfflineData(int year);
+
     }
 
 }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/bill/BillPresenter.java

@@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 
 import com.kuxuan.moneynote.R;
+import com.kuxuan.moneynote.db.CategoryDaoOperator;
 import com.kuxuan.moneynote.json.BillJson;
 import com.kuxuan.moneynote.json.BillJsonList;
 import com.kuxuan.moneynote.json.Time;
@@ -81,4 +82,31 @@ public class BillPresenter extends BillContract.BillPresent {
             }
         },String.valueOf(year));
     }
+
+    @Override
+    void getOfflineData(int year) {
+
+        Calendar cal = Calendar.getInstance();
+        int Current_year = cal.get(Calendar.YEAR);
+        int Current_month = cal.get(Calendar.MONTH)+1;
+
+        int monthCount = 12;
+
+        if(year == Current_year){
+            monthCount = Current_month;
+        }
+
+        CategoryDaoOperator categoryDaoOperator  = CategoryDaoOperator.newInstance();
+
+        List<BillJsonList> billJsonLists=new ArrayList<>();
+
+        for (int i=1;i<=monthCount;i++){
+
+            BillJsonList billJsonList = categoryDaoOperator.getMonthData(year,i);
+            billJsonLists.add(billJsonList);
+
+        }
+        mAdapter.setNewData(billJsonLists);
+
+    }
 }

app/src/main/java/com/kuxuan/moneynote/ui/fragments/mine/MineFragment.java

@@ -11,6 +11,7 @@ import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.base.BaseFragmentActivity;
 import com.kuxuan.moneynote.base.mvpbase.MVPFragment;
 import com.kuxuan.moneynote.common.Constant;
+import com.kuxuan.moneynote.db.CategoryDaoOperator;
 import com.kuxuan.moneynote.json.BillJson;
 import com.kuxuan.moneynote.json.HeadImg;
 import com.kuxuan.moneynote.json.MineJson;
@@ -30,6 +31,7 @@ import com.kuxuan.moneynote.utils.LoginStatusUtil;
 import com.kuxuan.moneynote.utils.SPUtil;
 import com.kuxuan.moneynote.utils.TextSetUtil;
 import com.kuxuan.moneynote.utils.UIHelper;
+import com.kuxuan.sqlite.db.CategoryDB;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
@@ -45,6 +47,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.Calendar;
 
 import butterknife.Bind;
@@ -198,7 +201,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         TextSetUtil.setTextForMonth(month, monthTv);
         if(LoginStatusUtil.isLoginin()){
             mPresenter.getMineData();
-            mPresenter.getMineBill(year);
+//            mPresenter.getMineBill(year);
         }
         mShareAction = new ShareAction(getActivity()).setDisplayList(
                 SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE).setShareboardclickCallback(new ShareBoardlistener() {
@@ -214,9 +217,52 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
             }
         });
 
-        TextSetUtil.setTextForMoey("0.00", incomeText, 16, 12);
-        TextSetUtil.setTextForMoey("0.00", payText, 16, 12);
-        TextSetUtil.setTextForMoey("0.00", balanceText, 16, 12);
+//        TextSetUtil.setTextForMoey("0.00", incomeText, 16, 12);
+//        TextSetUtil.setTextForMoey("0.00", payText, 16, 12);
+//        TextSetUtil.setTextForMoey("0.00", balanceText, 16, 12);
+
+        setBillData();
+
+
+    }
+
+    private void setBillData() {
+
+       CategoryDaoOperator categoryDaoOperator  = CategoryDaoOperator.newInstance();
+
+       //收入 type ==1
+        ArrayList<CategoryDB> categoryDBArrayList_Income = categoryDaoOperator.getMonthData(Integer.parseInt(year),Integer.parseInt(month),1);
+
+        double income = 0;
+
+        for (int i =0 ;i < categoryDBArrayList_Income.size();i++){
+
+            income = income + categoryDBArrayList_Income.get(i).getAccount();
+
+        }
+
+
+        ArrayList<CategoryDB> categoryDBArrayList_expenditure = categoryDaoOperator.getMonthData(Integer.parseInt(year),Integer.parseInt(month),2);
+
+        double expenditure = 0;
+
+        for (int i =0 ;i < categoryDBArrayList_expenditure.size();i++){
+
+            expenditure = expenditure + categoryDBArrayList_expenditure.get(i).getAccount();
+
+        }
+
+        double surplus = 0;
+
+        surplus = income - expenditure;
+
+        String incomeStr = TextSetUtil.formatFloatNumber(income);
+        String expenditureStr = TextSetUtil.formatFloatNumber(expenditure);
+        String surplusStr = TextSetUtil.formatFloatNumber(surplus);
+
+        TextSetUtil.setTextForMoey(incomeStr, incomeText, 16, 12);
+        TextSetUtil.setTextForMoey(expenditureStr, payText, 16, 12);
+        TextSetUtil.setTextForMoey(surplusStr, balanceText, 16, 12);
 
     }
 
@@ -254,7 +300,8 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         if(LoginStatusUtil.isLoginin()){
             newUser = loginEvent.isNewUser();
             mPresenter.getMineData();
-            mPresenter.getMineBill(year);
+//            mPresenter.getMineBill(year);
+            setBillData();
         }
 
     }
@@ -286,13 +333,16 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
     public void onMessageEvent(RefreshEvent loginEvent) {
 
         mPresenter.getMineData();
-        mPresenter.getMineBill(year);
+//        mPresenter.getMineBill(year);
+
+        setBillData();
+
     }
 
 
 
     /**
-     * add账单之后刷新数据
+     * 退出
      *
      * @param loginOutEvent
      */
@@ -304,9 +354,9 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
             if(mNameText!=null){
                 mNameText.setText("未登录");
                 mPortraitImage.setImageResource(R.drawable.im_portrait);
-                TextSetUtil.setTextForMoey("0.00", incomeText, 16, 12);
-                TextSetUtil.setTextForMoey("0.00 ", payText, 16, 12);
-                TextSetUtil.setTextForMoey("0.00", balanceText, 16, 12);
+//                TextSetUtil.setTextForMoey("0.00", incomeText, 16, 12);
+//                TextSetUtil.setTextForMoey("0.00 ", payText, 16, 12);
+//                TextSetUtil.setTextForMoey("0.00", balanceText, 16, 12);
             }
 
         }
@@ -389,10 +439,9 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
             }
         }
 
-
-        TextSetUtil.setTextForMoey("0.00", incomeText, 16, 12);
-        TextSetUtil.setTextForMoey("0.00 ", payText, 16, 12);
-        TextSetUtil.setTextForMoey("0.00", balanceText, 16, 12);
+//        TextSetUtil.setTextForMoey("0.00", incomeText, 16, 12);
+//        TextSetUtil.setTextForMoey("0.00 ", payText, 16, 12);
+//        TextSetUtil.setTextForMoey("0.00", balanceText, 16, 12);
 
 
     }
@@ -403,9 +452,9 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
             if(mNameText!=null){
                 mNameText.setText("未登录");
                 mPortraitImage.setImageResource(R.drawable.im_portrait);
-                TextSetUtil.setTextForMoey("0.00", incomeText, 16, 12);
-                TextSetUtil.setTextForMoey("0.00 ", payText, 16, 12);
-                TextSetUtil.setTextForMoey("0.00", balanceText, 16, 12);
+//                TextSetUtil.setTextForMoey("0.00", incomeText, 16, 12);
+//                TextSetUtil.setTextForMoey("0.00 ", payText, 16, 12);
+//                TextSetUtil.setTextForMoey("0.00", balanceText, 16, 12);
             }
 
         }

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

@@ -69,9 +69,9 @@ public class TextSetUtil {
      */
     public static void setTextForMoey(String text, TextView textView,int s1,int s2) {
         String[] split = null;
-        String replace = text.replace("-", "");
+//        String replace = text.replace("-", "");
         try {
-            split = replace.split("\\.");
+            split = text.split("\\.");
             TextParser textParser = new TextParser();
             textParser.append(split[0], DisplayUtil.dip2px(s1), Color.BLACK);
             textParser.append("." + split[1], DisplayUtil.dip2px(s2), Color.parseColor("#262626"));
@@ -86,4 +86,21 @@ public class TextSetUtil {
             textParser.parse(textView);
         }
     }
+
+
+    /**
+     * 当浮点型数据位数超过10位之后，数据变成科学计数法显示。用此方法可以使其正常显示。
+     * @param value
+     * @return Sting
+     */
+    public static String formatFloatNumber(double value) {
+        if(value != 0.00){
+            java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
+            return df.format(value);
+        }else{
+            return "0.00";
+        }
+
+    }
+
 }

app/src/main/res/layout/activity_bill.xml

@@ -19,7 +19,6 @@
        android:ellipsize="end"
        android:maxLines="1"
        android:layout_height="wrap_content"
-       android:text="11111.0000"
        />
 
     <LinearLayout
@@ -46,7 +45,6 @@
             android:id="@+id/income_text"
             android:ellipsize="end"
             android:maxLines="1"
-            android:text="5000.00"
             />
         </LinearLayout>
         <View
@@ -73,7 +71,6 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:layout_height="wrap_content"
-            android:text="7710.00"
             />
      </LinearLayout>
     </LinearLayout>