3 Commits 6540ca9371 ... 75ddfa27cc

Author SHA1 Message Date
  e 75ddfa27cc Merge branch 'MoneyNote3.0' of http://git.quyaqu.com/xieshengqi/MoneyMoreMoreNote into MoneyNote3.0 6 years ago
  e d60b3975b4 提交数据库 6 years ago
  e 19b9476acf 提交数据库 6 years ago

+ 3 - 0
app/src/main/java/com/kuxuan/moneynote/ui/activitys/account/AccountActivity.java

208
         if (numNumber != null) {
208
         if (numNumber != null) {
209
             num.setText(numNumber);
209
             num.setText(numNumber);
210
             keybord.setNumText(numNumber);
210
             keybord.setNumText(numNumber);
211
+            keybord.setShowNumText(numNumber);
212
+            keybord.setCompleteNumtext(numNumber);
211
         }
213
         }
212
         //编辑页跳转过来用到
214
         //编辑页跳转过来用到
213
         isEdit = intent.getBooleanExtra(ISEDIT, false);
215
         isEdit = intent.getBooleanExtra(ISEDIT, false);
448
 
450
 
449
     @Override
451
     @Override
450
     public void complete() {
452
     public void complete() {
453
+
451
         if (COMPLETE.equals(mResult.getText())) {
454
         if (COMPLETE.equals(mResult.getText())) {
452
             if (isEdit) {
455
             if (isEdit) {
453
                 if (category_id.equals("0")) {
456
                 if (category_id.equals("0")) {

+ 21 - 0
app/src/main/java/com/kuxuan/moneynote/ui/activitys/bill/BillActivity.java

12
 import com.kuxuan.moneynote.R;
12
 import com.kuxuan.moneynote.R;
13
 import com.kuxuan.moneynote.base.mvpbase.MVPFragmentActivity;
13
 import com.kuxuan.moneynote.base.mvpbase.MVPFragmentActivity;
14
 import com.kuxuan.moneynote.json.BillJson;
14
 import com.kuxuan.moneynote.json.BillJson;
15
+import com.kuxuan.moneynote.json.BillJsonList;
15
 import com.kuxuan.moneynote.utils.PickerUtil;
16
 import com.kuxuan.moneynote.utils.PickerUtil;
16
 import com.kuxuan.moneynote.utils.TextSetUtil;
17
 import com.kuxuan.moneynote.utils.TextSetUtil;
17
 import com.umeng.analytics.MobclickAgent;
18
 import com.umeng.analytics.MobclickAgent;
18
 
19
 
19
 import java.util.Calendar;
20
 import java.util.Calendar;
21
+import java.util.List;
20
 
22
 
21
 import butterknife.Bind;
23
 import butterknife.Bind;
22
 import cn.addapp.pickers.picker.NumberPicker;
24
 import cn.addapp.pickers.picker.NumberPicker;
152
         TextSetUtil.setTextForMoey("0",mIncomeText);
154
         TextSetUtil.setTextForMoey("0",mIncomeText);
153
         TextSetUtil.setTextForMoey("0",mPayText);
155
         TextSetUtil.setTextForMoey("0",mPayText);
154
     }
156
     }
157
+
158
+    @Override
159
+    public void setOffLineBillData(List<BillJsonList> billJsonLists) {
160
+
161
+        double income_Sum=0;
162
+        double pay_Sum=0;
163
+        double balance_Sum =0;
164
+
165
+        for(int i=0;i<billJsonLists.size();i++){
166
+            income_Sum = Double.parseDouble(billJsonLists.get(i).getIncome())+income_Sum;
167
+            pay_Sum = Double.parseDouble(billJsonLists.get(i).getPay())+pay_Sum;
168
+        }
169
+        balance_Sum = income_Sum - pay_Sum;
170
+
171
+        TextSetUtil.setTextForMoey(TextSetUtil.formatFloatNumber(balance_Sum),mBalanceText);
172
+        TextSetUtil.setTextForMoey(TextSetUtil.formatFloatNumber(income_Sum),mIncomeText);
173
+        TextSetUtil.setTextForMoey(TextSetUtil.formatFloatNumber(pay_Sum),mPayText);
174
+
175
+    }
155
 }
176
 }

+ 4 - 0
app/src/main/java/com/kuxuan/moneynote/ui/activitys/bill/BillContract.java

7
 import com.kuxuan.moneynote.base.mvpbase.BasePresent;
7
 import com.kuxuan.moneynote.base.mvpbase.BasePresent;
8
 import com.kuxuan.moneynote.base.mvpbase.BaseView;
8
 import com.kuxuan.moneynote.base.mvpbase.BaseView;
9
 import com.kuxuan.moneynote.json.BillJson;
9
 import com.kuxuan.moneynote.json.BillJson;
10
+import com.kuxuan.moneynote.json.BillJsonList;
10
 import com.kuxuan.moneynote.json.Time;
11
 import com.kuxuan.moneynote.json.Time;
11
 import com.kuxuan.moneynote.listener.MVPListener;
12
 import com.kuxuan.moneynote.listener.MVPListener;
12
 
13
 
14
+import java.util.List;
15
+
13
 /**
16
 /**
14
  * @author HFRX hfrx1314@qq.com
17
  * @author HFRX hfrx1314@qq.com
15
  * @version 1.0.0
18
  * @version 1.0.0
29
         void setData();
32
         void setData();
30
 
33
 
31
 
34
 
35
+        void setOffLineBillData(List<BillJsonList> billJsonLists);
32
     }
36
     }
33
 
37
 
34
 
38
 

+ 1 - 0
app/src/main/java/com/kuxuan/moneynote/ui/activitys/bill/BillPresenter.java

107
 
107
 
108
         }
108
         }
109
         mAdapter.setNewData(billJsonLists);
109
         mAdapter.setNewData(billJsonLists);
110
+       view.setOffLineBillData(billJsonLists);
110
 
111
 
111
     }
112
     }
112
 }
113
 }

+ 18 - 0
app/src/main/java/com/kuxuan/moneynote/ui/weight/CaculatorLayout.java

144
         this.beizhu.setText(beizhu);
144
         this.beizhu.setText(beizhu);
145
     }
145
     }
146
 
146
 
147
+    public void setShowNumText(String shownumtext){
148
+        this.shownumtext = shownumtext;
149
+    }
150
+
151
+    public void setCompleteNumtext(String completenumtext){
152
+        this.completenumtext = completenumtext;
153
+    }
154
+
155
+
147
 
156
 
148
     @Override
157
     @Override
149
     public void onClick(View view) {
158
     public void onClick(View view) {
274
                     }
283
                     }
275
 
284
 
276
                 }else {
285
                 }else {
286
+
287
+                    String sumStr = mNumText.getText().toString().trim();
288
+                    double sumDouble = Double.parseDouble(sumStr);
289
+                    if(sumDouble==0){
290
+                        return;
291
+                    }
277
                     sum.complete();
292
                     sum.complete();
293
+
278
                 }
294
                 }
279
                 return;
295
                 return;
280
             case R.id.calculator_add_btn:
296
             case R.id.calculator_add_btn:
333
         }
349
         }
334
 
350
 
335
 
351
 
352
+        System.out.println(all);
353
+
336
         if(!all.endsWith(INPUT_ADD)&&!all.endsWith(INPUT_SUB)){
354
         if(!all.endsWith(INPUT_ADD)&&!all.endsWith(INPUT_SUB)){
337
             all = all.substring(0,all.length() - 1);
355
             all = all.substring(0,all.length() - 1);
338
 
356
 

+ 2 - 2
app/src/main/java/com/kuxuan/moneynote/utils/TextSetUtil.java

44
      */
44
      */
45
     public static void setTextForMoey(String text, TextView textView) {
45
     public static void setTextForMoey(String text, TextView textView) {
46
         String[] split = null;
46
         String[] split = null;
47
-        String replace = text.replace("-", "");
47
+//        String replace = text.replace("-", "");
48
         try {
48
         try {
49
-            split = replace.split("\\.");
49
+            split = text.split("\\.");
50
             TextParser textParser = new TextParser();
50
             TextParser textParser = new TextParser();
51
             textParser.append(split[0], DisplayUtil.dip2px(16), Color.BLACK);
51
             textParser.append(split[0], DisplayUtil.dip2px(16), Color.BLACK);
52
             textParser.append("." + split[1], DisplayUtil.dip2px(12), Color.parseColor("#262626"));
52
             textParser.append("." + split[1], DisplayUtil.dip2px(12), Color.parseColor("#262626"));