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

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

@@ -29,14 +29,15 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
         public final static Property Demo = new Property(2, String.class, "demo", false, "DEMO");
         public final static Property Name = new Property(3, String.class, "name", false, "NAME");
         public final static Property Type = new Property(4, int.class, "type", false, "TYPE");
-        public final static Property Account = new Property(5, long.class, "account", false, "ACCOUNT");
-        public final static Property Category_id = new Property(6, int.class, "category_id", false, "CATEGORY_ID");
-        public final static Property Year = new Property(7, int.class, "year", false, "YEAR");
-        public final static Property Month = new Property(8, int.class, "month", false, "MONTH");
-        public final static Property Day = new Property(9, int.class, "day", false, "DAY");
-        public final static Property CreateTime = new Property(10, long.class, "createTime", false, "CREATE_TIME");
-        public final static Property UpdateTime = new Property(11, long.class, "updateTime", false, "UPDATE_TIME");
-        public final static Property User_id = new Property(12, int.class, "user_id", false, "USER_ID");
+        public final static Property Image_path = new Property(5, String.class, "image_path", false, "IMAGE_PATH");
+        public final static Property Account = new Property(6, long.class, "account", false, "ACCOUNT");
+        public final static Property Category_id = new Property(7, int.class, "category_id", false, "CATEGORY_ID");
+        public final static Property Year = new Property(8, int.class, "year", false, "YEAR");
+        public final static Property Month = new Property(9, int.class, "month", false, "MONTH");
+        public final static Property Day = new Property(10, int.class, "day", false, "DAY");
+        public final static Property CreateTime = new Property(11, long.class, "createTime", false, "CREATE_TIME");
+        public final static Property UpdateTime = new Property(12, long.class, "updateTime", false, "UPDATE_TIME");
+        public final static Property User_id = new Property(13, int.class, "user_id", false, "USER_ID");
     }
 
 
@@ -57,14 +58,15 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
                 "\"DEMO\" TEXT," + // 2: demo
                 "\"NAME\" TEXT," + // 3: name
                 "\"TYPE\" INTEGER NOT NULL ," + // 4: type
-                "\"ACCOUNT\" INTEGER NOT NULL ," + // 5: account
-                "\"CATEGORY_ID\" INTEGER NOT NULL ," + // 6: category_id
-                "\"YEAR\" INTEGER NOT NULL ," + // 7: year
-                "\"MONTH\" INTEGER NOT NULL ," + // 8: month
-                "\"DAY\" INTEGER NOT NULL ," + // 9: day
-                "\"CREATE_TIME\" INTEGER NOT NULL ," + // 10: createTime
-                "\"UPDATE_TIME\" INTEGER NOT NULL ," + // 11: updateTime
-                "\"USER_ID\" INTEGER NOT NULL );"); // 12: user_id
+                "\"IMAGE_PATH\" TEXT," + // 5: image_path
+                "\"ACCOUNT\" INTEGER NOT NULL ," + // 6: account
+                "\"CATEGORY_ID\" INTEGER NOT NULL ," + // 7: category_id
+                "\"YEAR\" INTEGER NOT NULL ," + // 8: year
+                "\"MONTH\" INTEGER NOT NULL ," + // 9: month
+                "\"DAY\" INTEGER NOT NULL ," + // 10: day
+                "\"CREATE_TIME\" INTEGER NOT NULL ," + // 11: createTime
+                "\"UPDATE_TIME\" INTEGER NOT NULL ," + // 12: updateTime
+                "\"USER_ID\" INTEGER NOT NULL );"); // 13: user_id
     }
 
     /** Drops the underlying database table. */
@@ -97,14 +99,19 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
             stmt.bindString(4, name);
         }
         stmt.bindLong(5, entity.getType());
-        stmt.bindLong(6, entity.getAccount());
-        stmt.bindLong(7, entity.getCategory_id());
-        stmt.bindLong(8, entity.getYear());
-        stmt.bindLong(9, entity.getMonth());
-        stmt.bindLong(10, entity.getDay());
-        stmt.bindLong(11, entity.getCreateTime());
-        stmt.bindLong(12, entity.getUpdateTime());
-        stmt.bindLong(13, entity.getUser_id());
+ 
+        String image_path = entity.getImage_path();
+        if (image_path != null) {
+            stmt.bindString(6, image_path);
+        }
+        stmt.bindLong(7, entity.getAccount());
+        stmt.bindLong(8, entity.getCategory_id());
+        stmt.bindLong(9, entity.getYear());
+        stmt.bindLong(10, entity.getMonth());
+        stmt.bindLong(11, entity.getDay());
+        stmt.bindLong(12, entity.getCreateTime());
+        stmt.bindLong(13, entity.getUpdateTime());
+        stmt.bindLong(14, entity.getUser_id());
     }
 
     @Override
