diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8f05e19..6883130 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.3' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8f05e19..6883130 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.3' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 3e40e3b..22ee2a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -29,8 +29,7 @@ private final NoticeLocaleBeanDao noticeLocaleBeanDao; private final PipeLocalBeanDao pipeLocalBeanDao; - public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> - daoConfigMap) { + public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); mapWellLocalBeanDaoConfig = daoConfigMap.get(MapWellLocalBeanDao.class).clone(); @@ -50,7 +49,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); registerDao(PipeLocalBean.class, pipeLocalBeanDao); } - + public void clear() { mapWellLocalBeanDaoConfig.clearIdentityScope(); noticeLocaleBeanDaoConfig.clearIdentityScope(); diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8f05e19..6883130 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.3' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 3e40e3b..22ee2a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -29,8 +29,7 @@ private final NoticeLocaleBeanDao noticeLocaleBeanDao; private final PipeLocalBeanDao pipeLocalBeanDao; - public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> - daoConfigMap) { + public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); mapWellLocalBeanDaoConfig = daoConfigMap.get(MapWellLocalBeanDao.class).clone(); @@ -50,7 +49,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); registerDao(PipeLocalBean.class, pipeLocalBeanDao); } - + public void clear() { mapWellLocalBeanDaoConfig.clearIdentityScope(); noticeLocaleBeanDaoConfig.clearIdentityScope(); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java index 407bc92..8908fda 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "MAP_WELL_LOCAL_BEAN". -*/ + */ public class MapWellLocalBeanDao extends AbstractDao { public static final String TABLENAME = "MAP_WELL_LOCAL_BEAN"; @@ -56,14 +57,16 @@ public MapWellLocalBeanDao(DaoConfig config) { super(config); } - + public MapWellLocalBeanDao(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 + "\"MAP_WELL_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: kId "\"AREA\" TEXT," + // 1: area @@ -93,7 +96,9 @@ "\"WELL_TYPE_NAME\" TEXT);"); // 25: wellTypeName } - /** 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 " : "") + "\"MAP_WELL_LOCAL_BEAN\""; db.execSQL(sql); @@ -102,132 +107,132 @@ @Override protected final void bindValues(DatabaseStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -237,132 +242,132 @@ @Override protected final void bindValues(SQLiteStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -372,41 +377,41 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public MapWellLocalBean readEntity(Cursor cursor, int offset) { MapWellLocalBean entity = new MapWellLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu - cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes - cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos - cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position - cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff - cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel - cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts - cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid - cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData - cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode - cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName - cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType - cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes + cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos + cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position + cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff + cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel + cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts + cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid + cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData + cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode + cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName + cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType + cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName ); return entity; } - + @Override public void readEntity(Cursor cursor, MapWellLocalBean entity, int offset) { entity.setKId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -435,17 +440,17 @@ entity.setWellName(cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23)); entity.setWellType(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24)); entity.setWellTypeName(cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25)); - } - + } + @Override protected final Long updateKeyAfterInsert(MapWellLocalBean entity, long rowId) { entity.setKId(rowId); return rowId; } - + @Override public Long getKey(MapWellLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getKId(); } else { return null; @@ -461,5 +466,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8f05e19..6883130 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.3' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 3e40e3b..22ee2a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -29,8 +29,7 @@ private final NoticeLocaleBeanDao noticeLocaleBeanDao; private final PipeLocalBeanDao pipeLocalBeanDao; - public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> - daoConfigMap) { + public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); mapWellLocalBeanDaoConfig = daoConfigMap.get(MapWellLocalBeanDao.class).clone(); @@ -50,7 +49,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); registerDao(PipeLocalBean.class, pipeLocalBeanDao); } - + public void clear() { mapWellLocalBeanDaoConfig.clearIdentityScope(); noticeLocaleBeanDaoConfig.clearIdentityScope(); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java index 407bc92..8908fda 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "MAP_WELL_LOCAL_BEAN". -*/ + */ public class MapWellLocalBeanDao extends AbstractDao { public static final String TABLENAME = "MAP_WELL_LOCAL_BEAN"; @@ -56,14 +57,16 @@ public MapWellLocalBeanDao(DaoConfig config) { super(config); } - + public MapWellLocalBeanDao(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 + "\"MAP_WELL_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: kId "\"AREA\" TEXT," + // 1: area @@ -93,7 +96,9 @@ "\"WELL_TYPE_NAME\" TEXT);"); // 25: wellTypeName } - /** 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 " : "") + "\"MAP_WELL_LOCAL_BEAN\""; db.execSQL(sql); @@ -102,132 +107,132 @@ @Override protected final void bindValues(DatabaseStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -237,132 +242,132 @@ @Override protected final void bindValues(SQLiteStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -372,41 +377,41 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public MapWellLocalBean readEntity(Cursor cursor, int offset) { MapWellLocalBean entity = new MapWellLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu - cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes - cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos - cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position - cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff - cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel - cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts - cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid - cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData - cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode - cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName - cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType - cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes + cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos + cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position + cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff + cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel + cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts + cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid + cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData + cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode + cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName + cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType + cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName ); return entity; } - + @Override public void readEntity(Cursor cursor, MapWellLocalBean entity, int offset) { entity.setKId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -435,17 +440,17 @@ entity.setWellName(cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23)); entity.setWellType(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24)); entity.setWellTypeName(cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25)); - } - + } + @Override protected final Long updateKeyAfterInsert(MapWellLocalBean entity, long rowId) { entity.setKId(rowId); return rowId; } - + @Override public Long getKey(MapWellLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getKId(); } else { return null; @@ -461,5 +466,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index deb2d49..64312ed 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "NOTICE_LOCALE_BEAN". -*/ + */ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -42,14 +43,16 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(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 + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -65,7 +68,9 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** 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 " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -74,62 +79,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -139,62 +144,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -204,27 +209,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -239,17 +244,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -265,5 +270,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8f05e19..6883130 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.3' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 3e40e3b..22ee2a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -29,8 +29,7 @@ private final NoticeLocaleBeanDao noticeLocaleBeanDao; private final PipeLocalBeanDao pipeLocalBeanDao; - public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> - daoConfigMap) { + public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); mapWellLocalBeanDaoConfig = daoConfigMap.get(MapWellLocalBeanDao.class).clone(); @@ -50,7 +49,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); registerDao(PipeLocalBean.class, pipeLocalBeanDao); } - + public void clear() { mapWellLocalBeanDaoConfig.clearIdentityScope(); noticeLocaleBeanDaoConfig.clearIdentityScope(); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java index 407bc92..8908fda 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "MAP_WELL_LOCAL_BEAN". -*/ + */ public class MapWellLocalBeanDao extends AbstractDao { public static final String TABLENAME = "MAP_WELL_LOCAL_BEAN"; @@ -56,14 +57,16 @@ public MapWellLocalBeanDao(DaoConfig config) { super(config); } - + public MapWellLocalBeanDao(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 + "\"MAP_WELL_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: kId "\"AREA\" TEXT," + // 1: area @@ -93,7 +96,9 @@ "\"WELL_TYPE_NAME\" TEXT);"); // 25: wellTypeName } - /** 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 " : "") + "\"MAP_WELL_LOCAL_BEAN\""; db.execSQL(sql); @@ -102,132 +107,132 @@ @Override protected final void bindValues(DatabaseStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -237,132 +242,132 @@ @Override protected final void bindValues(SQLiteStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -372,41 +377,41 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public MapWellLocalBean readEntity(Cursor cursor, int offset) { MapWellLocalBean entity = new MapWellLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu - cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes - cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos - cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position - cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff - cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel - cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts - cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid - cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData - cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode - cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName - cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType - cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes + cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos + cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position + cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff + cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel + cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts + cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid + cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData + cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode + cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName + cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType + cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName ); return entity; } - + @Override public void readEntity(Cursor cursor, MapWellLocalBean entity, int offset) { entity.setKId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -435,17 +440,17 @@ entity.setWellName(cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23)); entity.setWellType(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24)); entity.setWellTypeName(cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25)); - } - + } + @Override protected final Long updateKeyAfterInsert(MapWellLocalBean entity, long rowId) { entity.setKId(rowId); return rowId; } - + @Override public Long getKey(MapWellLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getKId(); } else { return null; @@ -461,5 +466,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index deb2d49..64312ed 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "NOTICE_LOCALE_BEAN". -*/ + */ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -42,14 +43,16 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(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 + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -65,7 +68,9 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** 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 " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -74,62 +79,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -139,62 +144,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -204,27 +209,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -239,17 +244,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -265,5 +270,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index 228c2c4..b0b948c 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/lib_dp_10" - android:src="@drawable/ic_left_white" /> + android:src="@drawable/ic_title_left" /> + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8f05e19..6883130 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.3' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 3e40e3b..22ee2a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -29,8 +29,7 @@ private final NoticeLocaleBeanDao noticeLocaleBeanDao; private final PipeLocalBeanDao pipeLocalBeanDao; - public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> - daoConfigMap) { + public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); mapWellLocalBeanDaoConfig = daoConfigMap.get(MapWellLocalBeanDao.class).clone(); @@ -50,7 +49,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); registerDao(PipeLocalBean.class, pipeLocalBeanDao); } - + public void clear() { mapWellLocalBeanDaoConfig.clearIdentityScope(); noticeLocaleBeanDaoConfig.clearIdentityScope(); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java index 407bc92..8908fda 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "MAP_WELL_LOCAL_BEAN". -*/ + */ public class MapWellLocalBeanDao extends AbstractDao { public static final String TABLENAME = "MAP_WELL_LOCAL_BEAN"; @@ -56,14 +57,16 @@ public MapWellLocalBeanDao(DaoConfig config) { super(config); } - + public MapWellLocalBeanDao(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 + "\"MAP_WELL_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: kId "\"AREA\" TEXT," + // 1: area @@ -93,7 +96,9 @@ "\"WELL_TYPE_NAME\" TEXT);"); // 25: wellTypeName } - /** 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 " : "") + "\"MAP_WELL_LOCAL_BEAN\""; db.execSQL(sql); @@ -102,132 +107,132 @@ @Override protected final void bindValues(DatabaseStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -237,132 +242,132 @@ @Override protected final void bindValues(SQLiteStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -372,41 +377,41 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public MapWellLocalBean readEntity(Cursor cursor, int offset) { MapWellLocalBean entity = new MapWellLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu - cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes - cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos - cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position - cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff - cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel - cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts - cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid - cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData - cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode - cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName - cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType - cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes + cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos + cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position + cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff + cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel + cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts + cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid + cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData + cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode + cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName + cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType + cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName ); return entity; } - + @Override public void readEntity(Cursor cursor, MapWellLocalBean entity, int offset) { entity.setKId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -435,17 +440,17 @@ entity.setWellName(cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23)); entity.setWellType(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24)); entity.setWellTypeName(cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25)); - } - + } + @Override protected final Long updateKeyAfterInsert(MapWellLocalBean entity, long rowId) { entity.setKId(rowId); return rowId; } - + @Override public Long getKey(MapWellLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getKId(); } else { return null; @@ -461,5 +466,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index deb2d49..64312ed 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "NOTICE_LOCALE_BEAN". -*/ + */ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -42,14 +43,16 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(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 + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -65,7 +68,9 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** 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 " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -74,62 +79,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -139,62 +144,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -204,27 +209,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -239,17 +244,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -265,5 +270,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index 228c2c4..b0b948c 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/lib_dp_10" - android:src="@drawable/ic_left_white" /> + android:src="@drawable/ic_title_left" /> diff --git a/.gitignore b/.gitignore index 7da76f8..603b140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ *.iml .gradle /local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures .externalNativeBuild .cxx -/.idea/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7d66ebd --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..c7f1cc8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..4515aa3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8f05e19..6883130 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5.3' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index 3e40e3b..22ee2a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -16,7 +16,7 @@ /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -29,8 +29,7 @@ private final NoticeLocaleBeanDao noticeLocaleBeanDao; private final PipeLocalBeanDao pipeLocalBeanDao; - public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> - daoConfigMap) { + public DaoSession(Database db, IdentityScopeType type, Map>, DaoConfig> daoConfigMap) { super(db); mapWellLocalBeanDaoConfig = daoConfigMap.get(MapWellLocalBeanDao.class).clone(); @@ -50,7 +49,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); registerDao(PipeLocalBean.class, pipeLocalBeanDao); } - + public void clear() { mapWellLocalBeanDaoConfig.clearIdentityScope(); noticeLocaleBeanDaoConfig.clearIdentityScope(); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java index 407bc92..8908fda 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "MAP_WELL_LOCAL_BEAN". -*/ + */ public class MapWellLocalBeanDao extends AbstractDao { public static final String TABLENAME = "MAP_WELL_LOCAL_BEAN"; @@ -56,14 +57,16 @@ public MapWellLocalBeanDao(DaoConfig config) { super(config); } - + public MapWellLocalBeanDao(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 + "\"MAP_WELL_LOCAL_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: kId "\"AREA\" TEXT," + // 1: area @@ -93,7 +96,9 @@ "\"WELL_TYPE_NAME\" TEXT);"); // 25: wellTypeName } - /** 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 " : "") + "\"MAP_WELL_LOCAL_BEAN\""; db.execSQL(sql); @@ -102,132 +107,132 @@ @Override protected final void bindValues(DatabaseStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -237,132 +242,132 @@ @Override protected final void bindValues(SQLiteStatement stmt, MapWellLocalBean entity) { stmt.clearBindings(); - + Long kId = entity.getKId(); if (kId != null) { stmt.bindLong(1, kId); } - + String area = entity.getArea(); if (area != null) { stmt.bindString(2, area); } - + String bfzt = entity.getBfzt(); if (bfzt != null) { stmt.bindString(3, bfzt); } - + String bfztName = entity.getBfztName(); if (bfztName != null) { stmt.bindString(4, bfztName); } - + String coordinateX = entity.getCoordinateX(); if (coordinateX != null) { stmt.bindString(5, coordinateX); } - + String coordinateY = entity.getCoordinateY(); if (coordinateY != null) { stmt.bindString(6, coordinateY); } - + String deep = entity.getDeep(); if (deep != null) { stmt.bindString(7, deep); } - + String deptName = entity.getDeptName(); if (deptName != null) { stmt.bindString(8, deptName); } - + String deptid = entity.getDeptid(); if (deptid != null) { stmt.bindString(9, deptid); } - + String id = entity.getId(); if (id != null) { stmt.bindString(10, id); } - + String latBaidu = entity.getLatBaidu(); if (latBaidu != null) { stmt.bindString(11, latBaidu); } - + String latGaode = entity.getLatGaode(); if (latGaode != null) { stmt.bindString(12, latGaode); } - + String lngBaidu = entity.getLngBaidu(); if (lngBaidu != null) { stmt.bindString(13, lngBaidu); } - + String lngGaode = entity.getLngGaode(); if (lngGaode != null) { stmt.bindString(14, lngGaode); } - + String notes = entity.getNotes(); if (notes != null) { stmt.bindString(15, notes); } - + String photos = entity.getPhotos(); if (photos != null) { stmt.bindString(16, photos); } - + String position = entity.getPosition(); if (position != null) { stmt.bindString(17, position); } - + String staff = entity.getStaff(); if (staff != null) { stmt.bindString(18, staff); } - + String tel = entity.getTel(); if (tel != null) { stmt.bindString(19, tel); } - + String ts = entity.getTs(); if (ts != null) { stmt.bindString(20, ts); } - + String valid = entity.getValid(); if (valid != null) { stmt.bindString(21, valid); } - + String watchData = entity.getWatchData(); if (watchData != null) { stmt.bindString(22, watchData); } - + String wellCode = entity.getWellCode(); if (wellCode != null) { stmt.bindString(23, wellCode); } - + String wellName = entity.getWellName(); if (wellName != null) { stmt.bindString(24, wellName); } - + String wellType = entity.getWellType(); if (wellType != null) { stmt.bindString(25, wellType); } - + String wellTypeName = entity.getWellTypeName(); if (wellTypeName != null) { stmt.bindString(26, wellTypeName); @@ -372,41 +377,41 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public MapWellLocalBean readEntity(Cursor cursor, int offset) { MapWellLocalBean entity = new MapWellLocalBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode - cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu - cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode - cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes - cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos - cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position - cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff - cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel - cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts - cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid - cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData - cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode - cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName - cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType - cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // kId + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // area + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // bfzt + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // bfztName + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // coordinateX + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // coordinateY + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // deep + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // deptName + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deptid + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // id + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // latBaidu + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // latGaode + cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // lngBaidu + cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // lngGaode + cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // notes + cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // photos + cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // position + cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // staff + cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // tel + cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // ts + cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // valid + cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // watchData + cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // wellCode + cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // wellName + cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // wellType + cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25) // wellTypeName ); return entity; } - + @Override public void readEntity(Cursor cursor, MapWellLocalBean entity, int offset) { entity.setKId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -435,17 +440,17 @@ entity.setWellName(cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23)); entity.setWellType(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24)); entity.setWellTypeName(cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25)); - } - + } + @Override protected final Long updateKeyAfterInsert(MapWellLocalBean entity, long rowId) { entity.setKId(rowId); return rowId; } - + @Override public Long getKey(MapWellLocalBean entity) { - if(entity != null) { + if (entity != null) { return entity.getKId(); } else { return null; @@ -461,5 +466,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index deb2d49..64312ed 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -12,9 +12,10 @@ import org.greenrobot.greendao.internal.DaoConfig; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. -/** + +/** * DAO for table "NOTICE_LOCALE_BEAN". -*/ + */ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -42,14 +43,16 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(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 + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -65,7 +68,9 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** 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 " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -74,62 +79,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -139,62 +144,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -204,27 +209,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -239,17 +244,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if(entity != null) { + if (entity != null) { return entity.getId(); } else { return null; @@ -265,5 +270,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index 228c2c4..b0b948c 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/lib_dp_10" - android:src="@drawable/ic_left_white" /> + android:src="@drawable/ic_title_left" /> diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 0b0e275..0953812 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -82,6 +82,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_10" + android:horizontalSpacing="@dimen/dp_5" android:nestedScrollingEnabled="false" android:numColumns="3" android:scrollbars="none" />