提交合并

app/.gitignore

@@ -1 +1,2 @@
 /build
+/local.properties

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

@@ -19,6 +19,7 @@ import com.kuxuan.moneynote.json.netbody.ChartBody;
 import com.kuxuan.moneynote.json.netbody.CheckMobileBody;
 import com.kuxuan.moneynote.json.netbody.CustomCategoryBody;
 import com.kuxuan.moneynote.json.netbody.DeleteBody;
+import com.kuxuan.moneynote.json.netbody.ExportBill;
 import com.kuxuan.moneynote.json.netbody.LoginBody;
 import com.kuxuan.moneynote.json.netbody.MessageBody;
 import com.kuxuan.moneynote.json.netbody.NewChartBody;
@@ -311,7 +312,7 @@ public interface ApiService {
      *导出账单
      */
     @POST("applyExport")
-    Observable<String> exportBill(@Body ExportBillBean exportBillBean);
+    Observable<ExportBill> exportBill(@Body ExportBillBean exportBillBean);
 
 
 

app/src/main/java/com/kuxuan/moneynote/common/Constant.java

@@ -11,7 +11,6 @@ public class Constant {
     //测试接口
 //    public static final String BASE_URL = "http://bill.quyaqu.com/api/";
     //正式
-
     public static final String BASE_URL = "https://apimoney.726p.com/api/";
 //    public static final String BASE_URL = "http://api.money.quyaqu.com/api/";
     public static final String MD5 = "b4b80c2676828f1df375684100f56d48";
@@ -42,6 +41,8 @@ public class Constant {
 
         public static final String ISWEICHATLOGIN = "isWeiChatLogin";
 
+        public static final String IsLoginOut ="isloginout";
+
     }
 
 

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

@@ -0,0 +1,23 @@
+package com.kuxuan.moneynote.json;
+
+/**
+ * Created by Allence on 2018/3/23 0023.
+ */
+
+public class HeadImg {
+
+    String url;
+
+
+    public HeadImg(String url) {
+        this.url = url;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

app/src/main/java/com/kuxuan/moneynote/json/netbody/ExportBill.java

@@ -0,0 +1,29 @@
+package com.kuxuan.moneynote.json.netbody;
+
+import java.util.List;
+
+/**
+ * Created by Allence on 2018/3/27 0027.
+ */
+
+public class ExportBill {
+
+    List<String> success;
+    int code;
+
+    public List<String> getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(List<String> success) {
+        this.success = success;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

app/src/main/java/com/kuxuan/moneynote/ui/activitys/LunchActivity.java

@@ -72,13 +72,21 @@ public class LunchActivity extends Activity {
 
     private void goMain() {
 
-        if((Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN,false)&&!(Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,false)){
+//        if((Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN,false)&&!(Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,false)){
+//            LoginStatusUtil.loginOut();
+//            //TODO 刷新数据（重写）
+//            //        EventBus.getDefault().post(new RefreshEvent());
+//            EventBus.getDefault().post(new LoginOutEvent());
+//        }
+
+        if((Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN,false)&&(Boolean) SPUtil.get(this,Constant.IsFirstWEiChatLogin.IsLoginOut,false)){
             LoginStatusUtil.loginOut();
             //TODO 刷新数据（重写）
             //        EventBus.getDefault().post(new RefreshEvent());
             EventBus.getDefault().post(new LoginOutEvent());
         }
 
+
         UIHelper.openActivity(this, MainActivity.class);
         finish();
     }

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

@@ -137,7 +137,7 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
     public void hideProgress() {
         closeProgressDialog();
     }
-
+    String demo;
     @Override
     public void initView() {
         getTitleView(1).setTitle("支出").setRightText("取消", new View.OnClickListener() {
@@ -172,7 +172,13 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
             numNumber = intent.getStringExtra(NUM);
             id = intent.getStringExtra(ID);
             time = intent.getStringExtra(TIME);
+            demo = intent.getStringExtra(DEMO);
+        }
+
+        if(demo!=null){
+            keybord.setBeizhu(demo);
         }
+
         if (time != null) {
             numDay.setTextSize(14);
             long lingtime = TimeUtlis.parseTime(time, TimeUtlis.TIME_FORMAT_18);

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

@@ -35,7 +35,7 @@ public class BillActivity extends MVPFragmentActivity<BillPresenter, BillModel>
     @Bind(R.id.pay_text)
     TextView mPayText;
     Calendar cal;
-    int year = 2017;
+    int year;
     private static final String TAG = "BillActivity";
     @Override
     public void showProgress() {
@@ -62,7 +62,7 @@ public class BillActivity extends MVPFragmentActivity<BillPresenter, BillModel>
         TextSetUtil.setTextForMoey("0",mIncomeText);
         TextSetUtil.setTextForMoey("0",mPayText);
         cal = Calendar.getInstance();
-        final int years = cal.get(Calendar.YEAR);
+        year = cal.get(Calendar.YEAR);
 
         final Drawable drawable = ContextCompat.getDrawable(this,R.mipmap.pull_down_selector_normal);
         //设置title
@@ -102,7 +102,7 @@ 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()<=years) {
+                                if (number.intValue()<=year) {
                                     mPresenter.getBillData(number.intValue());
                                     getTitleView(1).setRight_text(number.intValue()+"");
                                     year = number.intValue();

app/src/main/java/com/kuxuan/moneynote/ui/activitys/bindphone/BindThirdActivity.java

@@ -259,6 +259,7 @@ public class BindThirdActivity extends BaseActivity {
                     if(isFirstWechatLogin){
                         SPUtil.putAndApply(BindThirdActivity.this,Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,true);
                     }
+                    SPUtil.putAndApply(BindThirdActivity.this,Constant.IsFirstWEiChatLogin.IsLoginOut,false);
                     goMain();
                 } else {
                     ToastUtil.show(BindThirdActivity.this, loginJsonBaseJson.getError().get(0));

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

@@ -90,10 +90,8 @@ public class CategoryActivity extends MVPFragmentActivity<CategoryPresent, Categ
                     type="1";
                     mPresenter.getCategoryList("1");
                 }
-
             }
         });
-
     }
 
     @Override

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

@@ -147,7 +147,6 @@ public class EditBillActivity extends BaseActivity {
                 break;
             case R.id.activity_edit_delete_text:
 //删除
-
                 makeSureDialog();
                 break;
         }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/exportbill/Activity_ExportBill.java

@@ -42,6 +42,12 @@ public class Activity_ExportBill extends MVPFragmentActivity<Presenter_ExportBil
     String daytime;
 
 
+    @Bind(R.id.tv_starttime)
+    TextView tv_starttime;
+
+    @Bind(R.id.tv_endtime)
+    TextView tv_endtime;
+
 
     @Override
     public void showProgress() {
@@ -62,16 +68,27 @@ public class Activity_ExportBill extends MVPFragmentActivity<Presenter_ExportBil
 
     }
 
-    private void initDate() {
 
+    private String addZero(int time){
+
+        if(time>=10){
+            return time+"";
+        }
+        return "0"+time;
+    }
+
+
+    private void initDate() {
         Calendar c = Calendar.getInstance();
         mYear = c.get(Calendar.YEAR); // 获取当前年份
         mMonth = c.get(Calendar.MONTH) + 1;// 获取当前月份
         mDay = c.get(Calendar.DAY_OF_MONTH);// 获取当日期
-        daytime = mYear + "年" + mMonth + "月" + mDay + "日";
+        daytime = mYear + "年" + addZero(mMonth) + "月" + addZero(mDay) + "日";
 
         startTime = daytime;
         endTime = daytime;
+        tv_starttime.setText(startTime);
+        tv_endtime.setText(endTime);
 
 
     }
@@ -162,7 +179,9 @@ public class Activity_ExportBill extends MVPFragmentActivity<Presenter_ExportBil
             public void onDatePicked(String s, String s1, String s2) {
                 textView.setText(s + "年" + s1 + "月" + s2+"日");
                 endTime = s + "年" + s1 + "月" + s2 + "日";
-
+                mYear = Integer.parseInt(s);
+                mMonth = Integer.parseInt(s1);
+                mDay = Integer.parseInt(s2);
             }
         });
     }
@@ -230,7 +249,6 @@ public class Activity_ExportBill extends MVPFragmentActivity<Presenter_ExportBil
             }
         };
 
-
         handler.sendEmptyMessageDelayed(0,1500);
 
 
@@ -239,7 +257,7 @@ public class Activity_ExportBill extends MVPFragmentActivity<Presenter_ExportBil
     @Override
     public void setFaildExportBillView() {
 
-        MyLoadingView.showEmailErr(this);
+//        MyLoadingView.showEmailErr(this);
 
     }
 }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/exportbill/Contract_ExpoetBill.java

@@ -3,6 +3,7 @@ package com.kuxuan.moneynote.ui.activitys.exportbill;
 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.netbody.ExportBill;
 import com.kuxuan.moneynote.listener.MVPListener;
 
 /**
@@ -24,14 +25,13 @@ public interface Contract_ExpoetBill {
 
     interface ExportBillModel extends BaseModel{
 
-        void exportBill(String email,String startTime,String endTime,String time,final MVPListener<String> listMVPListener);
+        void exportBill(String email,String startTime,String endTime,String time,final MVPListener<ExportBill> listMVPListener);
 
     }
 
 
     abstract class ExportBillPresenter extends BasePresent<ExportBillModel,ExportBillView>{
 
-
         void exportBill(String email,String startTime,String endTime,String time){}
 
 

app/src/main/java/com/kuxuan/moneynote/ui/activitys/exportbill/Model_ExportBill.java

@@ -1,12 +1,10 @@
 package com.kuxuan.moneynote.ui.activitys.exportbill;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import com.kuxuan.moneynote.api.ExceptionHandle;
 import com.kuxuan.moneynote.api.MyObsever;
 import com.kuxuan.moneynote.api.RetrofitClient;
 import com.kuxuan.moneynote.json.ExportBillBean;
+import com.kuxuan.moneynote.json.netbody.ExportBill;
 import com.kuxuan.moneynote.listener.MVPListener;
 import com.kuxuan.moneynote.utils.Md5Util;
 
@@ -27,7 +25,7 @@ public class Model_ExportBill implements Contract_ExpoetBill.ExportBillModel{
 
 
     @Override
-    public void exportBill(String email,String startTime,String endTime,String time,final MVPListener<String> listMVPListener) {
+    public void exportBill(String email,String startTime,String endTime,String time,final MVPListener<ExportBill> listMVPListener) {
 
         HashMap<String,String> hashMap = new HashMap<>();
         hashMap.put("email",email);
@@ -57,7 +55,7 @@ public class Model_ExportBill implements Contract_ExpoetBill.ExportBillModel{
 
         RetrofitClient.getApiService().exportBill(exportBillBean).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new MyObsever<String>() {
+                .subscribe(new MyObsever<ExportBill>() {
                     @Override
                     public void onError(ExceptionHandle.ResponeThrowable e) {
 
@@ -66,33 +64,12 @@ public class Model_ExportBill implements Contract_ExpoetBill.ExportBillModel{
                     }
 
                     @Override
-                    public void onSuccess(String json) {
-
-//                        if (arrayListBaseJson.getCode() == Constant.Code_Request.SUCCESS_CODE) {
-//                            listMVPListener.onSuccess(arrayListBaseJson.getData());
-//
-//                        } else {
-//                            listMVPListener.onFail(arrayListBaseJson.getError().get(0));
-//
-//                        }
-
-                        Gson gson = new Gson();
-
-                        JsonObject jsonObject = gson.fromJson(json, JsonObject.class);
-
-                        JsonElement code= jsonObject.get("code");
-
-                        if(code.equals("0")){
-
-                             listMVPListener.onSuccess(code.toString());
-
-                        }else {
-
-                            listMVPListener.onSuccess(code.toString());
+                    public void onSuccess(ExportBill exportBill) {
 
+                        if(exportBill.getCode()==0){
+                             listMVPListener.onSuccess(exportBill);
                         }
 
-
                     }
                 });
 

app/src/main/java/com/kuxuan/moneynote/ui/activitys/exportbill/Presenter_ExportBill.java

@@ -1,5 +1,6 @@
 package com.kuxuan.moneynote.ui.activitys.exportbill;
 
+import com.kuxuan.moneynote.json.netbody.ExportBill;
 import com.kuxuan.moneynote.listener.MVPListener;
 
 /**
@@ -13,19 +14,19 @@ public class Presenter_ExportBill extends Contract_ExpoetBill.ExportBillPresente
     void exportBill(String email,String startTime,String endTime,String time) {
 
 
-        mModel.exportBill(email,startTime,endTime,time, new MVPListener<String>() {
+        mModel.exportBill(email,startTime,endTime,time, new MVPListener<ExportBill>() {
 
             @Override
-            public void onSuccess(String content) {
+            public void onSuccess(ExportBill content) {
 
-                getView().setSuccessExportBillView();
+                view.setSuccessExportBillView();
 
             }
 
             @Override
             public void onFail(String msg) {
 
-                getView().setFaildExportBillView();
+                view.setFaildExportBillView();
 
             }
 

app/src/main/java/com/kuxuan/moneynote/ui/activitys/login/LoginActivity.java

@@ -92,11 +92,43 @@ public class LoginActivity extends BaseFragmentActivity {
         Glide.with(this).load(R.mipmap.icon_logo).transform(new GlideRoundTransform(this, 10)).into(mLogo);
     }
 
+
+    private UMAuthListener mUMAuthListener = new UMAuthListener(){
+
+
+        @Override
+        public void onStart(SHARE_MEDIA share_media) {
+
+        }
+
+        @Override
+        public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
+
+            UMShareAPI.get(LoginActivity.this).getPlatformInfo(LoginActivity.this, SHARE_MEDIA.WEIXIN, umAuthListener);
+
+        }
+
+        @Override
+        public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
+
+        }
+
+        @Override
+        public void onCancel(SHARE_MEDIA share_media, int i) {
+
+        }
+    };
+
+
     @OnClick({R.id.activity_login_wchat_btn, R.id.activity_login_more_text, R.id.activity_login_finish_text})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.activity_login_wchat_btn:
-                UMShareAPI.get(LoginActivity.this).getPlatformInfo(LoginActivity.this, SHARE_MEDIA.WEIXIN, umAuthListener);
+//                UMShareAPI.get(LoginActivity.this).getPlatformInfo(LoginActivity.this, SHARE_MEDIA.WEIXIN, umAuthListener);
+//                UMShareAPI.get(this).doOauthVerify(LoginActivity.this, SHARE_MEDIA.WEIXIN, umAuthListener);
+
+                UMShareAPI.get(this).doOauthVerify(LoginActivity.this, SHARE_MEDIA.WEIXIN, mUMAuthListener);
+
                 break;
             case R.id.activity_login_more_text:
                 choose();
@@ -140,10 +172,27 @@ public class LoginActivity extends BaseFragmentActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        UMShareAPI.get(this).deleteOauth(LoginActivity.this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA share_media) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA share_media, int i) {
+            }
+        });
         AppManager.getAppManager().finishActivity(this);
     }
 
-    boolean newUser;
+    boolean newUser=false;
     private UMAuthListener umAuthListener = new UMAuthListener() {
         @Override
         public void onStart(SHARE_MEDIA platform) {
@@ -153,7 +202,10 @@ public class LoginActivity extends BaseFragmentActivity {
 
         @Override
         public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-            Toast.makeText(getApplicationContext(), "微信登录成功", Toast.LENGTH_SHORT).show();
+
+
+
+
             String openid = data.get("openid");
             String unionid = data.get("uid");
             String gender = data.get("gender");
@@ -179,9 +231,12 @@ public class LoginActivity extends BaseFragmentActivity {
                         int isNewUser = objectBaseJson.getData().getNew_user();
 
                         if(isNewUser==1){
-
                             newUser = true;
-
+                            SPUtil.putAndApply(LoginActivity.this,Constant.IsFirstWEiChatLogin.IsLoginOut,true);
+                        }
+                        boolean flag = (boolean) SPUtil.get(getApplicationContext(),Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,false);
+                        if(flag&&!newUser) {
+                            Toast.makeText(getApplicationContext(), "微信登录成功", Toast.LENGTH_SHORT).show();
                         }
 
                         LoginStatusUtil.setToken(objectBaseJson.getData().getToken());
@@ -206,6 +261,8 @@ public class LoginActivity extends BaseFragmentActivity {
         }
     };
 
+
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -222,4 +279,7 @@ public class LoginActivity extends BaseFragmentActivity {
     }
 
 
+
+
+
 }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/login/PhoneLoginActivity.java

@@ -202,7 +202,8 @@ public class PhoneLoginActivity extends BaseActivity {
                 break;
             case R.id.activity_loginphone_wchat_btn:
 //微信登录
-                UMShareAPI.get(PhoneLoginActivity.this).getPlatformInfo(PhoneLoginActivity.this, SHARE_MEDIA.WEIXIN, umAuthListener);
+                UMShareAPI.get(this).doOauthVerify(PhoneLoginActivity.this, SHARE_MEDIA.WEIXIN, mUMAuthListener);
+//                UMShareAPI.get(PhoneLoginActivity.this).getPlatformInfo(PhoneLoginActivity.this, SHARE_MEDIA.WEIXIN, umAuthListener);
                 break;
             case R.id.activity_loginphone_findpwd_text:
                 //找回密码
@@ -219,6 +220,35 @@ public class PhoneLoginActivity extends BaseActivity {
         }
     }
 
+
+
+    private UMAuthListener mUMAuthListener = new UMAuthListener(){
+
+
+        @Override
+        public void onStart(SHARE_MEDIA share_media) {
+
+        }
+
+        @Override
+        public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
+
+            UMShareAPI.get(PhoneLoginActivity.this).getPlatformInfo(PhoneLoginActivity.this, SHARE_MEDIA.WEIXIN, umAuthListener);
+
+        }
+
+        @Override
+        public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
+
+        }
+
+        @Override
+        public void onCancel(SHARE_MEDIA share_media, int i) {
+
+        }
+    };
+
+    boolean newUser=false;
     private UMAuthListener umAuthListener = new UMAuthListener() {
         @Override
         public void onStart(SHARE_MEDIA platform) {
@@ -227,7 +257,7 @@ public class PhoneLoginActivity extends BaseActivity {
 
         @Override
         public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-            Toast.makeText(getApplicationContext(), "微信登录成功", Toast.LENGTH_SHORT).show();
+
             String openid = data.get("openid");
             String unionid = data.get("uid");
             String gender = data.get("gender");
@@ -252,6 +282,17 @@ public class PhoneLoginActivity extends BaseActivity {
                     if (objectBaseJson.getCode() == Constant.Code_Request.SUCCESS_CODE) {
                         LoginStatusUtil.setToken(objectBaseJson.getData().getToken());
                         //跳转
+                        int isNewUser = objectBaseJson.getData().getNew_user();
+
+                        if(isNewUser==1){
+                            newUser = true;
+                            SPUtil.putAndApply(PhoneLoginActivity.this,Constant.IsFirstWEiChatLogin.IsLoginOut,true);
+                        }
+                        boolean flag = (boolean) SPUtil.get(getApplicationContext(),Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,false);
+                        if(flag&&!newUser) {
+                            Toast.makeText(getApplicationContext(), "微信登录成功", Toast.LENGTH_SHORT).show();
+                        }
+
                         goMain();
                         SPUtil.putAndApply(PhoneLoginActivity.this,Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN,true);
                         EventBus.getDefault().post(new RefreshEvent());
@@ -336,6 +377,7 @@ public class PhoneLoginActivity extends BaseActivity {
     }
 
     private void goMain() {
+
         LoginStatusUtil.loginIn();
         sendEventMessage();
         Bundle bundle = new Bundle();
@@ -346,12 +388,34 @@ public class PhoneLoginActivity extends BaseActivity {
     }
 
     private void sendEventMessage() {
-        EventBus.getDefault().post(new LoginEvent());
+        LoginEvent loginEvent = new LoginEvent(newUser);
+        EventBus.getDefault().post(loginEvent);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        UMShareAPI.get(this).deleteOauth(PhoneLoginActivity.this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA share_media) {
+
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
+
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
+
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA share_media, int i) {
+
+            }
+        });
         AppManager.getAppManager().finishActivity(this);
     }
 }

app/src/main/java/com/kuxuan/moneynote/ui/activitys/person/PersonActivity.java

@@ -27,6 +27,7 @@ import com.kuxuan.moneynote.api.RetrofitClient;
 import com.kuxuan.moneynote.base.mvpbase.MVPFragmentActivity;
 import com.kuxuan.moneynote.common.Constant;
 import com.kuxuan.moneynote.json.BaseJson;
+import com.kuxuan.moneynote.json.HeadImg;
 import com.kuxuan.moneynote.json.MineJson;
 import com.kuxuan.moneynote.json.netbody.PersonBody;
 import com.kuxuan.moneynote.json.netbody.WeChatJson;
@@ -326,6 +327,15 @@ public class PersonActivity extends MVPFragmentActivity<PersonPresenter, PersonM
         }
 
     }
+
+
+    String headImgUrl;
+    @Override
+    public void setMineHeadImg() {
+        HeadImg headImg = new HeadImg(headImgUrl);
+        EventBus.getDefault().post(headImg);
+    }
+
     @OnClick(R.id.wechat_lin)
     void weChatClick(){
         UMShareAPI.get(this).getPlatformInfo(this, SHARE_MEDIA.WEIXIN , umAuthListener);
@@ -423,6 +433,7 @@ public class PersonActivity extends MVPFragmentActivity<PersonPresenter, PersonM
         if(imageFile != null){
             PersonBody personBody = new PersonBody(imageFile);
             mPresenter.updateAvatar(personBody);
+            headImgUrl = personBody.getAvatar();
         }
     }
 

app/src/main/java/com/kuxuan/moneynote/ui/activitys/person/PersonContract.java

@@ -20,6 +20,14 @@ public interface PersonContract {
          */
         void setMineData(MineJson mineModel);
 
+
+        /**
+         * 设置我的页面的头像
+         */
+        void setMineHeadImg();
+
+
+
     }
 
 

app/src/main/java/com/kuxuan/moneynote/ui/activitys/person/PersonPresenter.java

@@ -43,7 +43,7 @@ public class PersonPresenter  extends PersonContract.PersonPresent{
                 }
                 if(content!=null){
                     if(view!=null){
-
+                        view.setMineHeadImg();
                     }
 
                 }

app/src/main/java/com/kuxuan/moneynote/ui/adapter/CategoryRemoveAdapter.java

@@ -24,10 +24,6 @@ public class CategoryRemoveAdapter extends BaseItemDraggableAdapter<CategoryList
                 helper.setText(R.id.category_text, item.getName())
                         .addOnClickListener(R.id.delete_img);
                 Glide.with(mContext).load(item.getIcon()).into((ImageView) helper.getView(R.id.category_img));
-
-
-
-
     }
 
 }

app/src/main/java/com/kuxuan/moneynote/ui/adapter/DetialAdapter.java

@@ -2,7 +2,6 @@ package com.kuxuan.moneynote.ui.adapter;
 
 import android.support.annotation.LayoutRes;
 import android.support.annotation.Nullable;
-import android.text.TextUtils;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -33,6 +32,8 @@ public class DetialAdapter extends BaseQuickAdapter<TypeDataJson, DetialViewHold
     @Override
     protected void convert(DetialViewHolder helper, TypeDataJson item) {
         int layoutPosition = helper.getLayoutPosition();
+        helper.tv_beizhu.setText("");
+        helper.tv_beizhu.setVisibility(View.GONE);
         if (item.isTrueData()) {
             helper.layout.setVisibility(View.VISIBLE);
             if (item.isFirst()) {
@@ -46,6 +47,7 @@ public class DetialAdapter extends BaseQuickAdapter<TypeDataJson, DetialViewHold
                 } else if (billData.getDay_income_account() != 0 && billData.getDay_pay_account() != 0) {
                     helper.money.setText("收入:" +  JavaFormatUtils.formatFloatNumber (billData.getDay_income_account()) + "  支出:" +   JavaFormatUtils.formatFloatNumber (billData.getDay_pay_account()));
                 }
+                
 //            helper.view1.setVisibility(View.VISIBLE);
             } else {
                 helper.title_layout.setVisibility(View.GONE);
@@ -61,10 +63,11 @@ public class DetialAdapter extends BaseQuickAdapter<TypeDataJson, DetialViewHold
                 helper.view2.setVisibility(View.GONE);
             }
             String demo = item.getDemo();
-            if (TextUtils.isEmpty(demo)) {
-                helper.type_name.setText(item.getName());
-            } else {
-                helper.type_name.setText(item.getDemo());
+            helper.type_name.setText(item.getName());
+
+            if (demo!=null&&!demo.equals("")) {
+                helper.tv_beizhu.setVisibility(View.VISIBLE);
+                helper.tv_beizhu.setText(item.getDemo());
             }
 
             if (item.getType() == 2) {

app/src/main/java/com/kuxuan/moneynote/ui/adapter/viewholder/DetialViewHolder.java

@@ -14,7 +14,7 @@ import com.kuxuan.moneynote.base.BaseViewHolder;
 
 public class DetialViewHolder extends BaseViewHolder {
 
-    public TextView time,money,type_name,mingxi_text;
+    public TextView time,money,type_name,mingxi_text,tv_beizhu;
     public ImageView imageView;
     public RelativeLayout title_layout;
     public View view1,view2;
@@ -25,6 +25,7 @@ public class DetialViewHolder extends BaseViewHolder {
         time  = itemView.findViewById(R.id.item_detial_time_text);
         money  = itemView.findViewById(R.id.item_detial_money_text);
         type_name  = itemView.findViewById(R.id.item_detial_name_text);
+        tv_beizhu = itemView.findViewById(R.id.tv_beizhu);
         mingxi_text  = itemView.findViewById(R.id.item_detial_mingxi_text);
         imageView = itemView.findViewById(R.id.item_detial_image);
         title_layout = itemView.findViewById(R.id.item_detial_title_layout);

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

@@ -226,7 +226,10 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(RefreshEvent event) {
+
         mPresenter.getDataLists(mPresenter.getCurrentYear() + "", mPresenter.getCurrentMonth() + "");
+//      mPresenter.loginCheck();
+
     }
 
     /**

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

@@ -12,6 +12,7 @@ import com.kuxuan.moneynote.base.BaseFragmentActivity;
 import com.kuxuan.moneynote.base.mvpbase.MVPFragment;
 import com.kuxuan.moneynote.common.Constant;
 import com.kuxuan.moneynote.json.BillJson;
+import com.kuxuan.moneynote.json.HeadImg;
 import com.kuxuan.moneynote.json.MineJson;
 import com.kuxuan.moneynote.ui.activitys.AboutActivity;
 import com.kuxuan.moneynote.ui.activitys.alarm.AlarmActivity;
@@ -193,6 +194,7 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         mShareListener = new CustomShareListener(getActivity());
         month = cal.get(Calendar.MONTH) + 1 + "";
         year = cal.get(Calendar.YEAR) + "";
+
         TextSetUtil.setTextForMonth(month, monthTv);
         if(LoginStatusUtil.isLoginin()){
             mPresenter.getMineData();
@@ -212,6 +214,10 @@ 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);
+
     }
 
     //账单信息
@@ -256,6 +262,22 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
 
 
     /**
+     * 选头像后刷新
+     *
+     * @param headImg
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(HeadImg headImg) {
+
+        Glide.with(this).load(headImg.getUrl())
+                .into(mPortraitImage);
+
+    }
+
+
+
+
+    /**
      * add账单之后刷新数据
      *
      * @param loginEvent
@@ -282,9 +304,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);
             }
 
         }
@@ -323,15 +345,29 @@ public class MineFragment extends MVPFragment<MinePresent, MineModel> implements
         // 强制绑定手机号入口
 //        if((mineModel.getMobile()==null||mineModel.getMobile().equals(""))){
 
-            boolean flag = (boolean) SPUtil.get(getActivity(), Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,false);
+        boolean isWeichatLogin = (Boolean) SPUtil.get(getActivity(), Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN,false);
+
+        if(isWeichatLogin) {
+
+            boolean flag = (boolean) SPUtil.get(getActivity(), Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN, false);
+
+            if(newUser&&(mineModel.getMobile().equals("")||mineModel.getMobile()==null)){
+                Bundle bundle = new Bundle();
+                bundle.putBoolean(Constant.IsFirstWEiChatLogin.NEWUSER, newUser);
+                bundle.putBoolean(Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN, true);
+                UIHelper.openActivityWithBundle(getActivity(), BindActivity.class, bundle);
+                return;
+            }
 
-            if(!flag){
+            if (!flag&&(mineModel.getMobile().equals("")||mineModel.getMobile()==null)) {
                 Bundle bundle = new Bundle();
-                bundle.putBoolean(Constant.IsFirstWEiChatLogin.NEWUSER,newUser);
-                bundle.putBoolean(Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN,true);
-                UIHelper.openActivityWithBundle(getActivity(),BindActivity.class,bundle);
+                bundle.putBoolean(Constant.IsFirstWEiChatLogin.NEWUSER, newUser);
+                bundle.putBoolean(Constant.IsFirstWEiChatLogin.ISFIRSTWEICHATLOGIN, true);
+                UIHelper.openActivityWithBundle(getActivity(), BindActivity.class, bundle);
             }
-//        }
+
+        }
+
 
         aaaa = mineModel.getAndroid_share_url();
 
@@ -354,9 +390,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);
 
 
     }
@@ -367,9 +403,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/ui/weight/CaculatorLayout.java

@@ -5,6 +5,7 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -52,6 +53,7 @@ public class CaculatorLayout extends LinearLayout implements View.OnClickListene
     private String shownumtext ="0";
     private String completenumtext ="0";
 
+    private EditText beizhu;
     Sum sum;
     private static final String EQUAL = "=";
     private static final String COMPLETES = "完成";
@@ -95,6 +97,9 @@ public class CaculatorLayout extends LinearLayout implements View.OnClickListene
         mNumberEightBtn = (Button) mLayout.findViewById(R.id.calculator_btn8);
         mNumberNineBtn = (Button) mLayout.findViewById(R.id.calculator_btn9);
         mDeleteBtn = (ImageButton) mLayout.findViewById(R.id.calculator_delete);
+        beizhu = mLayout.findViewById(R.id.num_edit);
+
+
 
         mNumberFourBtn = (Button) mLayout.findViewById(R.id.calculator_btn4);
         mNumberFiveBtn = (Button) mLayout.findViewById(R.id.calculator_btn5);
@@ -135,6 +140,11 @@ public class CaculatorLayout extends LinearLayout implements View.OnClickListene
         CaculatorLayout.numText = numText;
     }
 
+    public void setBeizhu(String beizhu){
+        this.beizhu.setText(beizhu);
+    }
+
+
     @Override
     public void onClick(View view) {
         String numtemp="";

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

@@ -124,7 +124,7 @@
             android:layout_height="wrap_content"
             android:id="@+id/gender_text"
             android:layout_marginEnd="@dimen/len_4"
-            android:text="男"/>
+            android:text=""/>
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -73,7 +73,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:paddingBottom="10dp">
+                >
 
                 <TextView
                     android:id="@+id/item_detial_name_text"
@@ -86,6 +86,16 @@
                     android:textSize="@dimen/text_normal_size"/>
 
                 <TextView
+                    android:id="@+id/tv_beizhu"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/item_detial_name_text"
+                    android:textSize="12dp"
+                    android:visibility="gone"
+                    />
+
+
+                <TextView
                     android:id="@+id/item_detial_mingxi_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

build.gradle

@@ -6,7 +6,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -23,8 +22,8 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 ext{
-    versionCode = 8
-    versionName = "1.4.1"
+    versionCode = 9
+    versionName = "1.4.2"
     minSdkVersion = 18
     targetSdkVersion = 22
     compileSdkVersion = 26