diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index e8a68aa..b33be8d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -23,6 +23,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -31,6 +32,7 @@ private val kTag = "NewEventActivity" private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -46,6 +48,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" inspectionId = args[1] @@ -97,6 +101,7 @@ } override fun onItemLongClick(view: View?, position: Int) { + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } @@ -162,8 +167,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index e8a68aa..b33be8d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -23,6 +23,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -31,6 +32,7 @@ private val kTag = "NewEventActivity" private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -46,6 +48,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" inspectionId = args[1] @@ -97,6 +101,7 @@ } override fun onItemLongClick(view: View?, position: Int) { + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } @@ -162,8 +167,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 6aef2d8..36fca8e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.birmm.inspect.utils import android.Manifest +import android.os.Build object LocaleConstant { @@ -9,22 +10,67 @@ * Array * ============================================================================================= * */ - val USER_PERMISSIONS = arrayOf( - Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CALL_PHONE, - Manifest.permission.BLUETOOTH, - Manifest.permission.BLUETOOTH_CONNECT, - Manifest.permission.BLUETOOTH_SCAN, - Manifest.permission.BLUETOOTH_ADMIN, - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) + val USER_PERMISSIONS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 @@ -55,8 +101,7 @@ * Long * ============================================================================================= * */ - const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L - const val IMAGE_MINUS_SIZE = 100 * 1024 + /** * ============================================================================================= @@ -75,7 +120,6 @@ const val WRITE_CHARACTERISTIC_UUID = "0003cdd2-0000-1000-8000-00805f9b0131"//写数据特征值UUID const val READ_CHARACTERISTIC_UUID = "0003cdd1-0000-1000-8000-00805f9b0131"//读数据特征值UUID - const val SINGLE_OPEN_WARNING = "isSingleOpenWarning" const val SINGLE_AUTO_RECORD = "isSingleRecordLog" } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index e8a68aa..b33be8d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -23,6 +23,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -31,6 +32,7 @@ private val kTag = "NewEventActivity" private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -46,6 +48,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" inspectionId = args[1] @@ -97,6 +101,7 @@ } override fun onItemLongClick(view: View?, position: Int) { + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } @@ -162,8 +167,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 6aef2d8..36fca8e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.birmm.inspect.utils import android.Manifest +import android.os.Build object LocaleConstant { @@ -9,22 +10,67 @@ * Array * ============================================================================================= * */ - val USER_PERMISSIONS = arrayOf( - Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CALL_PHONE, - Manifest.permission.BLUETOOTH, - Manifest.permission.BLUETOOTH_CONNECT, - Manifest.permission.BLUETOOTH_SCAN, - Manifest.permission.BLUETOOTH_ADMIN, - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) + val USER_PERMISSIONS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 @@ -55,8 +101,7 @@ * Long * ============================================================================================= * */ - const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L - const val IMAGE_MINUS_SIZE = 100 * 1024 + /** * ============================================================================================= @@ -75,7 +120,6 @@ const val WRITE_CHARACTERISTIC_UUID = "0003cdd2-0000-1000-8000-00805f9b0131"//写数据特征值UUID const val READ_CHARACTERISTIC_UUID = "0003cdd1-0000-1000-8000-00805f9b0131"//读数据特征值UUID - const val SINGLE_OPEN_WARNING = "isSingleOpenWarning" const val SINGLE_AUTO_RECORD = "isSingleRecordLog" } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 7ee2f80..653a448 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -14,6 +14,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { @@ -38,6 +39,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index e8a68aa..b33be8d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -23,6 +23,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -31,6 +32,7 @@ private val kTag = "NewEventActivity" private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -46,6 +48,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" inspectionId = args[1] @@ -97,6 +101,7 @@ } override fun onItemLongClick(view: View?, position: Int) { + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } @@ -162,8 +167,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 6aef2d8..36fca8e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.birmm.inspect.utils import android.Manifest +import android.os.Build object LocaleConstant { @@ -9,22 +10,67 @@ * Array * ============================================================================================= * */ - val USER_PERMISSIONS = arrayOf( - Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CALL_PHONE, - Manifest.permission.BLUETOOTH, - Manifest.permission.BLUETOOTH_CONNECT, - Manifest.permission.BLUETOOTH_SCAN, - Manifest.permission.BLUETOOTH_ADMIN, - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) + val USER_PERMISSIONS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 @@ -55,8 +101,7 @@ * Long * ============================================================================================= * */ - const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L - const val IMAGE_MINUS_SIZE = 100 * 1024 + /** * ============================================================================================= @@ -75,7 +120,6 @@ const val WRITE_CHARACTERISTIC_UUID = "0003cdd2-0000-1000-8000-00805f9b0131"//写数据特征值UUID const val READ_CHARACTERISTIC_UUID = "0003cdd1-0000-1000-8000-00805f9b0131"//读数据特征值UUID - const val SINGLE_OPEN_WARNING = "isSingleOpenWarning" const val SINGLE_AUTO_RECORD = "isSingleRecordLog" } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 7ee2f80..653a448 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -14,6 +14,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { @@ -38,6 +39,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index b302e92..01fd81b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,6 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.utils.PageNavigationManager class HelpCenterActivity : KotlinBaseActivity() { @@ -28,6 +29,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" binding.answerView.webViewClient = WebViewClient() diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index e8a68aa..b33be8d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -23,6 +23,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -31,6 +32,7 @@ private val kTag = "NewEventActivity" private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -46,6 +48,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" inspectionId = args[1] @@ -97,6 +101,7 @@ } override fun onItemLongClick(view: View?, position: Int) { + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } @@ -162,8 +167,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 6aef2d8..36fca8e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.birmm.inspect.utils import android.Manifest +import android.os.Build object LocaleConstant { @@ -9,22 +10,67 @@ * Array * ============================================================================================= * */ - val USER_PERMISSIONS = arrayOf( - Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CALL_PHONE, - Manifest.permission.BLUETOOTH, - Manifest.permission.BLUETOOTH_CONNECT, - Manifest.permission.BLUETOOTH_SCAN, - Manifest.permission.BLUETOOTH_ADMIN, - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) + val USER_PERMISSIONS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 @@ -55,8 +101,7 @@ * Long * ============================================================================================= * */ - const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L - const val IMAGE_MINUS_SIZE = 100 * 1024 + /** * ============================================================================================= @@ -75,7 +120,6 @@ const val WRITE_CHARACTERISTIC_UUID = "0003cdd2-0000-1000-8000-00805f9b0131"//写数据特征值UUID const val READ_CHARACTERISTIC_UUID = "0003cdd1-0000-1000-8000-00805f9b0131"//读数据特征值UUID - const val SINGLE_OPEN_WARNING = "isSingleOpenWarning" const val SINGLE_AUTO_RECORD = "isSingleRecordLog" } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 7ee2f80..653a448 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -14,6 +14,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { @@ -38,6 +39,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index b302e92..01fd81b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,6 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.utils.PageNavigationManager class HelpCenterActivity : KotlinBaseActivity() { @@ -28,6 +29,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" binding.answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index 0800fa7..fc37bd7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -16,6 +16,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState class InspectionEventActivity : KotlinBaseActivity() { @@ -36,6 +37,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index e8a68aa..b33be8d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -23,6 +23,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -31,6 +32,7 @@ private val kTag = "NewEventActivity" private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -46,6 +48,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" inspectionId = args[1] @@ -97,6 +101,7 @@ } override fun onItemLongClick(view: View?, position: Int) { + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } @@ -162,8 +167,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 6aef2d8..36fca8e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.birmm.inspect.utils import android.Manifest +import android.os.Build object LocaleConstant { @@ -9,22 +10,67 @@ * Array * ============================================================================================= * */ - val USER_PERMISSIONS = arrayOf( - Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CALL_PHONE, - Manifest.permission.BLUETOOTH, - Manifest.permission.BLUETOOTH_CONNECT, - Manifest.permission.BLUETOOTH_SCAN, - Manifest.permission.BLUETOOTH_ADMIN, - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) + val USER_PERMISSIONS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 @@ -55,8 +101,7 @@ * Long * ============================================================================================= * */ - const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L - const val IMAGE_MINUS_SIZE = 100 * 1024 + /** * ============================================================================================= @@ -75,7 +120,6 @@ const val WRITE_CHARACTERISTIC_UUID = "0003cdd2-0000-1000-8000-00805f9b0131"//写数据特征值UUID const val READ_CHARACTERISTIC_UUID = "0003cdd1-0000-1000-8000-00805f9b0131"//读数据特征值UUID - const val SINGLE_OPEN_WARNING = "isSingleOpenWarning" const val SINGLE_AUTO_RECORD = "isSingleRecordLog" } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 7ee2f80..653a448 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -14,6 +14,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { @@ -38,6 +39,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index b302e92..01fd81b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,6 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.utils.PageNavigationManager class HelpCenterActivity : KotlinBaseActivity() { @@ -28,6 +29,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" binding.answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index 0800fa7..fc37bd7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -16,6 +16,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState class InspectionEventActivity : KotlinBaseActivity() { @@ -36,6 +37,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 0e5ce33..33066be 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index e8a68aa..b33be8d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -23,6 +23,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -31,6 +32,7 @@ private val kTag = "NewEventActivity" private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -46,6 +48,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" inspectionId = args[1] @@ -97,6 +101,7 @@ } override fun onItemLongClick(view: View?, position: Int) { + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } @@ -162,8 +167,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 6aef2d8..36fca8e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.birmm.inspect.utils import android.Manifest +import android.os.Build object LocaleConstant { @@ -9,22 +10,67 @@ * Array * ============================================================================================= * */ - val USER_PERMISSIONS = arrayOf( - Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CALL_PHONE, - Manifest.permission.BLUETOOTH, - Manifest.permission.BLUETOOTH_CONNECT, - Manifest.permission.BLUETOOTH_SCAN, - Manifest.permission.BLUETOOTH_ADMIN, - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) + val USER_PERMISSIONS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 @@ -55,8 +101,7 @@ * Long * ============================================================================================= * */ - const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L - const val IMAGE_MINUS_SIZE = 100 * 1024 + /** * ============================================================================================= @@ -75,7 +120,6 @@ const val WRITE_CHARACTERISTIC_UUID = "0003cdd2-0000-1000-8000-00805f9b0131"//写数据特征值UUID const val READ_CHARACTERISTIC_UUID = "0003cdd1-0000-1000-8000-00805f9b0131"//读数据特征值UUID - const val SINGLE_OPEN_WARNING = "isSingleOpenWarning" const val SINGLE_AUTO_RECORD = "isSingleRecordLog" } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 7ee2f80..653a448 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -14,6 +14,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { @@ -38,6 +39,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index b302e92..01fd81b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,6 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.utils.PageNavigationManager class HelpCenterActivity : KotlinBaseActivity() { @@ -28,6 +29,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" binding.answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index 0800fa7..fc37bd7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -16,6 +16,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState class InspectionEventActivity : KotlinBaseActivity() { @@ -36,6 +37,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 0e5ce33..33066be 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index a22ca63..6800480 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -33,6 +33,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -46,6 +47,7 @@ private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 private val imagePaths: ArrayList = ArrayList() //服务器返回的拍照数据集 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -67,6 +69,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + weakReferenceHandler = WeakReferenceHandler(this) eventViewModel = ViewModelProvider(this)[EventViewModel::class.java] @@ -124,28 +128,19 @@ override fun onItemLongClick(view: View?, position: Int) { imagePaths.removeAt(position) + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } }) - uploadImageViewModel.uploadResult.observe(this) { model -> - if (model.code == 200) { - /** - * 显示图片 - * path: 2021-07\c670eac17d644b179a4324a34bb84329.jpeg - * */ - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = model.data - //let函数处理需要针对一个可null的对象统一做判空处理。 - url?.let { - imagePaths.add(it) - realPaths.add(it.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) + uploadImageViewModel.uploadResult.observe(this) { + if (it.code == 200) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) } + imageAdapter.notifyDataSetChanged() } } @@ -215,8 +210,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/build.gradle b/app/build.gradle index dcd9b1c..ae07527 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' //单项/数字、二三级联动、日期/时间等滚轮选择器 - implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.11' + implementation 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:4.1.13' //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java index 1933d4d..ca059a5 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoMaster.java @@ -13,20 +13,25 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. + /** * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 1; - /** Creates underlying database table using DAOs. */ + /** + * Creates underlying database table using DAOs. + */ public static void createAllTables(Database db, boolean ifNotExists) { InspectionLocalBeanDao.createTable(db, ifNotExists); RouteLocalBeanDao.createTable(db, ifNotExists); TaskEventLocalBeanDao.createTable(db, ifNotExists); } - /** Drops underlying database table using DAOs. */ + /** + * Drops underlying database table using DAOs. + */ public static void dropAllTables(Database db, boolean ifExists) { InspectionLocalBeanDao.dropTable(db, ifExists); RouteLocalBeanDao.dropTable(db, ifExists); @@ -81,7 +86,9 @@ } } - /** WARNING: Drops all table on Upgrade! Use only during development. */ + /** + * WARNING: Drops all table on Upgrade! Use only during development. + */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java index eb82e69..e3ae5f9 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java index 23b971a..1739dd0 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/InspectionLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "INSPECTION_LOCAL_BEAN". -*/ + */ public class InspectionLocalBeanDao extends AbstractDao { public static final String TABLENAME = "INSPECTION_LOCAL_BEAN"; @@ -45,14 +46,16 @@ public InspectionLocalBeanDao(DaoConfig config) { super(config); } - + public InspectionLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"INSPECTION_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT UNIQUE ," + // 1: inspectionId @@ -71,7 +74,9 @@ "\"USER\" TEXT);"); // 14: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"INSPECTION_LOCAL_BEAN\""; db.execSQL(sql); @@ -200,7 +205,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public InspectionLocalBean readEntity(Cursor cursor, int offset) { @@ -223,7 +228,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, InspectionLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -242,16 +247,16 @@ entity.setDistance(cursor.getDouble(offset + 13)); entity.setUser(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14)); } - + @Override protected final Long updateKeyAfterInsert(InspectionLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(InspectionLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -267,5 +272,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java index 221ebf8..ced0c48 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/RouteLocalBeanDao.java @@ -44,7 +44,7 @@ * Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"ROUTE_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"INSPECTION_ID\" TEXT," + // 1: inspectionId @@ -52,7 +52,9 @@ "\"LAT\" REAL NOT NULL );"); // 3: lat } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"ROUTE_LOCAL_BEAN\""; db.execSQL(sql); @@ -61,12 +63,12 @@ @Override protected final void bindValues(DatabaseStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -78,12 +80,12 @@ @Override protected final void bindValues(SQLiteStatement stmt, RouteLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String inspectionId = entity.getInspectionId(); if (inspectionId != null) { stmt.bindString(2, inspectionId); @@ -140,5 +142,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java index 6d85d41..01b141b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java +++ b/app/src/main/java/com/casic/birmm/inspect/greendao/TaskEventLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "TASK_EVENT_LOCAL_BEAN". -*/ + */ public class TaskEventLocalBeanDao extends AbstractDao { public static final String TABLENAME = "TASK_EVENT_LOCAL_BEAN"; @@ -43,14 +44,16 @@ public TaskEventLocalBeanDao(DaoConfig config) { super(config); } - + public TaskEventLocalBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** Creates the underlying database table. */ + /** + * Creates the underlying database table. + */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists? "IF NOT EXISTS ": ""; + String constraint = ifNotExists ? "IF NOT EXISTS " : ""; db.execSQL("CREATE TABLE " + constraint + "\"TASK_EVENT_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"TASK_ID\" TEXT UNIQUE ," + // 1: taskId @@ -67,7 +70,9 @@ "\"USER\" TEXT);"); // 12: user } - /** Drops the underlying database table. */ + /** + * Drops the underlying database table. + */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"TASK_EVENT_LOCAL_BEAN\""; db.execSQL(sql); @@ -76,7 +81,7 @@ @Override protected final void bindValues(DatabaseStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -119,12 +124,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -134,7 +139,7 @@ @Override protected final void bindValues(SQLiteStatement stmt, TaskEventLocalBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); @@ -177,12 +182,12 @@ if (images != null) { stmt.bindString(11, images); } - + String description = entity.getDescription(); if (description != null) { stmt.bindString(12, description); } - + String user = entity.getUser(); if (user != null) { stmt.bindString(13, user); @@ -192,7 +197,7 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public TaskEventLocalBean readEntity(Cursor cursor, int offset) { @@ -213,7 +218,7 @@ ); return entity; } - + @Override public void readEntity(Cursor cursor, TaskEventLocalBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -230,16 +235,16 @@ entity.setDescription(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); entity.setUser(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12)); } - + @Override protected final Long updateKeyAfterInsert(TaskEventLocalBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(TaskEventLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -255,5 +260,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt index f2dc231..0a45620 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt @@ -14,12 +14,15 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { private val gson by lazy { Gson() } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt index 7a72831..0ac3a5d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt @@ -14,10 +14,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class InspectionEventActivity : KotlinBaseActivity() { override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! val dataRows = DataBaseManager.get.queryEventByInspection(id) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt index b907f9d..3a2b3d8 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt index e8a68aa..b33be8d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt @@ -23,6 +23,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.util.UUID @@ -31,6 +32,7 @@ private val kTag = "NewEventActivity" private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -46,6 +48,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! isWarning = args[0].toString() == "0" inspectionId = args[1] @@ -97,6 +101,7 @@ } override fun onItemLongClick(view: View?, position: Int) { + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } @@ -162,8 +167,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt index 6aef2d8..36fca8e 100644 --- a/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/birmm/inspect/utils/LocaleConstant.kt @@ -1,6 +1,7 @@ package com.casic.birmm.inspect.utils import android.Manifest +import android.os.Build object LocaleConstant { @@ -9,22 +10,67 @@ * Array * ============================================================================================= * */ - val USER_PERMISSIONS = arrayOf( - Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, - Manifest.permission.ACCESS_COARSE_LOCATION, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CALL_PHONE, - Manifest.permission.BLUETOOTH, - Manifest.permission.BLUETOOTH_CONNECT, - Manifest.permission.BLUETOOTH_SCAN, - Manifest.permission.BLUETOOTH_ADMIN, - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.MANAGE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) + val USER_PERMISSIONS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_CONNECT, + Manifest.permission.BLUETOOTH_SCAN, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } else { + arrayOf( + Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.READ_PHONE_STATE, + Manifest.permission.CALL_PHONE, + Manifest.permission.BLUETOOTH, + Manifest.permission.BLUETOOTH_ADMIN, + Manifest.permission.CAMERA, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } val ASK_DEV_CODE_COMMAND = byteArrayOf(0x01, 0x0D, 0x0A)// 查询设备编号命令 val OPEN_TRANSFER_COMMAND = byteArrayOf(0x02, 0x0D, 0x0A) // 开启数据发送命令 @@ -55,8 +101,7 @@ * Long * ============================================================================================= * */ - const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L - const val IMAGE_MINUS_SIZE = 100 * 1024 + /** * ============================================================================================= @@ -75,7 +120,6 @@ const val WRITE_CHARACTERISTIC_UUID = "0003cdd2-0000-1000-8000-00805f9b0131"//写数据特征值UUID const val READ_CHARACTERISTIC_UUID = "0003cdd1-0000-1000-8000-00805f9b0131"//读数据特征值UUID - const val SINGLE_OPEN_WARNING = "isSingleOpenWarning" const val SINGLE_AUTO_RECORD = "isSingleRecordLog" } \ No newline at end of file diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index 7ee2f80..653a448 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -14,6 +14,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager class EventDetailActivity : KotlinBaseActivity() { @@ -38,6 +39,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val args = intent.getStringExtra(Constant.INTENT_PARAM)!! val model = gson.fromJson( args, object : TypeToken() {}.type diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt index b302e92..01fd81b 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt @@ -8,6 +8,7 @@ import com.casic.birmm.inspect.extensions.initLayoutImmersionBar import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.utils.PageNavigationManager class HelpCenterActivity : KotlinBaseActivity() { @@ -28,6 +29,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html") binding.answerView.settings.defaultTextEncodingName = "utf-8" binding.answerView.webViewClient = WebViewClient() diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt index 0800fa7..fc37bd7 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt @@ -16,6 +16,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.vm.LoadState class InspectionEventActivity : KotlinBaseActivity() { @@ -36,6 +37,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + val id = intent.getStringExtra(Constant.INTENT_PARAM)!! viewModel = ViewModelProvider(this)[InspectionViewModel::class.java] diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt index 0e5ce33..33066be 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/MainActivity.kt @@ -15,6 +15,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.utils.PageNavigationManager class MainActivity : KotlinBaseActivity() { @@ -29,6 +30,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + MapsInitializer.updatePrivacyShow(this, true, true) MapsInitializer.updatePrivacyAgree(this, true) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt index a22ca63..6800480 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt @@ -33,6 +33,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState @@ -46,6 +47,7 @@ private val context: Context = this@NewEventActivity private val realPaths: ArrayList = ArrayList() //真实图片路径 private val imagePaths: ArrayList = ArrayList() //服务器返回的拍照数据集 + private var selectedResult = ArrayList() private lateinit var imageAdapter: EditableImageAdapter private lateinit var inspectionId: String private lateinit var deviceCode: String @@ -67,6 +69,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + weakReferenceHandler = WeakReferenceHandler(this) eventViewModel = ViewModelProvider(this)[EventViewModel::class.java] @@ -124,28 +128,19 @@ override fun onItemLongClick(view: View?, position: Int) { imagePaths.removeAt(position) + realPaths.removeAt(position) selectedResult.removeAt(position) imageAdapter.deleteImage(position) } }) - uploadImageViewModel.uploadResult.observe(this) { model -> - if (model.code == 200) { - /** - * 显示图片 - * path: 2021-07\c670eac17d644b179a4324a34bb84329.jpeg - * */ - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片，图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = model.data - //let函数处理需要针对一个可null的对象统一做判空处理。 - url?.let { - imagePaths.add(it) - realPaths.add(it.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) + uploadImageViewModel.uploadResult.observe(this) { + if (it.code == 200) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) } + imageAdapter.notifyDataSetChanged() } } @@ -215,8 +210,6 @@ }) } - private var selectedResult = ArrayList() - private fun selectPicture() { PictureSelector.create(this) .openGallery(SelectMimeType.ofImage()) diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt index 6ef98c1..1769fbb 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt @@ -9,6 +9,7 @@ import com.casic.birmm.inspect.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.utils.PageNavigationManager class UserDetailActivity : KotlinBaseActivity() { @@ -31,6 +32,8 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { + PageNavigationManager.addActivity(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo() userViewModel.userInfo.observe(this) {