Merge branch 'MoneyNote3.0' of http://git.quyaqu.com/xieshengqi/MoneyMoreMoreNote into MoneyNote3.0

MoneyNote_Sqlite/proguard-rules.pro

@@ -19,3 +19,4 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+

MoneyNote_Sqlite/src/main/java/com/kuxuan/sqlite/dao/TestActivity.java

@@ -0,0 +1,20 @@
+package com.kuxuan.sqlite.dao;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.kuxuan.sqlite.R;
+
+/**
+ * Created by xieshengqi on 2018/4/13.
+ */
+
+public class TestActivity extends AppCompatActivity {
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}

app/proguard-rules.pro

@@ -291,7 +291,8 @@ public static final int *;
 -keep public class * extends com.kuxuan.moneynote.base.mvpbase.MvpFragmentActivity
 -keep public class * extends com.kuxuan.moneynote.base.BaseViewHolder
 
--keep class com.kuxuan.monrynote.base.**{*;}
+-keep class com.kuxuan.moneynote.base.**{*;}
+-keep class com.kuxuan.moneynote.db.**{*;}
 
 
 -dontshrink
@@ -386,6 +387,14 @@ public static final int *;
 -keepattributes Signature
 #greendao3.2.0,此是针对3.2.0，如果是之前的，可能需要更换下包名
 -keep class org.greenrobot.greendao.**{*;}
+
+-keep public class * extends org.greenrobot.greendao.AbstractDao
+
 -keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
 public static java.lang.String TABLENAME;
 }
+
+-keep class **$Properties
+
+-keepclassmembers class **$Properties {*;}
+

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

@@ -9,9 +9,10 @@ public class Constant {
     //手机号正则，11位手机号
     public static final String REGEX_MOBILE = "[1][3,4,5,7,8][0-9]{9}$";
     //测试接口
-    public static final String BASE_URL = "http://bill.quyaqu.com/api/";
+//    public static final String BASE_URL = "http://bill.quyaqu.com/api/";
+//    public static final String BASE_URL = "http://web6.money.726p.com/api/";
     //正式
-//    public static final String BASE_URL = "https://apimoney.726p.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";
 

app/src/main/java/com/kuxuan/moneynote/db/CategoryDaoOperator.java

@@ -96,7 +96,21 @@ public class CategoryDaoOperator {
             String s = String.valueOf(createTime);
             //毫秒4位数
             String ms = s.substring(s.length() - 4, s.length());
-            stringBuilder.append(currentTime.getYear() + "" + currentTime.getMonth() + "" + currentTime.getDay() + currentTime.getHh() + "" + currentTime.getMm() + "" + currentTime.getSs() + ms + ((int) ((Math.random() * 9 + 1) * 1000)));
+            int month = currentTime.getMonth();
+            int day = currentTime.getDay();
+            String stringMonth = null;
+            String stringDay = null;
+            if (month < 10) {
+                stringMonth = "0" + month;
+            } else {
+                stringMonth = month + "";
+            }
+            if (day < 10) {
+                stringDay = "0" + day;
+            } else {
+                stringDay = day + "";
+            }
+            stringBuilder.append(currentTime.getYear() + "" + stringMonth + "" + stringDay + currentTime.getHh() + "" + currentTime.getMm() + "" + currentTime.getSs() + ms + ((int) ((Math.random() * 9 + 1) * 1000)));
             bill_id = stringBuilder.toString();
         }
         try {
@@ -199,8 +213,7 @@ public class CategoryDaoOperator {
         category.setDay(categoryDBbean.getDay());
         category.setMonth(categoryDBbean.getMonth());
         category.setYear(categoryDBbean.getYear());
-        category.setCreateTime(categoryDBbean.getCreateTime());
-        category.setUpdateTime(categoryDBbean.getCreateTime());
+        category.setUpdateTime(categoryDBbean.getUpdateTime());
         categoryDBDao.update(category);
         onSuccess(SUCCESS);
     }
@@ -219,6 +232,18 @@ public class CategoryDaoOperator {
     }
 
     /**
+     * 设置数据库数据需要同步
+     *
+     * @param bill_id
+     */
+    public synchronized void updataNeedSynce(String bill_id) {
+        CategoryDB category = getCategory(bill_id);
+        category.setIsNeedSync(true);
+        category.setUser_id(LoginStatusUtil.getLoginUserId());
+        DbManager.getInstance().getmDaoSession().getCategoryDBDao().update(category);
+    }
+
+    /**
      * 设置此项是否为删除项
      *
      * @param bill_id
@@ -240,7 +265,10 @@ public class CategoryDaoOperator {
      */
     public synchronized void deleteData(String bill_id) {
         start();
-        DbManager.getInstance().getmDaoSession().getCategoryDBDao().delete(getCategory(bill_id));
+        try {
+            DbManager.getInstance().getmDaoSession().getCategoryDBDao().delete(getCategory(bill_id));
+        } catch (Exception e) {
+        }
         onSuccess(SUCCESS);
     }
 
@@ -276,48 +304,47 @@ public class CategoryDaoOperator {
         int endDay = 1;
         if (startYear == endYear) {
             List<CategoryDB> monthLists = null;
-            if(category_id!=-1){
-
-             monthLists = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Month).list();
-            }else{
-             monthLists = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear)).orderAsc(CategoryDBDao.Properties.Month).list();
+            if (category_id != -1) {
+                monthLists = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Month).list();
+            } else {
+                monthLists = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(startYear)).orderAsc(CategoryDBDao.Properties.Month).list();
             }
             startMonth = monthLists.get(0).getMonth();
             endMonth = monthLists.get(monthLists.size() - 1).getMonth();
         } else {
             List<CategoryDB> monthLists1 = null;
-            if(category_id!=-1){
-                monthLists1 = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear),CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Month).list();
+            if (category_id != -1) {
+                monthLists1 = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Month).list();
 
-            }else{
-                monthLists1 = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear)).orderAsc(CategoryDBDao.Properties.Month).list();
+            } else {
+                monthLists1 = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(startYear)).orderAsc(CategoryDBDao.Properties.Month).list();
 
             }
             startMonth = monthLists1.get(0).getMonth();
             List<CategoryDB> monthLists2 = null;
-            if(category_id!=-1){
-                monthLists2 = getQuilder().where(CategoryDBDao.Properties.Year.eq(endYear),CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Month).list();
+            if (category_id != -1) {
+                monthLists2 = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(endYear), CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Month).list();
 
-            }else{
-                monthLists2 = getQuilder().where(CategoryDBDao.Properties.Year.eq(endYear)).orderAsc(CategoryDBDao.Properties.Month).list();
+            } else {
+                monthLists2 = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(endYear)).orderAsc(CategoryDBDao.Properties.Month).list();
 
             }
             endMonth = monthLists2.get(monthLists2.size() - 1).getMonth();
         }
         //查找开始日期和结束日期
         List<CategoryDB> daylist1 = null;
-        if(category_id!=-1){
-         daylist1 = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Month.eq(startMonth),CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Day).list();
-        }else{
-      daylist1 = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Month.eq(startMonth)).orderAsc(CategoryDBDao.Properties.Day).list();
+        if (category_id != -1) {
+            daylist1 = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Month.eq(startMonth), CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Day).list();
+        } else {
+            daylist1 = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Month.eq(startMonth)).orderAsc(CategoryDBDao.Properties.Day).list();
 
         }
         startDay = daylist1.get(0).getDay();
         List<CategoryDB> daylist2 = null;
-        if(category_id!=-1){
-        daylist2 = getQuilder().where(CategoryDBDao.Properties.Year.eq(endYear), CategoryDBDao.Properties.Month.eq(endMonth),CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Day).list();
-        }else{
-        daylist2 = getQuilder().where(CategoryDBDao.Properties.Year.eq(endYear), CategoryDBDao.Properties.Month.eq(endMonth)).orderAsc(CategoryDBDao.Properties.Day).list();
+        if (category_id != -1) {
+            daylist2 = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(endYear), CategoryDBDao.Properties.Month.eq(endMonth), CategoryDBDao.Properties.Category_id.eq(category_id)).orderAsc(CategoryDBDao.Properties.Day).list();
+        } else {
+            daylist2 = getQuilder().where(CategoryDBDao.Properties.Type.eq(type),CategoryDBDao.Properties.Year.eq(endYear), CategoryDBDao.Properties.Month.eq(endMonth)).orderAsc(CategoryDBDao.Properties.Day).list();
 
         }
         endDay = daylist2.get(daylist2.size() - 1).getDay();
