merg

app/src/main/java/com/kuxuan/moneynote/api/ApiService.java

@@ -407,6 +407,15 @@ public interface ApiService {
     @POST("upData")
     Observable<BaseJson<Object>> upData(@Body UpDataBody dataBody);
 
+
+    /**
+     * 设置预算
+     * @param month_budget
+     * @return
+     */
+    @POST("setMonthBudget")
+    Observable<BaseJson<Object>> setBudgetData(@Query("month_budget")String month_budget);
+
 }
 
 

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

@@ -17,6 +17,16 @@ public class MineJson {
     private String nickname;
     private String headimgurl;
     private String android_share_url;
+    private String month_budget;
+
+
+    public String getMonth_budget() {
+        return month_budget;
+    }
+
+    public void setMonth_budget(String month_budget) {
+        this.month_budget = month_budget;
+    }
 
     public String getAndroid_share_url() {
         return android_share_url;

app/src/main/java/com/kuxuan/moneynote/ui/activitys/budget/BudgetActivity.java

@@ -7,17 +7,28 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.kuxuan.moneynote.MyApplication;
 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.json.BaseJson;
+import com.kuxuan.moneynote.json.MineJson;
 import com.kuxuan.moneynote.ui.activitys.eventbus.BugetEvent;
+import com.kuxuan.moneynote.utils.LoginStatusUtil;
+import com.kuxuan.moneynote.utils.NetWorkUtil;
 import com.kuxuan.moneynote.utils.SPUtil;
+import com.kuxuan.moneynote.utils.ToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import butterknife.Bind;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * 预算设置
@@ -54,14 +65,18 @@ public class BudgetActivity extends BaseActivity {
         imageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                if(!NetWorkUtil.isNetworkAvailable(BudgetActivity.this)){
+                    ToastUtil.show(BudgetActivity.this,getResources().getString(R.string.nonetwork));
+                   return;
+                }
                 boolean isOpne = (boolean) SPUtil.get(BudgetActivity.this, Constant.System.SWITCH, false);
                 if (isOpne) {
-                    SPUtil.putAndApply(BudgetActivity.this, Constant.System.SWITCH, false);
+                    setData("0", isOpne);
                 } else {
-                    SPUtil.putAndApply(BudgetActivity.this, Constant.System.SWITCH, true);
+                    int d = (int) SPUtil.get(BudgetActivity.this, Constant.System.BUGET_NUM, Constant.System.NORMAL_NUM);
+                    setData(d + "", isOpne);
                 }
-                EventBus.getDefault().post(new BugetEvent());
-                finish();
+
             }
         });
         activityBugetGotosettingLayout.setOnClickListener(new View.OnClickListener() {
@@ -105,4 +120,39 @@ public class BudgetActivity extends BaseActivity {
         setData();
     }
 
+
+    private void setData(final String data, final boolean isOpen) {
+        RetrofitClient.getApiService().setBudgetData(data).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<Object>>() {
+            @Override
+            public void onError(ExceptionHandle.ResponeThrowable e) {
+            }
+
+            @Override
+            public void onSuccess(BaseJson<Object> objectBaseJson) {
+                if (objectBaseJson != null) {
+                    if (objectBaseJson.getCode() == 0) {
+                        int i = Integer.parseInt(data);
+                        SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.BUGET_NUM, i);
+                        MineJson userInfo = LoginStatusUtil.getUserInfo();
+                        if(userInfo!=null){
+                            userInfo.setMonth_budget(data);
+                            LoginStatusUtil.setUserInfo(userInfo);
+                        }
+                        if (isOpen) {
+                            SPUtil.putAndApply(BudgetActivity.this, Constant.System.SWITCH, false);
+
+
+                        } else {
+                            SPUtil.putAndApply(BudgetActivity.this, Constant.System.SWITCH, true);
+                        }
+                        EventBus.getDefault().post(new BugetEvent());
+                        finish();
+                    } else {
+                    }
+                } else {
+
+                }
+            }
+        });
+    }
 }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/budget/BudgetSettingActivity.java

@@ -7,17 +7,29 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
+import com.kuxuan.moneynote.MyApplication;
 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.json.BaseJson;
+import com.kuxuan.moneynote.json.MineJson;
 import com.kuxuan.moneynote.ui.activitys.eventbus.BugetEvent;
+import com.kuxuan.moneynote.utils.DrawableUtil;
 import com.kuxuan.moneynote.utils.JavaFormatUtils;
