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

@@ -30,7 +30,7 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
         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 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 Account = new Property(6, double.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");
@@ -59,7 +59,7 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
                 "\"NAME\" TEXT," + // 3: name
                 "\"TYPE\" INTEGER NOT NULL ," + // 4: type
                 "\"IMAGE_PATH\" TEXT," + // 5: image_path
-                "\"ACCOUNT\" INTEGER NOT NULL ," + // 6: account
+                "\"ACCOUNT\" REAL NOT NULL ," + // 6: account
                 "\"CATEGORY_ID\" INTEGER NOT NULL ," + // 7: category_id
                 "\"YEAR\" INTEGER NOT NULL ," + // 8: year
                 "\"MONTH\" INTEGER NOT NULL ," + // 9: month
@@ -104,7 +104,7 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
         if (image_path != null) {
             stmt.bindString(6, image_path);
         }
-        stmt.bindLong(7, entity.getAccount());
+        stmt.bindDouble(7, entity.getAccount());
         stmt.bindLong(8, entity.getCategory_id());
         stmt.bindLong(9, entity.getYear());
         stmt.bindLong(10, entity.getMonth());
@@ -143,7 +143,7 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
         if (image_path != null) {
             stmt.bindString(6, image_path);
         }
-        stmt.bindLong(7, entity.getAccount());
+        stmt.bindDouble(7, entity.getAccount());
         stmt.bindLong(8, entity.getCategory_id());
         stmt.bindLong(9, entity.getYear());
         stmt.bindLong(10, entity.getMonth());
@@ -167,7 +167,7 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
             cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // name
             cursor.getInt(offset + 4), // type
             cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // image_path
-            cursor.getLong(offset + 6), // account
+            cursor.getDouble(offset + 6), // account
             cursor.getInt(offset + 7), // category_id
             cursor.getInt(offset + 8), // year
             cursor.getInt(offset + 9), // month
@@ -187,7 +187,7 @@ public class CategoryDBDao extends AbstractDao<CategoryDB, Long> {
         entity.setName(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
         entity.setType(cursor.getInt(offset + 4));
         entity.setImage_path(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5));
-        entity.setAccount(cursor.getLong(offset + 6));
+        entity.setAccount(cursor.getDouble(offset + 6));
         entity.setCategory_id(cursor.getInt(offset + 7));
         entity.setYear(cursor.getInt(offset + 8));
         entity.setMonth(cursor.getInt(offset + 9));

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

@@ -62,7 +62,7 @@ public class CategoryDB {
     /**
      * 账单金额
      */
-    private long account;
+    private double account;
 
     /**
      * 类别id
@@ -102,9 +102,9 @@ public class CategoryDB {
 
 
 
-    @Generated(hash = 708261383)
+    @Generated(hash = 1427463647)
     public CategoryDB(Long id, String bill_id, String demo, String name, int type,
-            String image_path, long account, int category_id, int year, int month,
+            String image_path, double 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;
@@ -190,7 +190,7 @@ public class CategoryDB {
 
 
 
-    public long getAccount() {
+    public Double getAccount() {
         return this.account;
     }
 
@@ -296,4 +296,10 @@ public class CategoryDB {
         this.image_path = image_path;
     }
 
+
+
+    public void setAccount(double account) {
+        this.account = account;
+    }
+
 }

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

@@ -38,7 +38,7 @@ public class CategoryDBbean implements Serializable{
     /**
      * 账单金额
      */
-    private long account;
+    private double account;
 
     /**
      * 类别id
@@ -124,11 +124,11 @@ public class CategoryDBbean implements Serializable{
         this.type = type;
     }
 
-    public long getAccount() {
+    public double getAccount() {
         return account;
     }
 
-    public void setAccount(long account) {
+    public void setAccount(double account) {
         this.account = account;
     }
 

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

@@ -107,7 +107,7 @@ public class AccountModel implements AccountContract.AccountModel {
         categoryDBbean.setDemo(billBody.getDemo());
         categoryDBbean.setName(name);
         categoryDBbean.setType_imagepath(BillCategoreDaoOperator.newInstance().getDetaillIconUrlById(Integer.parseInt(billBody.getCategory_id())));
-        categoryDBbean.setAccount(Long.parseLong(billBody.getAccount()));
+        categoryDBbean.setAccount(Double.parseDouble(billBody.getAccount()));
         categoryDBbean.setBill_id(bill_id);
         CategoryDaoOperator.newInstance().updateData(categoryDBbean);
         listMVPListener.onSuccess(new Object());
@@ -137,7 +137,7 @@ public class AccountModel implements AccountContract.AccountModel {
         categoryDBbean.setDemo(billBody.getDemo());
         categoryDBbean.setName(name);
         categoryDBbean.setType_imagepath(BillCategoreDaoOperator.newInstance().getDetaillIconUrlById(Integer.parseInt(billBody.getCategory_id())));
-        categoryDBbean.setAccount(Long.parseLong(billBody.getAccount()));
+        categoryDBbean.setAccount(Double.parseDouble(billBody.getAccount()));
         Random random = new Random();
         boolean insert = CategoryDaoOperator.newInstance().insert(categoryDBbean, false);
         if (insert) {

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

@@ -114,7 +114,7 @@ public class AccountPresenter extends AccountContract.AccountPresent {
 
             @Override
             public void onFail(String msg) {
-                view.hideProgress();
+                    view.hideProgress();
                 view.showMsg(msg);
             }
         }, billBody, name);

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

@@ -86,15 +86,15 @@ public class DetialDBOpertor {
         } else {
             billData = new BillData();
         }
-        long pay_account = 0;
-        long inCome_account = 0;
+        double pay_account = 0;
+        double inCome_account = 0;
         for (TypeDataJson typeDataJson : day_datas) {
             if (typeDataJson.getType() == 1) {
                 //收入
-                inCome_account += Long.parseLong(typeDataJson.getAccount());
+                inCome_account += Double.parseDouble(typeDataJson.getAccount());
             } else {
                 //支出
-                pay_account += Long.parseLong(typeDataJson.getAccount());
+                pay_account += Double.parseDouble(typeDataJson.getAccount());
             }
         }
         billData.setDay_income_account((int) inCome_account);

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

@@ -174,16 +174,16 @@ public class ReportSingleDBOpertor {
         }
         if (category_id == -1) {
             ArrayList<TypeDataJson> categLists = getCategLists(typeDataJsonLists);
-            long account = 0;
+            double account = 0;
             for (TypeDataJson typeDataJson : categLists) {
-                account += Long.parseLong(typeDataJson.getAccount());
+                account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
             newCategoryJson.setCategory(typeDataJsonLists);
         } else {
-            long account = 0;
+            double account = 0;
             for (TypeDataJson typeDataJson : detialDataLists) {
-                account += Long.parseLong(typeDataJson.getAccount());
+                account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
             newCategoryJson.setDetial_data(detialDataLists);
@@ -222,16 +222,16 @@ public class ReportSingleDBOpertor {
         }
         if (category_id == -1) {
             ArrayList<TypeDataJson> categLists = getCategLists(typeDataJsonLists);
-            long account = 0;
+            double account = 0;
             for (TypeDataJson typeDataJson : categLists) {
-                account += Long.parseLong(typeDataJson.getAccount());
+                account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
             newCategoryJson.setCategory(typeDataJsonLists);
         } else {
-            long account = 0;
+            double account = 0;
             for (TypeDataJson typeDataJson : detialDataLists) {
-                account += Long.parseLong(typeDataJson.getAccount());
+                account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
             newCategoryJson.setDetial_data(detialDataLists);
@@ -267,16 +267,16 @@ public class ReportSingleDBOpertor {
         }
         if (category_id == -1) {
             ArrayList<TypeDataJson> categLists = getCategLists(typeDataJsonLists);
-            long account = 0;
+            double account = 0;
             for (TypeDataJson typeDataJson : categLists) {
-                account += Long.parseLong(typeDataJson.getAccount());
+                account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
             newCategoryJson.setCategory(typeDataJsonLists);
         } else {
-            long account = 0;
+            double account = 0;
             for (TypeDataJson typeDataJson : detialDataLists) {
-                account += Long.parseLong(typeDataJson.getAccount());
+                account += Double.parseDouble(typeDataJson.getAccount());
             }
             newCategoryJson.setAccount(account + "");
             newCategoryJson.setDetial_data(detialDataLists);
@@ -309,9 +309,9 @@ public class ReportSingleDBOpertor {
             typeDataJson.setTime(year + "/" + String.format("%02d", month) + "/" + String.format("%02d", day));
             data.add(typeDataJson);
         }
-        long account = 0;
+        double account = 0;
         for (PopCharData typeDataJson : data) {
-            account += Long.parseLong(typeDataJson.getAccount());
+            account += Double.parseDouble(typeDataJson.getAccount());
         }
         timeDataJson.setData(data);
         if (account > 0) {
@@ -344,9 +344,9 @@ public class ReportSingleDBOpertor {
             typeDataJson.setTime(year + "/" + String.format("%02d", month) + "/" + String.format("%02d", day));
             data.add(typeDataJson);
         }
-        long account = 0;
+        double account = 0;
         for (PopCharData typeDataJson : data) {
-            account += Long.parseLong(typeDataJson.getAccount());
+            account += Double.parseDouble(typeDataJson.getAccount());
         }
         timeDataJson.setData(data);
         if (account > 0) {
@@ -380,9 +380,9 @@ public class ReportSingleDBOpertor {
             typeDataJson.setTime(year + "/" + String.format("%02d", month) + "/" + String.format("%02d", monthData.get(i).getDay()));
             data.add(typeDataJson);
         }
-        long account = 0;
+        double account = 0;
         for (PopCharData typeDataJson : data) {
-            account += Long.parseLong(typeDataJson.getAccount());
+            account += Double.parseDouble(typeDataJson.getAccount());
         }
         timeDataJson.setData(data);
         if (account > 0) {
@@ -420,7 +420,7 @@ public class ReportSingleDBOpertor {
                         t.setType(typeDataJson.getType());
                     } else {
                         //累加总值
-                        t.setAccount(Long.parseLong(t.getAccount()) + Long.parseLong(typeDataJson.getAccount()) + "");
+                        t.setAccount(Double.parseDouble(t.getAccount()) + Double.parseDouble(typeDataJson.getAccount()) + "");
                     }
                 }
             }