Merge branch 'master' of http://git.quyaqu.com/xieshengqi/MoneyMoreMoreNote

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

@@ -13,6 +13,7 @@ import android.widget.TextView;
 import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.base.mvpbase.MVPFragmentActivity;
 import com.kuxuan.moneynote.common.Constant;
+import com.kuxuan.moneynote.json.CategoryList;
 import com.kuxuan.moneynote.json.netbody.BillBody;
 import com.kuxuan.moneynote.ui.activitys.eventbus.RefreshEvent;
 import com.kuxuan.moneynote.ui.weight.CaculatorLayout;
@@ -67,6 +68,7 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
     public static final String ICON_URL = "icon_url";
     private static final String EQUAL = "=";
     private static final String COMPLETE = "完成";
+    public static final String NAME = "name";
     private static final int LENGTH_2 = 2;
 
     private String icon_url;
@@ -96,6 +98,12 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
 
     String daytime;
 
+
+    /**
+     * 类别名字
+     */
+    private String name;
+
     /**
      * @param context
      * @param num     金额
@@ -221,10 +229,11 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
 
 
     @Override
-    public void click(String category_id, int type, String icon_url) {
+    public void click(String category_id, int type, String icon_url, CategoryList categoryList) {
         this.category_id = category_id;
         this.mType = type;
         this.icon_url = icon_url;
+        this.name = categoryList.getName();
         keybord.setVisibility(View.VISIBLE);
     }
 
@@ -285,6 +294,7 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
         intent.putExtra(TIME, billBody.getTime());
         intent.putExtra(TYPE, billBody.getType());
         intent.putExtra(DEMO, billBody.getDemo());
+        intent.putExtra(NAME, name);
         intent.putExtra(ICON_URL, icon_url);
         setResult(Constant.Code_Request.RESULTCODE, intent);
         EventBus.getDefault().post(new RefreshEvent());
@@ -306,7 +316,7 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
     public void complete() {
         if (COMPLETE.equals(mResult.getText())) {
             if (isEdit) {
-                if(category_id.equals("0")){
+                if (category_id.equals("0")) {
                     return;
                 }
                 BillBody billBody = new BillBody(category_id, mType, num.getText().toString(), getTime(daytime), mNumEdit.getText().toString(), bill_id);

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

@@ -56,7 +56,7 @@ public class AccountPresenter extends AccountContract.AccountPresent {
                     }
                 }
                 mAdapter.notifyDataSetChanged();
-                mClickListener.click(mCategoryList.get(position).getId(), mCategoryList.get(position).getType(),mCategoryList.get(position).getIcon());
+                mClickListener.click(mCategoryList.get(position).getId(), mCategoryList.get(position).getType(),mCategoryList.get(position).getIcon(),mCategoryList.get(position));
             }
         });
 
@@ -131,11 +131,11 @@ public class AccountPresenter extends AccountContract.AccountPresent {
             }
         }
         mAdapter.notifyDataSetChanged();
-        mClickListener.click(account.getId(), account.getType(),account.getIcon());
+        mClickListener.click(account.getId(), account.getType(),account.getIcon(),account);
     }
 
     interface ClickListener {
-        void click(String category_id, int type,String icon_url);
+        void click(String category_id, int type,String icon_url,CategoryList categoryList);
     }
 
 }

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

@@ -2,6 +2,7 @@ package com.kuxuan.moneynote.ui.activitys.edit;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
@@ -96,7 +97,7 @@ public class EditBillActivity extends BaseActivity {
             activityEditMoney.setText(dayDataEntity.getAccount().replace("-", ""));
             activityEditType.setText("支出");
         }
-        GlideUtil.setImageWithNoCache(this,dayDataEntity.getSmall_icon(),getTitleView().getEdit_image());
+        GlideUtil.setImageWithNoCache(this, dayDataEntity.getSmall_icon(), getTitleView().getEdit_image());
         activityEditBeizhu.setText(dayDataEntity.getDemo());
         getTitleView().getEdit_text().setText(dayDataEntity.getName());
         getTitleView().getEdit_image().setImageResource(R.mipmap.category_custom_selected);
@@ -115,7 +116,8 @@ public class EditBillActivity extends BaseActivity {
         activityEditTime.setText(dayDataEntity.getDay_type());
         activityEditBeizhu.setText(dayDataEntity.getDemo());
         getTitleView().getEdit_text().setText(dayDataEntity.getName());
-        getTitleView().getEdit_image().setImageResource(R.mipmap.category_custom_selected);
+        GlideUtil.setImageWithNoCache(this, dayDataEntity.getSmall_icon(), getTitleView().getEdit_image());
+//        getTitleView().getEdit_image().setImageResource(R.mipmap.category_custom_selected);
     }
 
     @OnClick({R.id.activity_edit_edit_text, R.id.activity_edit_delete_text})
@@ -127,7 +129,7 @@ public class EditBillActivity extends BaseActivity {
                 intent.putExtra(AccountActivity.NUM, dayDataEntity.getAccount());
                 intent.putExtra(AccountActivity.BILL_ID, dayDataEntity.getId() + "");
                 intent.putExtra(AccountActivity.TYPE, dayDataEntity.getType());
-                intent.putExtra(AccountActivity.ID, dayDataEntity.getCategory_id()+"");
+                intent.putExtra(AccountActivity.ID, dayDataEntity.getCategory_id() + "");
                 intent.putExtra(AccountActivity.TIME, timeData);
                 intent.putExtra(AccountActivity.DEMO, dayDataEntity.getDemo());
                 intent.putExtra(AccountActivity.ISEDIT, true);
@@ -216,6 +218,11 @@ public class EditBillActivity extends BaseActivity {
                     dayDataEntity.setSmall_icon(data.getStringExtra(AccountActivity.ICON_URL));
                     if (type != -1)
                         dayDataEntity.setType(type);
+
+
+                    String name = data.getStringExtra(AccountActivity.NAME);
+                    if (!TextUtils.isEmpty(name))
+                        dayDataEntity.setName(name);
                     initNewData();
                 }
             }

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

@@ -169,8 +169,8 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
                         Intent intent = new Intent(getActivity(), ReportChartActivity.class);
                         intent.putExtra(ReportChartActivity.CATROGY_ID, category_id);
                         intent.putExtra(ReportChartActivity.MONEY_TYPE, mType);
-                        intent.putExtra(ReportChartActivity.TITLE, title_text);
-                        intent.putExtra(ReportChartActivity.RADIO_TYPE, radio_type);
+                        intent.putExtra(ReportChartActivity.TITLE, mPresenter.getTitle_text());
+                        intent.putExtra(ReportChartActivity.RADIO_TYPE, mPresenter.getType());
                         intent.putExtra(ReportChartActivity.CHARTTYPE, ChartLayout.YUANHUAN);
                         startActivity(intent);
                     }