+import com.kuxuan.moneynote.utils.LoginStatusUtil;
+import com.kuxuan.moneynote.utils.NetWorkUtil;
 import com.kuxuan.moneynote.utils.SPUtil;
+import com.kuxuan.moneynote.utils.ToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
 import butterknife.Bind;
 import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by xieshengqi on 2018/4/24.
@@ -47,6 +59,7 @@ public class BudgetSettingActivity extends BaseActivity {
         int num = (int) SPUtil.get(this, Constant.System.BUGET_NUM, Constant.System.NORMAL_NUM);
         numedit.setHint(JavaFormatUtils.formatFloatNumber(num));
         initEdit();
+
     }
 
     private void initEdit() {
@@ -64,12 +77,12 @@ public class BudgetSettingActivity extends BaseActivity {
             @Override
             public void afterTextChanged(Editable editable) {
                 if (editable.length() != 0 && numedit.getText().length() != 0) {
-                    completeBtn.setBackground(getResources().getDrawable(R.drawable.bg_orange_btn));
-                    completeBtn.setTextColor(getResources().getColor(R.color.black));
+                    completeBtn.setBackground(DrawableUtil.getShape(BudgetSettingActivity.this));
+                    completeBtn.setTextColor(getResources().getColor(R.color.white));
                     completeBtn.setEnabled(true);
                 } else {
                     completeBtn.setBackground(getResources().getDrawable(R.drawable.bg_gray_btn));
-                    completeBtn.setTextColor(getResources().getColor(R.color.gray_text));
+                    completeBtn.setTextColor(getResources().getColor(R.color.white));
                     completeBtn.setEnabled(false);
                 }
             }
@@ -78,11 +91,48 @@ public class BudgetSettingActivity extends BaseActivity {
 
     @OnClick(R.id.activity_bugetsetting_complete_btn)
     public void onViewClicked() {
-
         String string = numedit.getText().toString();
-        int i = Integer.parseInt(string);
-        SPUtil.putAndApply(this, Constant.System.BUGET_NUM, i);
-        EventBus.getDefault().post(new BugetEvent());
-        finish();
+        int da = Integer.parseInt(string);
+        if (da == 0) {
+            ToastUtil.show(this, "预算金额必须大于0");
+            return;
+        }
+        if (!NetWorkUtil.isNetworkAvailable(this)) {
+            ToastUtil.show(this, getResources().getString(R.string.nonetwork));
+            return;
+        }
+        setData(string);
+    }
+
+
+    private void setData(final String data) {
+        RetrofitClient.getApiService().setBudgetData(data).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new MyObsever<BaseJson<Object>>() {
+            @Override
+            public void onError(ExceptionHandle.ResponeThrowable e) {
+                ToastUtil.show(BudgetSettingActivity.this, "设置失败");
+            }
+
+            @Override
+            public void onSuccess(BaseJson<Object> objectBaseJson) {
+                if (objectBaseJson != null) {
+                    if (objectBaseJson.getCode() == 0) {
+                        int i = Integer.parseInt(data);
+                        MineJson userInfo = LoginStatusUtil.getUserInfo();
+                        if (userInfo != null) {
+                            userInfo.setMonth_budget(data);
+                            LoginStatusUtil.setUserInfo(userInfo);
+                        }
+                        if (i != 0)
+                            SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.BUGET_NUM, i);
+                        EventBus.getDefault().post(new BugetEvent());
+                        finish();
+                    } else {
+                        ToastUtil.show(BudgetSettingActivity.this, objectBaseJson.getMessage().get(0));
+                    }
+                } else {
+                    ToastUtil.show(BudgetSettingActivity.this, "设置失败");
+                }
+            }
+        });
     }
 }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/category/CategoryPresent.java

@@ -84,7 +84,7 @@ public class CategoryPresent extends CategoryContract.CategoryPresent {
 
             @Override
             public void onFail(String msg) {
-
+view.hideProgress();
             }
         }, type);
     }

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

@@ -323,12 +323,13 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
         currentOutMoney = Double.parseDouble(outMoey);
         TextSetUtil.setTextForMoey(JavaFormatUtils.formatFloatNumber(currentInmoney), fragmentDetialMoneyin);
         TextSetUtil.setTextForMoey(JavaFormatUtils.formatFloatNumber(currentOutMoney), fragmentDetialMoneyout);