@@ -357,19 +384,19 @@ public class CategoryDaoOperator {
         int startDay = 1;
         int endDay = 1;
         if (startYear == endYear) {
-            List<CategoryDB> monthLists = categoryDBDao.queryBuilder().where(CategoryDBDao.Properties.Year.eq(startYear)).orderAsc(CategoryDBDao.Properties.Month).list();
+            List<CategoryDB> monthLists = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear)).orderAsc(CategoryDBDao.Properties.Month).list();
             startMonth = monthLists.get(0).getMonth();
             endMonth = monthLists.get(monthLists.size() - 1).getMonth();
         } else {
-            List<CategoryDB> monthLists1 = categoryDBDao.queryBuilder().where(CategoryDBDao.Properties.Year.eq(startYear)).orderAsc(CategoryDBDao.Properties.Month).list();
+            List<CategoryDB> monthLists1 = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear)).orderAsc(CategoryDBDao.Properties.Month).list();
             startMonth = monthLists1.get(0).getMonth();
-            List<CategoryDB> monthLists2 = categoryDBDao.queryBuilder().where(CategoryDBDao.Properties.Year.eq(endYear)).orderAsc(CategoryDBDao.Properties.Month).list();
+            List<CategoryDB> monthLists2 = getQuilder().where(CategoryDBDao.Properties.Year.eq(endYear)).orderAsc(CategoryDBDao.Properties.Month).list();
             endMonth = monthLists2.get(monthLists2.size() - 1).getMonth();
         }
         //查找开始日期和结束日期
-        List<CategoryDB> daylist1 = categoryDBDao.queryBuilder().where(CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Month.eq(startMonth)).orderAsc(CategoryDBDao.Properties.Day).list();
+        List<CategoryDB> daylist1 = getQuilder().where(CategoryDBDao.Properties.Year.eq(startYear), CategoryDBDao.Properties.Month.eq(startMonth)).orderAsc(CategoryDBDao.Properties.Day).list();
         startDay = daylist1.get(0).getDay();
-        List<CategoryDB> daylist2 = categoryDBDao.queryBuilder().where(CategoryDBDao.Properties.Year.eq(endYear), CategoryDBDao.Properties.Month.eq(endMonth)).orderAsc(CategoryDBDao.Properties.Day).list();
+        List<CategoryDB> daylist2 = getQuilder().where(CategoryDBDao.Properties.Year.eq(endYear), CategoryDBDao.Properties.Month.eq(endMonth)).orderAsc(CategoryDBDao.Properties.Day).list();
         endDay = daylist2.get(daylist2.size() - 1).getDay();
 
         map.put("startYear", startYear);