@@ -131,14 +138,19 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
             stmt.bindString(4, name);
         }
         stmt.bindLong(5, entity.getType());
-        stmt.bindLong(6, entity.getAccount());
-        stmt.bindLong(7, entity.getCategory_id());
-        stmt.bindLong(8, entity.getYear());
-        stmt.bindLong(9, entity.getMonth());
-        stmt.bindLong(10, entity.getDay());
-        stmt.bindLong(11, entity.getCreateTime());
-        stmt.bindLong(12, entity.getUpdateTime());
-        stmt.bindLong(13, entity.getUser_id());
+ 
+        String image_path = entity.getImage_path();
+        if (image_path != null) {
+            stmt.bindString(6, image_path);
+        }
+        stmt.bindLong(7, entity.getAccount());
+        stmt.bindLong(8, entity.getCategory_id());
+        stmt.bindLong(9, entity.getYear());
+        stmt.bindLong(10, entity.getMonth());
+        stmt.bindLong(11, entity.getDay());
+        stmt.bindLong(12, entity.getCreateTime());
+        stmt.bindLong(13, entity.getUpdateTime());
+        stmt.bindLong(14, entity.getUser_id());
     }
 
     @Override
@@ -154,14 +166,15 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
             cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // demo
             cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // name
             cursor.getInt(offset + 4), // type
-            cursor.getLong(offset + 5), // account
-            cursor.getInt(offset + 6), // category_id
-            cursor.getInt(offset + 7), // year
-            cursor.getInt(offset + 8), // month
-            cursor.getInt(offset + 9), // day
-            cursor.getLong(offset + 10), // createTime
-            cursor.getLong(offset + 11), // updateTime
-            cursor.getInt(offset + 12) // user_id
+            cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // image_path
+            cursor.getLong(offset + 6), // account
+            cursor.getInt(offset + 7), // category_id
+            cursor.getInt(offset + 8), // year
+            cursor.getInt(offset + 9), // month
+            cursor.getInt(offset + 10), // day
+            cursor.getLong(offset + 11), // createTime
+            cursor.getLong(offset + 12), // updateTime
+            cursor.getInt(offset + 13) // user_id
         );
         return entity;
     }
@@ -173,14 +186,15 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
         entity.setDemo(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
         entity.setName(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
         entity.setType(cursor.getInt(offset + 4));
-        entity.setAccount(cursor.getLong(offset + 5));
-        entity.setCategory_id(cursor.getInt(offset + 6));
-        entity.setYear(cursor.getInt(offset + 7));
-        entity.setMonth(cursor.getInt(offset + 8));
-        entity.setDay(cursor.getInt(offset + 9));
-        entity.setCreateTime(cursor.getLong(offset + 10));
-        entity.setUpdateTime(cursor.getLong(offset + 11));
-        entity.setUser_id(cursor.getInt(offset + 12));
+        entity.setImage_path(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5));
+        entity.setAccount(cursor.getLong(offset + 6));
+        entity.setCategory_id(cursor.getInt(offset + 7));
+        entity.setYear(cursor.getInt(offset + 8));
+        entity.setMonth(cursor.getInt(offset + 9));
+        entity.setDay(cursor.getInt(offset + 10));
+        entity.setCreateTime(cursor.getLong(offset + 11));
+        entity.setUpdateTime(cursor.getLong(offset + 12));
+        entity.setUser_id(cursor.getInt(offset + 13));
      }
     
     @Override

MoneyNote_Sqlite/src/main/java/com/kuxuan/sqlite/db/CategoryDB.java

