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

@@ -208,6 +208,8 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
         if (numNumber != null) {
             num.setText(numNumber);
             keybord.setNumText(numNumber);
+            keybord.setShowNumText(numNumber);
+            keybord.setCompleteNumtext(numNumber);
         }
         //编辑页跳转过来用到
         isEdit = intent.getBooleanExtra(ISEDIT, false);
@@ -448,6 +450,7 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
 
     @Override
     public void complete() {
+
         if (COMPLETE.equals(mResult.getText())) {
             if (isEdit) {
                 if (category_id.equals("0")) {

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

@@ -12,11 +12,13 @@ import android.widget.Toast;
 import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.base.mvpbase.MVPFragmentActivity;
 import com.kuxuan.moneynote.json.BillJson;
+import com.kuxuan.moneynote.json.BillJsonList;
 import com.kuxuan.moneynote.utils.PickerUtil;
 import com.kuxuan.moneynote.utils.TextSetUtil;
 import com.umeng.analytics.MobclickAgent;
 
 import java.util.Calendar;
+import java.util.List;
 
 import butterknife.Bind;
 import cn.addapp.pickers.picker.NumberPicker;
@@ -152,4 +154,23 @@ public class BillActivity extends MVPFragmentActivity<BillPresenter, BillModel>
         TextSetUtil.setTextForMoey("0",mIncomeText);
         TextSetUtil.setTextForMoey("0",mPayText);
     }
+
+    @Override
+    public void setOffLineBillData(List<BillJsonList> billJsonLists) {
+
+        double income_Sum=0;
+        double pay_Sum=0;
+        double balance_Sum =0;
+
+        for(int i=0;i<billJsonLists.size();i++){
+            income_Sum = Double.parseDouble(billJsonLists.get(i).getIncome())+income_Sum;
+            pay_Sum = Double.parseDouble(billJsonLists.get(i).getPay())+pay_Sum;
+        }
+        balance_Sum = income_Sum - pay_Sum;
+
+        TextSetUtil.setTextForMoey(TextSetUtil.formatFloatNumber(balance_Sum),mBalanceText);
+        TextSetUtil.setTextForMoey(TextSetUtil.formatFloatNumber(income_Sum),mIncomeText);
+        TextSetUtil.setTextForMoey(TextSetUtil.formatFloatNumber(pay_Sum),mPayText);
+
+    }
 }

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

@@ -7,9 +7,12 @@ import com.kuxuan.moneynote.base.mvpbase.BaseModel;
 import com.kuxuan.moneynote.base.mvpbase.BasePresent;
 import com.kuxuan.moneynote.base.mvpbase.BaseView;
 import com.kuxuan.moneynote.json.BillJson;
+import com.kuxuan.moneynote.json.BillJsonList;
 import com.kuxuan.moneynote.json.Time;
 import com.kuxuan.moneynote.listener.MVPListener;
 
+import java.util.List;
+
 /**
  * @author HFRX hfrx1314@qq.com
  * @version 1.0.0
@@ -29,6 +32,7 @@ public interface BillContract {
         void setData();
 
 
+        void setOffLineBillData(List<BillJsonList> billJsonLists);
     }
 
 

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

@@ -107,6 +107,7 @@ public class BillPresenter extends BillContract.BillPresent {
 
         }
         mAdapter.setNewData(billJsonLists);
+       view.setOffLineBillData(billJsonLists);
 
     }
 }

app/src/main/java/com/kuxuan/moneynote/ui/weight/CaculatorLayout.java

@@ -144,6 +144,15 @@ public class CaculatorLayout extends LinearLayout implements View.OnClickListene
         this.beizhu.setText(beizhu);
     }
 
+    public void setShowNumText(String shownumtext){
+        this.shownumtext = shownumtext;
+    }
+
+    public void setCompleteNumtext(String completenumtext){
+        this.completenumtext = completenumtext;
+    }
+
+
 
     @Override
     public void onClick(View view) {
@@ -274,7 +283,14 @@ public class CaculatorLayout extends LinearLayout implements View.OnClickListene
                     }
 
                 }else {
+
+                    String sumStr = mNumText.getText().toString().trim();
+                    double sumDouble = Double.parseDouble(sumStr);
+                    if(sumDouble==0){
+                        return;
+                    }
                     sum.complete();
+
                 }
                 return;
             case R.id.calculator_add_btn:
@@ -333,6 +349,8 @@ public class CaculatorLayout extends LinearLayout implements View.OnClickListene
         }
 
 
+        System.out.println(all);
+
         if(!all.endsWith(INPUT_ADD)&&!all.endsWith(INPUT_SUB)){
             all = all.substring(0,all.length() - 1);
 

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

@@ -44,9 +44,9 @@ public class TextSetUtil {
      */
     public static void setTextForMoey(String text, TextView textView) {
         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(16), Color.BLACK);
             textParser.append("." + split[1], DisplayUtil.dip2px(12), Color.parseColor("#262626"));