@@ -442,6 +469,7 @@ public class CategoryDaoOperator {
 
     /**
      * 我的界面获取某月数据
+     *
      * @param year
      * @param month
      * @return
@@ -539,7 +567,7 @@ public class CategoryDaoOperator {
      * @return
      */
     public ArrayList<CategoryDB> getCategoryForDay(int year, int monnth, int day) {
-        List<CategoryDB> list = getQuilder().where(CategoryDBDao.Properties.Year.eq(year), CategoryDBDao.Properties.Month.eq(monnth), CategoryDBDao.Properties.Day.eq(day)).list();
+        List<CategoryDB> list = getQuilder().where(CategoryDBDao.Properties.Year.eq(year), CategoryDBDao.Properties.Month.eq(monnth), CategoryDBDao.Properties.Day.eq(day)).orderAsc(CategoryDBDao.Properties.UpdateTime).list();
         return (ArrayList<CategoryDB>) list;
     }
 

app/src/main/java/com/kuxuan/moneynote/db/UpDataOperator.java

@@ -49,11 +49,21 @@ public class UpDataOperator {
             uploadDbjson.setDemo(categoryDB.getDemo());
             uploadDbjson.setIdentification(categoryDB.getBill_id());
             uploadDbjson.setStatus(categoryDB.getStatus() + "");
-            String times = categoryDB.getCreateTime()+"";
-            if(times.length()>=13){
-            uploadDbjson.setTime(categoryDB.getCreateTime()/1000+"");
-            }else{
-            uploadDbjson.setTime(categoryDB.getCreateTime()+"");
+            String createTime = categoryDB.getCreateTime() + "";
+            String updateTime = categoryDB.getUpdateTime() + "";
+            if (createTime.length() >= 13) {
+                uploadDbjson.setTime(categoryDB.getCreateTime() / 1000 + "");
+                uploadDbjson.setCreated_at(categoryDB.getCreateTime() / 1000 + "");
+            } else {
+                uploadDbjson.setTime(categoryDB.getCreateTime() + "");
+                uploadDbjson.setCreated_at(categoryDB.getCreateTime() + "");
+            }
+            if (updateTime.length() >= 13) {
+                uploadDbjson.setUpdated_at(categoryDB.getUpdateTime() / 1000 + "");
+                uploadDbjson.setTime(categoryDB.getUpdateTime() / 1000 + "");
+            } else {
+                uploadDbjson.setUpdated_at(categoryDB.getUpdateTime() + "");
+                uploadDbjson.setTime(categoryDB.getUpdateTime() + "");
             }
             uploadDbjson.setUser_id(LoginStatusUtil.getLoginUserId());
             uploadDbjson.setType(categoryDB.getType() + "");

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

@@ -0,0 +1,72 @@
+package com.kuxuan.moneynote.json;
+
+/**
+ * Created by xieshengqi on 2018/4/16.
+ */
+
+public class BillTypeJson {
+    private long  id;
+    private int category_type;
+    private String icon;
+    private String selected_icon;
+    private String detail_icon;
+    private String name;
+    private int type;
+
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public int getCategory_type() {
+        return category_type;
+    }
+
+    public void setCategory_type(int category_type) {
+        this.category_type = category_type;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public String getSelected_icon() {
+        return selected_icon;
+    }
+
+    public void setSelected_icon(String selected_icon) {
+        this.selected_icon = selected_icon;
+    }
+
+    public String getDetail_icon() {
+        return detail_icon;
+    }
+
+    public void setDetail_icon(String detail_icon) {
+        this.detail_icon = detail_icon;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+}

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

@@ -14,11 +14,11 @@ public class ReportJson implements Serializable ,Comparable<ReportJson>{
 
     private String name;
     //收入
-    private long inmoney;
+    private double inmoney;
     //支出
-    private long outmoney;
+    private double outmoney;
 
-    private long allMoney;
+    private double allMoney;
     private String url;
     //收入还是支出
     private boolean isOut;
@@ -60,27 +60,27 @@ public class ReportJson implements Serializable ,Comparable<ReportJson>{
         this.name = name;
     }
 
-    public float getInmoney() {
+    public double getInmoney() {
         return inmoney;
     }
 
-    public void setInmoney(long inmoney) {
+    public void setInmoney(double inmoney) {
         this.inmoney = inmoney;
     }
 
-    public float getOutmoney() {
+    public double getOutmoney() {
         return outmoney;
     }
 
-    public void setOutmoney(long outmoney) {
+    public void setOutmoney(double outmoney) {
         this.outmoney = outmoney;
     }
 
-    public float getAllMoney() {
+    public double getAllMoney() {
         return allMoney;
     }
 
-    public void setAllMoney(long allMoney) {
+    public void setAllMoney(double allMoney) {
         this.allMoney = allMoney;
     }
 

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

@@ -15,7 +15,7 @@ public class TimeDataJson implements Serializable{
      * day : 2017-10-23
      */
 
-    private float account;
+    private double account;
     private String time;
     private ArrayList<PopCharData> data;
 
@@ -36,11 +36,11 @@ public class TimeDataJson implements Serializable{
         this.data = data;
     }
 
-    public float getAccount() {
+    public double getAccount() {
         return account;
     }
 
-    public void setAccount(int account) {
+    public void setAccount(double account) {
         this.account = account;
     }
 

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

@@ -6,7 +6,7 @@ import java.io.Serializable;
  * Created by xieshengqi on 2018/4/8.
  */
 
-public class UpJson implements Serializable{
+public class UpJson implements Serializable {
 
 
     /**
@@ -30,6 +30,25 @@ public class UpJson implements Serializable{
     private String category_id;
     private String type;
     private int user_id;
+    private String created_at;
+    private String updated_at;
+
+
+    public String getCreated_at() {
+        return created_at;
+    }
+
+    public void setCreated_at(String created_at) {
+        this.created_at = created_at;
+    }
+
+    public String getUpdated_at() {
+        return updated_at;
+    }
+
+    public void setUpdated_at(String updated_at) {
+        this.updated_at = updated_at;
+    }
 
     public String getIdentification() {
         return identification;

app/src/main/java/com/kuxuan/moneynote/servier/DownLoadService.java

@@ -62,8 +62,8 @@ public class DownLoadService extends Service {
 
     @Override
     public void onDestroy() {
-        if(alarmManager!=null)
-        alarmManager.cancel(pIntent);//关闭的服务的时候同时关闭广播注册者
+        if (alarmManager != null)
+            alarmManager.cancel(pIntent);//关闭的服务的时候同时关闭广播注册者
         super.onDestroy();
     }
 
@@ -131,8 +131,18 @@ public class DownLoadService extends Service {
             categoryDBbean.setCategory_id(uploadDbjson.getCategory_id());
             categoryDBbean.setDemo(uploadDbjson.getDemo());
             long time = uploadDbjson.getTime() * 1000;
-            categoryDBbean.setCreateTime(uploadDbjson.getTime());
-            categoryDBbean.setUpdateTime(uploadDbjson.getTime());
+            long create_time = uploadDbjson.getCreated_at() * 1000;
+            long updata_time = uploadDbjson.getUpdated_at() * 1000;
+            if (create_time == 0) {
+                categoryDBbean.setCreateTime(uploadDbjson.getTime());
+            } else {
+                categoryDBbean.setCreateTime(create_time);
+            }
+            if (updata_time == 0) {
+                categoryDBbean.setUpdateTime(time);
+            } else {
+                categoryDBbean.setUpdateTime(updata_time);
+            }
             String data = TimeUtlis.getData(time);
             String[] split = data.split("-");
             categoryDBbean.setYear(Integer.parseInt(split[0]));

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

@@ -7,20 +7,26 @@ import android.view.View;
 import android.view.WindowManager;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.common.Constant;
 import com.kuxuan.moneynote.db.BillCategoreDaoOperator;
-import com.kuxuan.moneynote.db.CategoryDBJson;
+import com.kuxuan.moneynote.json.BillTypeJson;
 import com.kuxuan.moneynote.ui.activitys.eventbus.LoginOutEvent;
 import com.kuxuan.moneynote.ui.activitys.login.LoginActivity;
 import com.kuxuan.moneynote.utils.LoginStatusUtil;
 import com.kuxuan.moneynote.utils.SPUtil;
 import com.kuxuan.moneynote.utils.Tools;
 import com.kuxuan.moneynote.utils.UIHelper;
+import com.kuxuan.sqlite.db.BillCategoreDB;
 import com.umeng.analytics.MobclickAgent;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by xieshengqi on 2017/10/30.
  */
@@ -77,9 +83,9 @@ public class LunchActivity extends Activity {
 
     private void goMain() {
 
-        boolean isInsert= (boolean) SPUtil.get(getApplicationContext(),Constant.CategoreyDBConstant.ISINSERT,false);
+        boolean isInsert = (boolean) SPUtil.get(getApplicationContext(), Constant.CategoreyDBConstant.ISINSERT, false);
 
-        if(!isInsert){
+        if (!isInsert) {
             initBillCategore();
 
         }
@@ -88,8 +94,8 @@ public class LunchActivity extends Activity {
 //            LoginStatusUtil.loginOut();
 //            EventBus.getDefault().post(new LoginOutEvent());
 //        }
-        SPUtil.remove(getApplicationContext(),Constant.IsFirstWEiChatLogin.ISWECHATNEWUSERFIRSTLOGIN);
-        if((Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN,false)&&(Boolean) SPUtil.get(this,Constant.IsFirstWEiChatLogin.IsLoginOut,false)){
+        SPUtil.remove(getApplicationContext(), Constant.IsFirstWEiChatLogin.ISWECHATNEWUSERFIRSTLOGIN);
+        if ((Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN, false) && (Boolean) SPUtil.get(this, Constant.IsFirstWEiChatLogin.IsLoginOut, false)) {
             LoginStatusUtil.loginOut();
             EventBus.getDefault().post(new LoginOutEvent());
         }
@@ -128,29 +134,30 @@ public class LunchActivity extends Activity {
 
 
     BillCategoreDaoOperator billCategoreDaoOperator;
+
     private void initBillCategore() {
 
-      billCategoreDaoOperator = BillCategoreDaoOperator.newInstance();
+        billCategoreDaoOperator = BillCategoreDaoOperator.newInstance();
 
-        String json = Tools.getJson("categore.txt",getApplicationContext());
+        String json = Tools.getJson("categore.txt", getApplicationContext());
 
         Gson gson = new Gson();
-
-        CategoryDBJson categoryDBJson = gson.fromJson(json, CategoryDBJson.class);
-
-        for(int i=0;i<=36;i++){
-
-            categoryDBJson.getSystem().get(i).setIcon("file:///android_asset/icon_"+i+".png");
-            categoryDBJson.getSystem().get(i).setSelected_icon("file:///android_asset/selected_icon_"+i+".png");
-            categoryDBJson.getSystem().get(i).setDetail_icon("file:///android_asset/detail_icon_"+i+".png");
-
+        Type tp = new TypeToken<List<BillTypeJson>>() {
+        }.getType();
+        List<BillTypeJson> categoryDBJson = gson.fromJson(json, tp);
+        List<BillCategoreDB> categoreDBS = new ArrayList<>();
+        if(categoreDBS!=null){
+        for (int i = 0; i < categoryDBJson.size(); i++) {
+            BillTypeJson billCategoreDB = categoryDBJson.get(i);
+            billCategoreDB.setIcon("file:///android_asset/icon_" + i + ".png");
+            billCategoreDB.setSelected_icon("file:///android_asset/selected_icon_" + i + ".png");
+            billCategoreDB.setDetail_icon("file:///android_asset/detail_icon_" + i + ".png");
+            categoreDBS.add(new BillCategoreDB(billCategoreDB.getId(),billCategoreDB.getCategory_type(),billCategoreDB.getIcon(),billCategoreDB.getSelected_icon(),billCategoreDB.getDetail_icon(),billCategoreDB.getName(),billCategoreDB.getType()));
         }
-
-        billCategoreDaoOperator.insertList(categoryDBJson.getSystem());
-
-        SPUtil.putAndApply(getApplicationContext(),Constant.CategoreyDBConstant.ISINSERT,true);
+        billCategoreDaoOperator.insertList(categoreDBS);
+        }
+        SPUtil.putAndApply(getApplicationContext(), Constant.CategoreyDBConstant.ISINSERT, true);
     }
 
 
-
 }

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

@@ -45,6 +45,16 @@ public class MainActivity extends BaseFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //更新版本的时候判断这个值
+        if (LoginStatusUtil.isLoginin()) {
+            if (LoginStatusUtil.getLoginUserId() == -1) {
+                //退出登录，首次离线记账
+                LoginStatusUtil.loginOut();
+            } else {
+                ServiceUtil.startDownLoadData(this);
+                ServiceUtil.startUpData(this);
+            }
+        }
 //        getTitleView(0).setTitle(getResources().getString(R.string.app_name));
         navigationLayout.setListener(new NavigationLayout.OnItemClickListener() {
             @Override
@@ -69,10 +79,8 @@ public class MainActivity extends BaseFragmentActivity {
             }
         });
         initFragments();
-        //开启上传服务
-        if (LoginStatusUtil.isLoginin()) {
-            ServiceUtil.startUpData(this);
-        }
+        //开启上传服务(更新的时候)
+
     }
 
 

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

@@ -170,6 +170,7 @@ public class AccountActivity extends MVPFragmentActivity<AccountPresenter, Accou
                 showPop();
             }
         });
+        mPresenter.setmContext(this);
 
 
         if(onLine==0) {

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

@@ -22,6 +22,7 @@ import com.kuxuan.moneynote.listener.MVPListener;
 import com.kuxuan.moneynote.ui.activitys.category.CategoryActivity;
 import com.kuxuan.moneynote.ui.adapter.AccountAdapter;
 import com.kuxuan.moneynote.utils.LoginStatusUtil;
+import com.kuxuan.moneynote.utils.NetWorkUtil;
 import com.kuxuan.moneynote.utils.UIHelper;
 import com.kuxuan.sqlite.db.CategoryDB;
 
@@ -43,6 +44,11 @@ public class AccountPresenter extends AccountContract.AccountPresent {
     int a[] = new int[]{Integer.MAX_VALUE, Integer.MAX_VALUE};
     private static final String TAG = "AccountPresenter";
 
+
+    public void setmContext(Context mContext) {
+        this.mContext = mContext;
+    }
+
     @Override
     protected void initRecyclerView(final Context context, final RecyclerView recyclerView, int type, final ClickListener mClickListener) {
         mContext = context;
@@ -124,6 +130,7 @@ public class AccountPresenter extends AccountContract.AccountPresent {
 
                 if (LoginStatusUtil.isLoginin()) {
                     //同步一下
+
                     syncForAdd();
                 } else {
                     view.hideProgress();
@@ -141,6 +148,11 @@ public class AccountPresenter extends AccountContract.AccountPresent {
 
     private void syncForUpdata(final BillBody billBody) {
         if (LoginStatusUtil.isLoginin()) {
+            if (!NetWorkUtil.isNetworkAvailable(mContext.getApplicationContext())) {
+                view.hideProgress();
+                view.setResultData(billBody);
+                return;
+            }
             final CategoryDaoOperator categoryDaoOperator = CategoryDaoOperator.newInstance();
             final ArrayList<CategoryDB> needUpdataJson = categoryDaoOperator.getNeedUpdataJson();
             String json = UpDataOperator.getInstance().getJson(needUpdataJson);
@@ -170,6 +182,11 @@ public class AccountPresenter extends AccountContract.AccountPresent {
 
     private void syncForAdd() {
         if (LoginStatusUtil.isLoginin()) {
+            if (!NetWorkUtil.isNetworkAvailable(mContext.getApplicationContext())) {
+                view.hideProgress();
+                view.finishActivity();
+                return;
+            }
             final CategoryDaoOperator categoryDaoOperator = CategoryDaoOperator.newInstance();
             final ArrayList<CategoryDB> needUpdataJson = categoryDaoOperator.getNeedUpdataJson();
             String json = UpDataOperator.getInstance().getJson(needUpdataJson);

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

@@ -23,6 +23,7 @@ import com.kuxuan.moneynote.ui.weight.CustormDialog;
 import com.kuxuan.moneynote.utils.CalanderUtil;
 import com.kuxuan.moneynote.utils.GlideUtil;
 import com.kuxuan.moneynote.utils.LoginStatusUtil;
+import com.kuxuan.moneynote.utils.NetWorkUtil;
 import com.kuxuan.moneynote.utils.TimeUtlis;
 import com.kuxuan.moneynote.utils.UIHelper;
 import com.kuxuan.sqlite.db.CategoryDB;
@@ -230,7 +231,13 @@ public class EditBillActivity extends BaseActivity {
         //在没登录的状态下是真删，否则是假删
         categoryDaoOperator.updataIsDelete(bill_db_id, true);
         if (LoginStatusUtil.isLoginin()) {
-            sync();
+            if (NetWorkUtil.isNetworkAvailable(this))
+                sync();
+            else{
+                EventBus.getDefault().post(new RefreshEvent());
+                closeProgressDialog();
+                finish();
+            }
         } else {
             categoryDaoOperator.deleteData(bill_db_id);
             EventBus.getDefault().post(new RefreshEvent());

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

@@ -19,6 +19,7 @@ import com.kuxuan.moneynote.common.Constant;
 import com.kuxuan.moneynote.db.BillCategoreDaoOperator;
 import com.kuxuan.moneynote.db.CategoryDBbean;
 import com.kuxuan.moneynote.db.CategoryDaoOperator;
+import com.kuxuan.moneynote.db.UserDBOperator;
 import com.kuxuan.moneynote.json.BaseJson;
 import com.kuxuan.moneynote.json.BeanNewJson;
 import com.kuxuan.moneynote.json.LoginJson;
@@ -276,6 +277,8 @@ public class LoginActivity extends BaseFragmentActivity {
 
     private void goToNext() {
 
+        LoginStatusUtil.loginIn();
+        UserDBOperator.getInstance().insertUserId(LoginStatusUtil.getLoginUserId());
         LoginEvent loginEvent = new LoginEvent(newUser);
         EventBus.getDefault().post(loginEvent);
         Bundle bundle = new Bundle();
@@ -346,8 +349,18 @@ public class LoginActivity extends BaseFragmentActivity {
             categoryDBbean.setCategory_id(uploadDbjson.getCategory_id());
             categoryDBbean.setDemo(uploadDbjson.getDemo());
             long time = uploadDbjson.getTime() * 1000;
-            categoryDBbean.setCreateTime(uploadDbjson.getTime());
-            categoryDBbean.setUpdateTime(uploadDbjson.getTime());
+            long create_time = uploadDbjson.getCreated_at() * 1000;
+            long updata_time = uploadDbjson.getUpdated_at() * 1000;
+            if (create_time == 0) {
+                categoryDBbean.setCreateTime(uploadDbjson.getTime());
+            } else {
+                categoryDBbean.setCreateTime(create_time);
+            }
+            if (updata_time == 0) {
+                categoryDBbean.setUpdateTime(time);
+            } else {
+                categoryDBbean.setUpdateTime(updata_time);
+            }
             String data = TimeUtlis.getData(time);
             String[] split = data.split("-");
             categoryDBbean.setYear(Integer.parseInt(split[0]));

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

@@ -305,9 +305,8 @@ public class PhoneLoginActivity extends BaseActivity {
                             Toast.makeText(getApplicationContext(), "微信登录成功", Toast.LENGTH_SHORT).show();
                         }
 
-                        goMain();
                         SPUtil.putAndApply(PhoneLoginActivity.this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN, true);
-                        EventBus.getDefault().post(new RefreshEvent());
+                        syncData(0);
                     } else {
 
                     }
@@ -379,7 +378,7 @@ public class PhoneLoginActivity extends BaseActivity {
                     LoginStatusUtil.setToken(loginJsonBaseJson.getData().getToken(), loginJsonBaseJson.getData().getId());
                     SPUtil.putAndApply(PhoneLoginActivity.this, Constant.IsFirstWEiChatLogin.ISWEICHATLOGIN, false);
                     syncData(0);
-                    goMain();
+//                    goMain();
                 } else {
                     closeProgressDialog();
                     ToastUtil.show(PhoneLoginActivity.this, loginJsonBaseJson.getError().get(0));
@@ -463,8 +462,18 @@ public class PhoneLoginActivity extends BaseActivity {
             categoryDBbean.setCategory_id(uploadDbjson.getCategory_id());
             categoryDBbean.setDemo(uploadDbjson.getDemo());
             long time = uploadDbjson.getTime() * 1000;
-            categoryDBbean.setCreateTime(uploadDbjson.getTime());
-            categoryDBbean.setUpdateTime(uploadDbjson.getTime());
+            long create_time = uploadDbjson.getCreated_at() * 1000;
+            long updata_time = uploadDbjson.getUpdated_at() * 1000;
+            if (create_time == 0) {
+                categoryDBbean.setCreateTime(uploadDbjson.getTime());
+            } else {
+                categoryDBbean.setCreateTime(create_time);
+            }
+            if (updata_time == 0) {
+                categoryDBbean.setUpdateTime(time);
+            } else {
+                categoryDBbean.setUpdateTime(updata_time);
+            }
             String data = TimeUtlis.getData(time);
             String[] split = data.split("-");
             categoryDBbean.setYear(Integer.parseInt(split[0]));

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

@@ -266,6 +266,13 @@ public class PersonActivity extends MVPFragmentActivity<PersonPresenter, PersonM
             @Override
             public void onError(ExceptionHandle.ResponeThrowable e) {
                 closeProgressDialog();
+                for (CategoryDB categoryDB : needUpdataJson) {
+                    if (categoryDB.getStatus() == 1) {
+                        categoryDaoOperator.updataIsDelete(categoryDB.getBill_id(), true);
+                    } else {
+                        categoryDaoOperator.updataNeedSynce(categoryDB.getBill_id());
+                    }
+                }
                 LoginStatusUtil.loginOut();
                 EventBus.getDefault().post(new LoginOutEvent());
                 finish();

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

@@ -71,9 +71,9 @@ public class DetialAdapter extends BaseQuickAdapter<TypeDataJson, DetialViewHold
             }
 
             if (item.getType() == 2) {
-                helper.mingxi_text.setText("-" + item.getAccount());
+                helper.mingxi_text.setText("-" + JavaFormatUtils.formatFloatNumber(Double.parseDouble(item.getAccount())));
             } else {
-                helper.mingxi_text.setText(item.getAccount()+ "");
+                helper.mingxi_text.setText(JavaFormatUtils.formatFloatNumber(Double.parseDouble(item.getAccount())));
             }
             GlideUtil.setImageWithNoCache(mContext, item.getSmall_icon(), helper.imageView);
         } else {
@@ -82,7 +82,6 @@ public class DetialAdapter extends BaseQuickAdapter<TypeDataJson, DetialViewHold
 
     }
 
-
     @Override
     public int getItemCount() {
         return getData().size();

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

@@ -69,21 +69,23 @@ public class ReportAdapter extends BaseQuickAdapter<ReportJson, ReportViewHolder
             type = typeDataJson.getType();
             switch (type) {
                 case 2:
-                    item.setOutmoney((long) Float.parseFloat(typeDataJson.getAccount()));
-                    data = JavaFormatUtils.getData(item.getOutmoney() / item.getAllMoney() * 100);
-                    helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount()))+ "");
-                    helper.progressBar.setProgress(Math.round(item.getOutmoney() * 100 / item.getAllMoney()));
+                    double x= item.getAllMoney()*100;
+                   double fenzi =  item.getOutmoney()*100;
+                    data = JavaFormatUtils.getData((fenzi/x)*100);
+                    helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount())) + "");
+                    helper.progressBar.setProgress((int) Math.round(item.getOutmoney() * 100 / item.getAllMoney()));
                     break;
                 case 1:
-                    item.setInmoney((long) Float.parseFloat(typeDataJson.getAccount()));
-                    data = JavaFormatUtils.getData(item.getInmoney() / item.getAllMoney() * 100);
+                    double x1= item.getAllMoney()*100 ;
+                    double fenz = item.getInmoney()*100;
+                    data = JavaFormatUtils.getData((fenz/x1)*100);
 //                    JavaFormatUtils.formatFloatNumber(Float.parseFloat(typeDataJson.getAccount())
-                    helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount()))+ "");
-                    helper.progressBar.setProgress(Math.round(item.getInmoney() * 100 / item.getAllMoney()));
+                    helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount())) + "");
+                    helper.progressBar.setProgress((int) Math.round(item.getInmoney() * 100 / item.getAllMoney()));
                     break;
             }
-                helper.name_text.setText(typeDataJson.getName() + "  " + data + "%");
-            GlideUtil.setImageWithNoCache(mContext,typeDataJson.getSmall_icon(),helper.imageView);
+            helper.name_text.setText(typeDataJson.getName() + "  " + data + "%");
+            GlideUtil.setImageWithNoCache(mContext, typeDataJson.getSmall_icon(), helper.imageView);
         } else {
             helper.time_text.setVisibility(View.VISIBLE);
             String data = "";
@@ -91,41 +93,40 @@ public class ReportAdapter extends BaseQuickAdapter<ReportJson, ReportViewHolder
             type = typeDataJson.getType();
             switch (type) {
                 case 2:
-                    item.setOutmoney((long) Float.parseFloat(typeDataJson.getAccount()));
-                    float f = item.getOutmoney() / item.getAllMoney();
+                    double f = item.getOutmoney() / item.getAllMoney();
                     data = JavaFormatUtils.getData(f * 100);
                     helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount())) + "");
-                    helper.progressBar.setProgress(Math.round(item.getOutmoney() * 100 / item.getAllMoney()));
+                    helper.progressBar.setProgress((int) Math.round(item.getOutmoney() * 100 / item.getAllMoney()));
                     break;
                 case 1:
-                    item.setInmoney((long)Float.parseFloat(typeDataJson.getAccount()));
                     data = JavaFormatUtils.getData(item.getInmoney() / item.getAllMoney() * 100);
-                    helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount()))+ "");
-                    helper.progressBar.setProgress(Math.round(item.getInmoney() * 100 / item.getAllMoney()));
+                    helper.money_text.setText(changeFloatData(Double.parseDouble(typeDataJson.getAccount())) + "");
+                    helper.progressBar.setProgress((int) Math.round(item.getInmoney() * 100 / item.getAllMoney()));
                     break;
             }
             String day = typeDataJson.getDay();
             String[] split = day.split("-");
-            GlideUtil.setImageWithNoCache(mContext,typeDataJson.getSmall_icon(),helper.imageView);
-            helper.time_text.setText(split[0]+"年"+split[1]+"月"+split[2]+"日");
+            GlideUtil.setImageWithNoCache(mContext, typeDataJson.getSmall_icon(), helper.imageView);
+            helper.time_text.setText(split[0] + "年" + split[1] + "月" + split[2] + "日");
             String demo = typeDataJson.getDemo();
-            if(TextUtils.isEmpty(demo))
-            helper.name_text.setText(typeDataJson.getName() + "  " + data + "%");
+            if (TextUtils.isEmpty(demo))
+                helper.name_text.setText(typeDataJson.getName() + "  " + data + "%");
             else
                 helper.name_text.setText(demo + "  " + data + "%");
         }
 
         int layoutPosition = helper.getLayoutPosition();
-        if(layoutPosition==getData().size()-1){
+        if (layoutPosition == getData().size() - 1) {
             helper.line_View.setVisibility(View.GONE);
-        }else{
+        } else {
             helper.line_View.setVisibility(View.VISIBLE);
         }
     }
 
 
-    private String changeFloatData(double account){
-        java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
-        return df.format(account);
+    private String changeFloatData(double account) {
+        return String.format("%.2f", account);
+//        java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
+//        return df.format(account);
     }
 }

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

@@ -149,8 +149,8 @@ public class DetialDBOpertor {
             typeDataJson.setType(list.get(i).getType());
             typeDataJson.setDetail_icon(list.get(i).getImage_path());
             typeDataJson.setSmall_icon(list.get(i).getImage_path());
-            java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
-            typeDataJson.setAccount( df.format(list.get(i).getAccount()) + "");
+//            java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
+            typeDataJson.setAccount(list.get(i).getAccount() + "");
             typeDataJson.setName(list.get(i).getName());
             typeDataJson.setDemo(list.get(i).getDemo());
             datas.add(typeDataJson);

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

@@ -31,6 +31,13 @@ import java.util.HashMap;
 import java.util.List;
 
 import cn.addapp.pickers.picker.DatePicker;
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by xieshengqi on 2017/10/19.
@@ -226,17 +233,43 @@ public class DetialPresent extends DetialContract.DetialPresent implements View.
     }
 
     @Override
-    void getDataLists(String year, String month) {
-            db_maps = CategoryDaoOperator.newInstance().getMaxAndMinTimeForUserId(-1);
-        currentYear = Integer.parseInt(year);
-        currentMonth = Integer.parseInt(month);
-// TODO: 2018/4/3 需要做没有网络和有网络的处理
-//        if(NetWorkUtil.isNetworkAvailable(mContext)){
-//            //有网
-//        }else{
-//            //没网
-//        }
-        getDataForDB(year, month, db_maps);
+    void getDataLists(final String year, final String month) {
+        Observable.create(new ObservableOnSubscribe<HashMap<String, Integer>>() {
+            @Override
+            public void subscribe(ObservableEmitter<HashMap<String, Integer>> e) throws Exception {
+                db_maps = CategoryDaoOperator.newInstance().getMaxAndMinTimeForUserId(-1);
+                e.onNext(db_maps);
+                e.onComplete();
+            }
+        }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<HashMap<String, Integer>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+
+            }
+
+            @Override
+            public void onNext(HashMap<String, Integer> stringIntegerHashMap) {
+                currentYear = Integer.parseInt(year);
+                currentMonth = Integer.parseInt(month);
+                getDataForDB(year, month, stringIntegerHashMap);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                currentYear = Integer.parseInt(year);
+                currentMonth = Integer.parseInt(month);
+                getDataForDB(year, month, db_maps);
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+        });
+
+
+
+
 //        mModel.getDataLists(year, month, new MVPListener<UserAllBillJson>() {
 //            @Override
 //            public void onSuccess(UserAllBillJson content) {
@@ -271,6 +304,7 @@ public class DetialPresent extends DetialContract.DetialPresent implements View.
             @Override
             public void onFail(String msg) {
                 view.finishRefresh();
+                view.showContentLayout();
                 if (msg.equals("网络错误")) {
                     view.showError();
                 } else if (msg.equals("网络连接失败，请检测网络")) {
@@ -304,7 +338,7 @@ public class DetialPresent extends DetialContract.DetialPresent implements View.
             case R.id.fragment_detial_month:
                 //日期选择器
 //                if (isLogin)
-                    showYearAndMonth();
+                showYearAndMonth();
                 break;
         }
     }
@@ -334,8 +368,8 @@ public class DetialPresent extends DetialContract.DetialPresent implements View.
                     BillData billData = bill_data.get(i);
                     List<TypeDataJson> day_data = billData.getDay_data();
                     if (day_data != null) {
-                        for (int j = day_data.size()-1; j>=0; j--) {
-                            if (j == day_data.size()-1) {
+                        for (int j = day_data.size() - 1; j >= 0; j--) {
+                            if (j == day_data.size() - 1) {
                                 day_data.get(j).setFirst(true);
                             }
                             day_data.get(j).setDay_type(billData.getTime());

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

@@ -315,7 +315,7 @@ public class ReportSingleDBOpertor {
         }
         timeDataJson.setData(data);
         if (account > 0) {
-            timeDataJson.setAccount((int) account);
+            timeDataJson.setAccount( account);
             return timeDataJson;
         } else {
             return null;
@@ -350,7 +350,7 @@ public class ReportSingleDBOpertor {
         }
         timeDataJson.setData(data);
         if (account > 0) {
-            timeDataJson.setAccount((int) account);
+            timeDataJson.setAccount(account);
             return timeDataJson;
         } else {
             return null;
@@ -386,7 +386,7 @@ public class ReportSingleDBOpertor {
         }
         timeDataJson.setData(data);
         if (account > 0) {
-            timeDataJson.setAccount((int) account);
+            timeDataJson.setAccount( account);
             return timeDataJson;
         } else {
             return null;

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

@@ -277,6 +277,7 @@ public class ReportSingleFragment extends MVPFragment<ReportSinglePresent, Repor
     private void showPop() {
         if (popupWindow == null) {
             popupWindow = new MoneyChoosePop(getActivity());
+            popupWindow.setType(mType);
             popupWindow.setOnPopClickListener(new MoneyChoosePop.OnPopClickListener() {
                 @Override
                 public void onClick(int type) {

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

@@ -16,7 +16,12 @@ import com.kuxuan.moneynote.listener.MVPListener;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
 /**
@@ -100,39 +105,95 @@ public class ReportSingleModel implements ReportSingleContract.RepModel {
     }
 
     @Override
-    public void getDataCatgoryForDB(int statistic_type, int type, int category_id, CategoryDaoOperator categoryDaoOperator, NewChartData newChartData, MVPListener<NewCategoryJson> listener) {
-        NewCategoryJson categoryJson;
-        if (statistic_type == 1) {
-            //周：
-            categoryJson = ReportSingleDBOpertor.getInstance().getWeekNewCategoryJson((ArrayList<String>) newChartData.getTime_range(), categoryDaoOperator, category_id, type);
-        } else if (statistic_type == 2) {
-            //月
-            categoryJson = ReportSingleDBOpertor.getInstance().getMonthNewCategoryJson(Integer.parseInt(newChartData.getYear()), Integer.parseInt(newChartData.getMonth()), categoryDaoOperator, type, category_id);
-        } else {
-            //年
-            categoryJson = ReportSingleDBOpertor.getInstance().getYearNewCategoryJson(Integer.parseInt(newChartData.getYear()), categoryDaoOperator, type, category_id);
-        }
-        listener.onSuccess(categoryJson);
+    public void getDataCatgoryForDB(final int statistic_type, final int type, final int category_id, final CategoryDaoOperator categoryDaoOperator, final NewChartData newChartData, final MVPListener<NewCategoryJson> listener) {
+        Observable<NewCategoryJson> observable = Observable.create(new ObservableOnSubscribe<NewCategoryJson>() {
+            @Override
+            public void subscribe(ObservableEmitter<NewCategoryJson> e) throws Exception {
+                NewCategoryJson categoryJson;
+                if (statistic_type == 1) {
+                    //周：
+                    categoryJson = ReportSingleDBOpertor.getInstance().getWeekNewCategoryJson((ArrayList<String>) newChartData.getTime_range(), categoryDaoOperator, category_id, type);
+                } else if (statistic_type == 2) {
+                    //月
+                    categoryJson = ReportSingleDBOpertor.getInstance().getMonthNewCategoryJson(Integer.parseInt(newChartData.getYear()), Integer.parseInt(newChartData.getMonth()), categoryDaoOperator, type, category_id);
+                } else {
+                    //年
+                    categoryJson = ReportSingleDBOpertor.getInstance().getYearNewCategoryJson(Integer.parseInt(newChartData.getYear()), categoryDaoOperator, type, category_id);
+                }
+                e.onNext(categoryJson);
+                e.onComplete();
+            }
+        });
+        observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<NewCategoryJson>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+
+            }
+
+            @Override
+            public void onNext(NewCategoryJson newCategoryJson) {
+                listener.onSuccess(newCategoryJson);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+        });
+
 
     }
 
     @Override
-    public void getDataForDB(HashMap<String, Integer> db_maps, int statis_type, int type, MVPListener<ArrayList<NewChartData>> listener) {
-        ArrayList<NewChartData> weekTabDatas;
-        //周
-        if (statis_type == 1) {
-            weekTabDatas = ReportSingleDBOpertor.getInstance().getWeekTabData(db_maps, statis_type);
-        }//月
-        else if (statis_type == 2) {
-            weekTabDatas = ReportSingleDBOpertor.getInstance().getMonthTabData(db_maps, statis_type);
-        }
-        //年
-        else if (statis_type == 3) {
-            weekTabDatas = ReportSingleDBOpertor.getInstance().getYearTabData(db_maps, statis_type);
-        } else {
-            weekTabDatas = null;
-        }
-        listener.onSuccess(weekTabDatas);
+    public void getDataForDB(final HashMap<String, Integer> db_maps, final int statis_type, final int type, final MVPListener<ArrayList<NewChartData>> listener) {
+        Observable<ArrayList<NewChartData>> observable = Observable.create(new ObservableOnSubscribe<ArrayList<NewChartData>>() {
+            @Override
+            public void subscribe(ObservableEmitter<ArrayList<NewChartData>> e) throws Exception {
+                ArrayList<NewChartData> weekTabDatas;
+                //周
+                if (statis_type == 1) {
+                    weekTabDatas = ReportSingleDBOpertor.getInstance().getWeekTabData(db_maps, statis_type);
+                }//月
+                else if (statis_type == 2) {
+                    weekTabDatas = ReportSingleDBOpertor.getInstance().getMonthTabData(db_maps, statis_type);
+                }
+                //年
+                else if (statis_type == 3) {
+                    weekTabDatas = ReportSingleDBOpertor.getInstance().getYearTabData(db_maps, statis_type);
+                } else {
+                    weekTabDatas = null;
+                }
+                e.onNext(weekTabDatas);
+            }
+        });
+        observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<ArrayList<NewChartData>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+
+            }
+
+            @Override
+            public void onNext(ArrayList<NewChartData> newChartData) {
+                listener.onSuccess(newChartData);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+        });
+
+
     }
 
 

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

@@ -39,6 +39,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.WeakHashMap;
 
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+
 import static com.kuxuan.moneynote.utils.CalanderUtil.getMonthDay;
 
 /**
@@ -303,7 +311,7 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
      *
      * @param statis_type
      */
-    private void getDataForDB(int statis_type, int type) {
+    private void getDataForDB(final int statis_type, final int type) {
         if (categoryDaoOperator == null) {
             categoryDaoOperator = CategoryDaoOperator.newInstance();
             categoryDaoOperator.setOnDBChangeListener(new CategoryDaoOperator.OnDBChangeListener() {
@@ -324,14 +332,61 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
             });
         }
 //        if (db_maps == null) {
-        db_maps = categoryDaoOperator.getMaxAndMinTime(moneyType, catrogy_id);
+//        db_maps = categoryDaoOperator.getMaxAndMinTime(moneyType, catrogy_id);
+////        }
+//        if (db_maps == null) {
+////            view.hideProgress();
+//            view.showNoDBdata();
+//            return;
 //        }
-        if (db_maps == null) {
-//            view.hideProgress();
-            view.showNoDBdata();
-            return;
-        }
 
+
+        Observable<HashMap<String, Integer>> observable = io.reactivex.Observable.create(new ObservableOnSubscribe<HashMap<String, Integer>>() {
+            @Override
+            public void subscribe(ObservableEmitter<HashMap<String, Integer>> e) throws Exception {
+                db_maps = categoryDaoOperator.getMaxAndMinTime(moneyType, catrogy_id);
+                if (db_maps != null) {
+                    e.onNext(db_maps);
+                    e.onComplete();
+                } else {
+                    e.onError(new Throwable());
+                }
+            }
+        });
+        observable.observeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<HashMap<String, Integer>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+
+            }
+
+            @Override
+            public void onNext(HashMap<String, Integer> stringIntegerHashMap) {
+                getRealDataForDB(statis_type, type);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                view.showContentLayout();
+                view.showNoDBdata();
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+        });
+
+
+    }
+
+
+    /**
+     * 获取数据
+     *
+     * @param statis_type
+     * @param type
+     */
+    private void getRealDataForDB(int statis_type, int type) {
         mModel.getDataForDB(db_maps, statis_type, type, new MVPListener<ArrayList<NewChartData>>() {
             @Override
             public void onSuccess(ArrayList<NewChartData> content) {
@@ -351,7 +406,6 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
         });
     }
 
-
     /**
      * 判断是否需要刷新网络
      *
@@ -835,12 +889,12 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
                     ReportJson reportJson = new ReportJson();
                     if (moneyType == 2) {
                         reportJson.setOut(true);
-                        reportJson.setOutmoney((long) Float.parseFloat(category_data.get(i).getAccount()));
+                        reportJson.setOutmoney(Double.parseDouble(category_data.get(i).getAccount()));
                     } else {
                         reportJson.setOut(false);
-                        reportJson.setInmoney((long) Float.parseFloat(category_data.get(i).getAccount()));
+                        reportJson.setInmoney(Double.parseDouble(category_data.get(i).getAccount()));
                     }
-                    reportJson.setAllMoney((long) Float.parseFloat(chartData.getAccount()));
+                    reportJson.setAllMoney(Double.parseDouble(chartData.getAccount()));
                     reportJson.setTag(category_data.get(i));
                     reportJsons.add(reportJson);
                 }
@@ -853,12 +907,12 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
                     ReportJson reportJson = new ReportJson();
                     if (moneyType == 2) {
                         reportJson.setOut(true);
-                        reportJson.setOutmoney((long) Float.parseFloat(category_data.get(i).getAccount()));
+                        reportJson.setOutmoney(Double.parseDouble(category_data.get(i).getAccount()));
                     } else {
                         reportJson.setOut(false);
-                        reportJson.setInmoney((long) Float.parseFloat(category_data.get(i).getAccount()));
+                        reportJson.setInmoney(Double.parseDouble(category_data.get(i).getAccount()));
                     }
-                    reportJson.setAllMoney((long) Float.parseFloat(chartData.getAccount()));
+                    reportJson.setAllMoney(Double.parseDouble(chartData.getAccount()));
                     reportJson.setTag(category_data.get(i));
                     reportJsons.add(reportJson);
                 }
@@ -866,7 +920,7 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
         }
 //        Log.e("List排序前的集合", reportJsons.toString());
 //        //排序
-//        Collections.sort(reportJsons);
+        Collections.sort(reportJsons);
 //        Log.e("List排序后的集合", reportJsons.toString());
         adapter.setNewData(reportJsons);
     }
@@ -1077,7 +1131,7 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
         }
         for (TimeDataJson dataJson : list) {
             if (key.equals(dataJson.getTime())) {
-                y = dataJson.getAccount();
+                y = (float) dataJson.getAccount();
                 break;
             }
         }
@@ -1093,7 +1147,7 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
      * @return
      */
     private float getYvalueForYear(String key, List<TimeDataJson> list) {
-        float y = 0;
+        double y = 0;
         if (list == null) {
             return 0;
         }
@@ -1102,6 +1156,6 @@ public class ReportSinglePresent extends ReportSingleContract.RepPresent {
                 y += dataJson.getAccount();
             }
         }
-        return y;
+        return (float) y;
     }
 }

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

@@ -17,6 +17,7 @@ import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.json.PopCharData;
 import com.kuxuan.moneynote.utils.DisplayUtil;
 import com.kuxuan.moneynote.utils.GlideUtil;
+import com.kuxuan.moneynote.utils.JavaFormatUtils;
 
 import java.util.ArrayList;
 
@@ -99,7 +100,7 @@ public class ChartPop extends PopupWindow {
         // 设置SelectPicPopupWindow弹出窗体可点击
         this.setFocusable(true);
         // 实例化一个ColorDrawable颜色为半透明
-        final ColorDrawable dw = new ColorDrawable(Color.TRANSPARENT);
+        ColorDrawable dw = new ColorDrawable(Color.TRANSPARENT);
         // 设置SelectPicPopupWindow弹出窗体的背景
         this.setBackgroundDrawable(dw);
         this.setOutsideTouchable(true);
@@ -119,10 +120,12 @@ public class ChartPop extends PopupWindow {
             return false;
         }
         for (int i = 0; i < list.size(); i++) {
-            View view = getView(list.get(i));
-            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-            view.setLayoutParams(params);
-            viewLayout.addView(view);
+            if (i < 3) {
+                View view = getView(list.get(i));
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+                view.setLayoutParams(params);
+                viewLayout.addView(view);
+            }
         }
         return true;
 
@@ -136,14 +139,17 @@ public class ChartPop extends PopupWindow {
         ImageView image = childView.findViewById(R.id.item_chartpop_image);
         if (type == 1) {
         }
-        time.setText(charData.getTime());
+        //格式为18/03/01之前格式为2018/03/01
+        String substring = charData.getTime().substring(2, charData.getTime().length());
+        time.setText(substring);
         name.setText(charData.getName());
-        count.setText(charData.getAccount());
+        count.setText(JavaFormatUtils.formatFloatNumber(Double.parseDouble(charData.getAccount())));
         GlideUtil.setImageWithNoCache(mContext, charData.getSmall_icon(), image);
         return childView;
     }
 
 
+
     /**
      * 设置位置
      *
@@ -152,7 +158,7 @@ public class ChartPop extends PopupWindow {
      * @param y
      */
     public void setParamsForLayout(int fixY, float x, float y) {
-        int allY = (int) (fixY  + y);
+        int allY = (int) (fixY + y);
         int leftMargin = -DisplayUtil.dip2px(4);
         int left;
         RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) linearLayout.getLayoutParams();

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

@@ -103,15 +103,27 @@ public class MoneyChoosePop extends PopupWindow {
             }
         });
 
-        bgView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dismiss();
-            }
-        });
+            bgView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    dismiss();
+                }
+            });
+        }
+
+
+    public void setType(int type) {
+        initImage();
+        this.type = type;
+        if (type == 1) {
+            this.type = SHOURU;
+            image_shouru.setVisibility(View.VISIBLE);
+        } else {
+            this.type = ZHICHU;
+            image_zhichu.setVisibility(View.VISIBLE);
+        }
     }
 
-
     @Override
     public void showAsDropDown(View anchor) {
         super.showAsDropDown(anchor);

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

@@ -17,9 +17,9 @@ public class CalanderUtil {
 
 
     public static void main(String[] args) {
-//        ArrayList<String> weekTab = getWeekTab(2017, 5, 10, 2018, 3, 10);
+        ArrayList<String> weekTab = getWeekTab(2015, 12, 31, 2016, 1, 5);
 //        ArrayList<String> monthTab = getMonthTab(2017, 11, 2018, 3);
-//        System.out.println(monthTab.toString());
+        System.out.println(weekTab.toString());
 //        ArrayList<String> yearTab = getYearTab(2014, 2018);
 //        System.out.print(yearTab.toString());
 //        String[] weekAllDay = getWeekAllDay(2016, 53);
@@ -48,18 +48,37 @@ public class CalanderUtil {
      */
     public static int getWeek(String date) {
         Calendar cal = Calendar.getInstance();
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         try {
             cal.setTime(format.parse(date));
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        cal.setFirstDayOfWeek(Calendar.MONDAY);
         int week = cal.get(Calendar.WEEK_OF_YEAR);
         return week;
     }
 
     /**
+     * 获取月
+     *
+     * @param date
+     * @return
+     */
+    public static int getMonth(String date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            cal.setTime(format.parse(date));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        int month = cal.get(Calendar.MONTH);
+        return month;
+    }
+
+    /**
      * 得到某一天是这周的第几天
      *
      * @param date
@@ -308,12 +327,37 @@ public class CalanderUtil {
         int month = startMonth;
         int day = getDayForWeek(data);
         //先添加一个最开始的数据
-        tabLists.add(getData(year, month, startDay));
+//        tabLists.add(getData(year, month, startDay));
         count = 0;
         int indexCount = 7 - day;
+        //从周一开始循环
+        allDayCount = allDayCount + day;
+//        day = startDay;
+        int index = day;
         day = startDay;
-        int c1 = 0;
-        while (count < allDayCount) {
+        for (int i = index; i > 1; i--) {
+            if (day == 1) {
+                if (month == 1) {
+                    month = 12;
+                    day = 31;
+                    year--;
+                } else {
+                    month--;
+                    day = getMonthDay(year, month);
+                }
+            } else {
+                day--;
+            }
+        }
+        int c1 = 6;
+        while (count < (allDayCount - 1)) {
+            if (c1 == 6) {
+                //算一个周期
+                c1 = 0;
+                tabLists.add(getData(year, month, day));
+            } else {
+                c1++;
+            }
             //获取一个月有多少天
             int monthDay = getMonthDay(year, month);
             if (day == monthDay) {
@@ -327,40 +371,19 @@ public class CalanderUtil {
             } else {
                 day++;
             }
-            if (count >= indexCount) {
-                if (c1 == 6) {
-                    //算一个周期
-                    c1 = 0;
-                    tabLists.add(getData(year, month, day));
-                } else {
-
-                    c1++;
-                }
-            }
-            count++;
             if (count == allDayCount - 1) {
                 //如果为最后一位
                 if (c1 > 0) {
-//                    int monthDay1 = getMonthDay(year, month);
-//                    if (day == monthDay1) {
-//                        day = 1;
-//                        if (month == 12) {
-//                            year++;
-//                            month = 1;
-//                        } else {
-//                            month++;
-//                        }
+//                    if (c1 >= 3) {
+                    tabLists.add(getData(year, month, day));
+
 //                    } else {
-//                        day++;
+//                        tabLists.add(getData(year, month, day, c1));
 //                    }
-                    if (c1 >= 3) {
-                        tabLists.add(getData(year, month, day));
-
-                    } else {
-                        tabLists.add(getData(year, month, day, c1));
-                    }
                 }
             }
+            count++;
+
         }
         return tabLists;
     }
@@ -445,31 +468,46 @@ public class CalanderUtil {
      * @return
      */
     private static String getData(int year, int month, int day) {
-        int week_day = getDayForWeek(year + "-" + month + "-" + day);
-        if (week_day > 3) {
-            for (int i = 3; i > 0; i--) {
-                if (day == 1) {
-                    if (month == 1) {
-                        month = 12;
-                        day = 31;
-                        year--;
-                    } else {
-                        month--;
-                        day = CalanderUtil.getMonthDay(year, month);
-                    }
-                } else {
-                    day--;
-                }
-            }
-        }
+        int startYear = year;
+//        int week_day = getDayForWeek(year + "-" + month + "-" + day);
+//        if (week_day == 7 && (day == 31 || day == 1) && (month == 12 || month == 10)) {
+//
+//        } else {
+//            if (week_day > 3) {
+//                for (int i = 3; i > 0; i--) {
+//                    if (day == 1) {
+//                        if (month == 1) {
+//                            month = 12;
+//                            day = 31;
+//                            year--;
+//                        } else {
+//                            month--;
+//                            day = CalanderUtil.getMonthDay(year, month);
+//                        }
+//                    } else {
+//                        day--;
+//                    }
+//                }
+//            }
+//        }
+
 
         int week = getWeek(year + "-" + String.format("%02d", month) + "-" + String.format("%02d", day));
-        if (month >= 11 && week <= 1) {
+        int mo = getMonth(year + "-" + String.format("%02d", month) + "-" + String.format("%02d", day));
+        if (mo >= 11 && week <= 1&&getDayForWeek(year+"-12"+"-31")==7) {
             week += 52;
+        }else if(month==12&&week==1&&getDayForWeek(year+"-12"+"-31")!=7){
+            year++;
         }
+//        if (month == 12 && week == 1) {
+//            year++;
+//        }
         if (isCurrentYear(year)) {
             return String.format("%02d", week) + "周";
         }
+//        if (month == 12 && week == 1) {
+//            return (year + 1) + "-" + String.format("%02d", week) + "周";
+//        }
         return year + "-" + String.format("%02d", week) + "周";
     }
 
@@ -482,7 +520,7 @@ public class CalanderUtil {
                     year--;
                 } else {
                     month--;
-                    day =CalanderUtil.getMonthDay(year,month);
+                    day = CalanderUtil.getMonthDay(year, month);
                 }
             } else {
                 day--;

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

@@ -12,17 +12,21 @@ public class JavaFormatUtils  {
         DecimalFormat df = new DecimalFormat("0.00");
        return df.format(d);
     }
+    public static String getData(double d){
+        DecimalFormat df = new DecimalFormat("0.00");
+        return df.format(d);
+    }
     public static String getDataForTwo(float d){
         DecimalFormat df = new DecimalFormat("0.00");
         return df.format(d);
     }
     public static String formatFloatNumber(double value) {
-        if(value != 0.00){
-            java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
-            return df.format(value);
-        }else{
-            return "0.00";
-        }
-
+//        if(value != 0.00){
+//            java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
+//            return df.format(value);
+//        }else{
+//            return "0.00";
+//        }
+       return String.format("%.2f", value);
     }
 }

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

@@ -50,7 +50,7 @@ public class TimeUtlis {
     /**
      * yyyy-MM-dd HH:mm:ss
      */
-    public static final String TIME_FORMAT_FOUR = "yyyy-MM-dd hh:mm:ss";
+    public static final String TIME_FORMAT_FOUR = "yyyy-MM-dd HH:mm:ss";
     public static final String TIME_FORMAT_FOUR1 = "yyyy/MM/dd hh:mm:ss";
     /**
      * yyyy-MM-dd HH:mm:ss.SSSZ

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

@@ -2,6 +2,7 @@ package com.kuxuan.moneynote.utils;
 
 import android.content.Context;
 import android.content.res.AssetManager;
+import android.util.Log;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,6 +29,7 @@ public class Tools {
                 stringBuilder.append(line);
             }
         } catch (IOException e) {
+            Log.e("beginjson",e.toString());
             e.printStackTrace();
         }
         return stringBuilder.toString();

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

@@ -43,7 +43,7 @@
         android:id="@+id/pop_chart_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-
+        android:scaleType="fitXY"
         android:src="@mipmap/chart_marker_pointer_bg" />
 
 </RelativeLayout>

build.gradle

@@ -25,8 +25,8 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 ext{
-    versionCode = 9
-    versionName = "1.4.2"
+    versionCode = 10
+    versionName = "1.5.0"
     minSdkVersion = 18
     targetSdkVersion = 22
     compileSdkVersion = 26