@@ -56,6 +56,10 @@ public class CategoryDB {
     private int type;
 
     /**
+     * 类别图片
+     */
+    private String image_path;
+    /**
      * 账单金额
      */
     private long account;
@@ -98,15 +102,16 @@ public class CategoryDB {
 
 
 
-    @Generated(hash = 1281442951)
+    @Generated(hash = 708261383)
     public CategoryDB(Long id, String bill_id, String demo, String name, int type,
-            long account, int category_id, int year, int month, int day,
-            long createTime, long updateTime, int user_id) {
+            String image_path, long account, int category_id, int year, int month,
+            int day, long createTime, long updateTime, int user_id) {
         this.id = id;
         this.bill_id = bill_id;
         this.demo = demo;
         this.name = name;
         this.type = type;
+        this.image_path = image_path;
         this.account = account;
         this.category_id = category_id;
         this.year = year;
@@ -279,4 +284,16 @@ public class CategoryDB {
         this.user_id = user_id;
     }
 
+
+
+    public String getImage_path() {
+        return this.image_path;
+    }
+
+
+
+    public void setImage_path(String image_path) {
+        this.image_path = image_path;
+    }
+
 }

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

@@ -30,6 +30,11 @@ public class CategoryDBbean implements Serializable{
      */
     private int type;
 
+
+    /**
+     * 类型图片路径
+     */
+    private String type_imagepath;
     /**
      * 账单金额
      */
@@ -63,6 +68,14 @@ public class CategoryDBbean implements Serializable{
     private long updateTime;
 
 
+    public String getType_imagepath() {
+        return type_imagepath;
+    }
+
+    public void setType_imagepath(String type_imagepath) {
+        this.type_imagepath = type_imagepath;
+    }
+
     public long getUpdateTime() {
         return updateTime;
     }

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

@@ -2,6 +2,7 @@ package com.kuxuan.moneynote.db;
 
 import com.kuxuan.moneynote.MyApplication;
 import com.kuxuan.moneynote.common.Constant;
+import com.kuxuan.moneynote.json.TimeJson;
 import com.kuxuan.moneynote.utils.SPUtil;
 import com.kuxuan.moneynote.utils.TimeUtlis;
 import com.kuxuan.sqlite.dao.CategoryDBDao;
@@ -57,9 +58,10 @@ public class CategoryDaoOperator {
      * 插入数据
      *
      * @param categoryDBbean
+     * @param isSync         是不是网络同步
      * @return
      */
-    public synchronized boolean insert(CategoryDBbean categoryDBbean) {
+    public synchronized boolean insert(CategoryDBbean categoryDBbean, boolean isSync) {
         start();
         boolean isSuccess = false;
         CategoryDBDao categoryDBDao = DbManager.getInstance().getmDaoSession().getCategoryDBDao();
@@ -75,22 +77,23 @@ public class CategoryDaoOperator {
         }
         SPUtil.putAndApply(MyApplication.getInstance(), Constant.DbInfo.DB_ID_COUNT, count);
         String bill_id = null;
-        StringBuilder stringBuilder = new StringBuilder();
-        long createTime = categoryDBbean.getCreateTime();
-        if (String.valueOf(createTime).length() < 13) {
-            createTime = createTime * 1000;
+        if (isSync) {
+            bill_id = categoryDBbean.getBill_id() + "";
+        } else {
+            StringBuilder stringBuilder = new StringBuilder();
+            TimeJson currentTime = TimeUtlis.getCurrentTimeForhhmmss();
+            long createTime = currentTime.getCurrentTime();
+            if (String.valueOf(createTime).length() < 13) {
+                createTime = createTime * 1000;
+            }
+            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)));
+            bill_id = stringBuilder.toString();
         }
-        String hh_mm_dd = TimeUtlis.getHH_mm_dd(createTime + "");
-        String[] hh = hh_mm_dd.split(":");
-        String s = String.valueOf(createTime);
-        //毫秒4位数
-        String ms = s.substring(s.length() - 4, s.length());
-
-        stringBuilder.append(categoryDBbean.getYear() + "" + categoryDBbean.getMonth() + "" + categoryDBbean.getDay() + hh[0] + "" + hh[1] + "" + hh[2] + ms + ((int) ((Math.random() * 9 + 1) * 1000)));
-        bill_id =stringBuilder.toString();
-
         try {
-            CategoryDB categoryDB = new CategoryDB((long) count, bill_id, categoryDBbean.getDemo(), categoryDBbean.getName(), categoryDBbean.getType(), categoryDBbean.getAccount(), categoryDBbean.getCategory_id(), categoryDBbean.getYear(), categoryDBbean.getMonth(), categoryDBbean.getDay(), categoryDBbean.getCreateTime(), categoryDBbean.getUpdateTime(), categoryDBbean.getUser_id());
+            CategoryDB categoryDB = new CategoryDB((long) count, bill_id, categoryDBbean.getDemo(), categoryDBbean.getName(), categoryDBbean.getType(), categoryDBbean.getType_imagepath(), categoryDBbean.getAccount(), categoryDBbean.getCategory_id(), categoryDBbean.getYear(), categoryDBbean.getMonth(), categoryDBbean.getDay(), categoryDBbean.getCreateTime(), categoryDBbean.getUpdateTime(), categoryDBbean.getUser_id());
             long insert = categoryDBDao.insert(categoryDB);
             isSuccess = true;
             onSuccess(insert);

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

@@ -12,6 +12,29 @@ public class TimeJson implements Serializable{
     private int year;
     private int month;
     private int day;
+    private String hh;
+    private String mm;
+    private String ss;
+    private long currentTime;
+
+
+    public long getCurrentTime() {
+        return currentTime;
+    }
+
+    public void setCurrentTime(long currentTime) {
+        this.currentTime = currentTime;
+    }
+
+    public TimeJson(int year, int month, int day, String hh, String mm, String ss, long currentTime) {
+        this.year = year;
+        this.month = month;
+        this.day = day;
+        this.currentTime = currentTime;
+        this.hh = hh;
+        this.mm = mm;
+        this.ss = ss;
+    }
 
     public TimeJson(int year, int month, int day) {
         this.year = year;
@@ -19,6 +42,31 @@ public class TimeJson implements Serializable{
         this.day = day;
     }
 
+
+    public String getHh() {
+        return hh;
+    }
+
+    public void setHh(String hh) {
+        this.hh = hh;
+    }
+
+    public String getMm() {
+        return mm;
+    }
+
+    public void setMm(String mm) {
+        this.mm = mm;
+    }
+
+    public String getSs() {
+        return ss;
+    }
+
+    public void setSs(String ss) {
+        this.ss = ss;
+    }
+
     public int getYear() {
         return year;
     }

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

@@ -196,7 +196,7 @@ public class LunchActivity extends Activity {
             categoryDBbean.setCreateTime(System.currentTimeMillis());
             categoryDBbean.setUpdateTime(System.currentTimeMillis());
             categoryDBbean.setUser_id(-1);
-            categoryDaoOperator.insert(categoryDBbean);
+            categoryDaoOperator.insert(categoryDBbean,false);
         }
 
         for (int i = 101; i < 150; i++) {
@@ -216,7 +216,7 @@ public class LunchActivity extends Activity {
             categoryDBbean.setCreateTime(System.currentTimeMillis());
             categoryDBbean.setUpdateTime(System.currentTimeMillis());
             categoryDBbean.setUser_id(-1);
-            categoryDaoOperator.insert(categoryDBbean);
+            categoryDaoOperator.insert(categoryDBbean,false);
         }
 
     }

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

@@ -118,7 +118,7 @@ public class AccountModel implements AccountContract.AccountModel {
         Random random = new Random();
         int randNumber =random.nextInt(10000 - 1 + 1) + 1;
         categoryDBbean.setBill_id(1 +randNumber);
-        boolean insert = CategoryDaoOperator.newInstance().insert(categoryDBbean);
+        boolean insert = CategoryDaoOperator.newInstance().insert(categoryDBbean,false);
         if (insert) {
             listMVPListener.onSuccess(new Object());
         } else {

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

@@ -125,7 +125,19 @@ public class TimeUtlis {
     }
 
 
+    public static TimeJson getCurrentTimeForhhmmss() {
+        long currentTimeMillis = System.currentTimeMillis();
+        Date date = new Date(currentTimeMillis);
+        SimpleDateFormat formatter = new SimpleDateFormat(TIME_FORMAT_FOUR);
+        String format = formatter.format(date);
+        String[] split = format.split(" ");
+        String yearMonthDay = split[0];
+        String hhmmss = split[1];
+        String[] split1 = yearMonthDay.split("-");
+        String[] split2 = hhmmss.split(":");
+        return new TimeJson(Integer.parseInt(split1[0]), Integer.parseInt(split1[1]), Integer.parseInt(split1[2]),split2[0],split2[1],split2[2],currentTimeMillis);
 
+    }
     /**
      * 时间戳变成日期
      * @param s