-        changeTypeData(currentInmoney, currentOutMoney);
+        boolean isOpen = (boolean) SPUtil.get(getActivity(), Constant.System.SWITCH, false);
+            changeTypeData(currentInmoney, currentOutMoney);
     }
 
     private void changeTypeData(Double inMoney, Double outMoney) {
         boolean isOpen = (boolean) SPUtil.get(getActivity(), Constant.System.SWITCH, false);
-        Integer date = (Integer) SPUtil.get(getActivity(), Constant.System.BUGET_NUM, Constant.System.NORMAL_NUM);
+        Integer date = (Integer) SPUtil.get(getActivity(), Constant.System.BUGET_NUM, 0);
         if (isOpen) {
             type_text.setText("预算结余");
             TextSetUtil.setTextForBigSize(JavaFormatUtils.formatFloatNumber(date - outMoney), allMoney_text);
@@ -598,8 +599,8 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
                     //选中的时候存储颜色
 //                    SPUtil.putAndApply(getContext(), Constant.Skin.COLOR_SELECT, "#FF4081" );
                     String color1 = item.getColor();
-                    color1 =  color1.substring(2,8);
-                    Log.e("字符数",color1.length()+"");
+                    color1 = color1.substring(2, 8);
+                    Log.e("字符数", color1.length() + "");
                     SPUtil.putAndApply(MyApplication.getInstance(), Constant.Skin.COLOR_SELECT, color1);
 
                     EventBus.getDefault().post(new SkinEvent(mskinBean.getCode()));

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

@@ -25,6 +25,7 @@ import com.kuxuan.moneynote.ui.activitys.bill.BillActivity;
 import com.kuxuan.moneynote.ui.activitys.bindphone.BindThirdActivity;
 import com.kuxuan.moneynote.ui.activitys.budget.BudgetActivity;
 import com.kuxuan.moneynote.ui.activitys.category.CategoryActivity;
+import com.kuxuan.moneynote.ui.activitys.eventbus.BugetEvent;
 import com.kuxuan.moneynote.ui.activitys.eventbus.LoginEvent;
 import com.kuxuan.moneynote.ui.activitys.eventbus.LoginOutEvent;
 import com.kuxuan.moneynote.ui.activitys.eventbus.NetworkEvent;
@@ -233,13 +234,12 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
          }
 
 
-
         cal = Calendar.getInstance();
         activity = (BaseFragmentActivity) getActivity();
         mShareListener = new CustomShareListener(getActivity());
         month = cal.get(Calendar.MONTH) + 1 + "";
         year = cal.get(Calendar.YEAR) + "";
-        TextSetUtil.setTextForMonth(month+"月", monthTv, Color.BLACK);
+        TextSetUtil.setTextForMonth(month + "月", monthTv, Color.BLACK);
         if (LoginStatusUtil.isLoginin()) {
             MineJson userInfo = LoginStatusUtil.getUserInfo();
             if (userInfo == null) {
@@ -450,6 +450,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
 
     @Bind(R.id.iv_mineskin)
     ImageView iv_mineskin;
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent5(SkinEvent skinBean){
         String fileheader = MyApplication.getInstance().getApplicationContext().getFilesDir().getPath()+"/"+"skin/";
@@ -463,8 +464,6 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
             GlideUtil.setImageWithNoCache(getContext(),file,iv_mineskin);
         }
 
-
-
     }
 
 
@@ -547,6 +546,24 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         }
         aaaa = mineModel.getAndroid_share_url();
 
+
+        //预算设置
+        String month_budget = mineModel.getMonth_budget();
+        int budget = 0;
+        try {
+            budget = (int) Double.parseDouble(month_budget);
+
+        } catch (Exception e) {
+
+        }
+        if (budget == 0) {
+            SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH, false);
+            SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.BUGET_NUM, Constant.System.NORMAL_NUM);
+        } else {
+            SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH, true);
+            SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.BUGET_NUM, budget);
+        }
+        EventBus.getDefault().post(new BugetEvent());
     }
 
     @Override

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

@@ -46,8 +46,10 @@ public class LoginStatusUtil {
         SPUtil.putAndApply(MyApplication.getInstance(), Constant.Time.TOKEN_FAIL, 0L);
         SPUtil.putAndApply(MyApplication.getInstance(), Constant.UserInfo.USER_ID, -1);
         SPUtil.putAndApply(MyApplication.getInstance(), Constant.UserInfo.USER_INFO, "");
-        //初始下载数据位
-        SPUtil.putAndApply(MyApplication.getInstance(), Constant.DbInfo.DB_DOWNLOAD_INDEX, 0);
+//预算初始化
+        SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.SWITCH, false);
+        SPUtil.putAndApply(MyApplication.getInstance(), Constant.System.BUGET_NUM, Constant.System.NORMAL_NUM);
+
     }