diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push.png b/app/src/main/res/drawable-mdpi/push.png index 48893cf..0505863 100644 --- a/app/src/main/res/drawable-mdpi/push.png +++ b/app/src/main/res/drawable-mdpi/push.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push.png b/app/src/main/res/drawable-mdpi/push.png index 48893cf..0505863 100644 --- a/app/src/main/res/drawable-mdpi/push.png +++ b/app/src/main/res/drawable-mdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push_small.png b/app/src/main/res/drawable-mdpi/push_small.png index 2490a93..b61da3a 100644 --- a/app/src/main/res/drawable-mdpi/push_small.png +++ b/app/src/main/res/drawable-mdpi/push_small.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push.png b/app/src/main/res/drawable-mdpi/push.png index 48893cf..0505863 100644 --- a/app/src/main/res/drawable-mdpi/push.png +++ b/app/src/main/res/drawable-mdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push_small.png b/app/src/main/res/drawable-mdpi/push_small.png index 2490a93..b61da3a 100644 --- a/app/src/main/res/drawable-mdpi/push_small.png +++ b/app/src/main/res/drawable-mdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push.png b/app/src/main/res/drawable-xhdpi/push.png index 2aa5d02..c1d058f 100644 --- a/app/src/main/res/drawable-xhdpi/push.png +++ b/app/src/main/res/drawable-xhdpi/push.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push.png b/app/src/main/res/drawable-mdpi/push.png index 48893cf..0505863 100644 --- a/app/src/main/res/drawable-mdpi/push.png +++ b/app/src/main/res/drawable-mdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push_small.png b/app/src/main/res/drawable-mdpi/push_small.png index 2490a93..b61da3a 100644 --- a/app/src/main/res/drawable-mdpi/push_small.png +++ b/app/src/main/res/drawable-mdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push.png b/app/src/main/res/drawable-xhdpi/push.png index 2aa5d02..c1d058f 100644 --- a/app/src/main/res/drawable-xhdpi/push.png +++ b/app/src/main/res/drawable-xhdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push_small.png b/app/src/main/res/drawable-xhdpi/push_small.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-xhdpi/push_small.png +++ b/app/src/main/res/drawable-xhdpi/push_small.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push.png b/app/src/main/res/drawable-mdpi/push.png index 48893cf..0505863 100644 --- a/app/src/main/res/drawable-mdpi/push.png +++ b/app/src/main/res/drawable-mdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push_small.png b/app/src/main/res/drawable-mdpi/push_small.png index 2490a93..b61da3a 100644 --- a/app/src/main/res/drawable-mdpi/push_small.png +++ b/app/src/main/res/drawable-mdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push.png b/app/src/main/res/drawable-xhdpi/push.png index 2aa5d02..c1d058f 100644 --- a/app/src/main/res/drawable-xhdpi/push.png +++ b/app/src/main/res/drawable-xhdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push_small.png b/app/src/main/res/drawable-xhdpi/push_small.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-xhdpi/push_small.png +++ b/app/src/main/res/drawable-xhdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/push.png b/app/src/main/res/drawable-xxhdpi/push.png index 57056be..42cde7c 100644 --- a/app/src/main/res/drawable-xxhdpi/push.png +++ b/app/src/main/res/drawable-xxhdpi/push.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push.png b/app/src/main/res/drawable-mdpi/push.png index 48893cf..0505863 100644 --- a/app/src/main/res/drawable-mdpi/push.png +++ b/app/src/main/res/drawable-mdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push_small.png b/app/src/main/res/drawable-mdpi/push_small.png index 2490a93..b61da3a 100644 --- a/app/src/main/res/drawable-mdpi/push_small.png +++ b/app/src/main/res/drawable-mdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push.png b/app/src/main/res/drawable-xhdpi/push.png index 2aa5d02..c1d058f 100644 --- a/app/src/main/res/drawable-xhdpi/push.png +++ b/app/src/main/res/drawable-xhdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push_small.png b/app/src/main/res/drawable-xhdpi/push_small.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-xhdpi/push_small.png +++ b/app/src/main/res/drawable-xhdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/push.png b/app/src/main/res/drawable-xxhdpi/push.png index 57056be..42cde7c 100644 --- a/app/src/main/res/drawable-xxhdpi/push.png +++ b/app/src/main/res/drawable-xxhdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/push_small.png b/app/src/main/res/drawable-xxhdpi/push_small.png index dd40d82..3315832 100644 --- a/app/src/main/res/drawable-xxhdpi/push_small.png +++ b/app/src/main/res/drawable-xxhdpi/push_small.png Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push.png b/app/src/main/res/drawable-mdpi/push.png index 48893cf..0505863 100644 --- a/app/src/main/res/drawable-mdpi/push.png +++ b/app/src/main/res/drawable-mdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push_small.png b/app/src/main/res/drawable-mdpi/push_small.png index 2490a93..b61da3a 100644 --- a/app/src/main/res/drawable-mdpi/push_small.png +++ b/app/src/main/res/drawable-mdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push.png b/app/src/main/res/drawable-xhdpi/push.png index 2aa5d02..c1d058f 100644 --- a/app/src/main/res/drawable-xhdpi/push.png +++ b/app/src/main/res/drawable-xhdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push_small.png b/app/src/main/res/drawable-xhdpi/push_small.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-xhdpi/push_small.png +++ b/app/src/main/res/drawable-xhdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/push.png b/app/src/main/res/drawable-xxhdpi/push.png index 57056be..42cde7c 100644 --- a/app/src/main/res/drawable-xxhdpi/push.png +++ b/app/src/main/res/drawable-xxhdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/push_small.png b/app/src/main/res/drawable-xxhdpi/push_small.png index dd40d82..3315832 100644 --- a/app/src/main/res/drawable-xxhdpi/push_small.png +++ b/app/src/main/res/drawable-xxhdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xxxhdpi/push.png b/app/src/main/res/drawable-xxxhdpi/push.png deleted file mode 100644 index 9b01303..0000000 --- a/app/src/main/res/drawable-xxxhdpi/push.png +++ /dev/null Binary files differ diff --git a/app/build.gradle b/app/build.gradle index 921b946..8efbf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 9 - versionName "1.0.9" + versionCode 10 + versionName "1.1.0" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -96,7 +96,7 @@ //fragment快速实现 implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00eda9..711b82b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -8,6 +9,13 @@ + + + + + @@ -20,6 +28,9 @@ + + android:value="c7e85ab94772a02a2d245e3df2a8ee8c" /> + android:value="JwxSu343HfAGB7qiFCyVf2" /> { return daoSession.queryBuilder(NoticeLocaleBean::class.java) - .where(NoticeLocaleBeanDao.Properties.UserId.eq(userId)) .offset(offset * LocaleConstant.PAGE_LIMIT) .orderDesc(NoticeLocaleBeanDao.Properties.NoticeTime) .limit(LocaleConstant.PAGE_LIMIT) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index 5dbf3eb..814302e 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -11,6 +11,7 @@ Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/src/main/res/drawable-hdpi/push.png b/app/src/main/res/drawable-hdpi/push.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-hdpi/push.png +++ b/app/src/main/res/drawable-hdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-hdpi/push_small.png b/app/src/main/res/drawable-hdpi/push_small.png index 4e45ae2..5e5677c 100644 --- a/app/src/main/res/drawable-hdpi/push_small.png +++ b/app/src/main/res/drawable-hdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push.png b/app/src/main/res/drawable-ldpi/push.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-ldpi/push.png +++ b/app/src/main/res/drawable-ldpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-ldpi/push_small.png b/app/src/main/res/drawable-ldpi/push_small.png index ea3ec50..de60371 100644 --- a/app/src/main/res/drawable-ldpi/push_small.png +++ b/app/src/main/res/drawable-ldpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push.png b/app/src/main/res/drawable-mdpi/push.png index 48893cf..0505863 100644 --- a/app/src/main/res/drawable-mdpi/push.png +++ b/app/src/main/res/drawable-mdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/push_small.png b/app/src/main/res/drawable-mdpi/push_small.png index 2490a93..b61da3a 100644 --- a/app/src/main/res/drawable-mdpi/push_small.png +++ b/app/src/main/res/drawable-mdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push.png b/app/src/main/res/drawable-xhdpi/push.png index 2aa5d02..c1d058f 100644 --- a/app/src/main/res/drawable-xhdpi/push.png +++ b/app/src/main/res/drawable-xhdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/push_small.png b/app/src/main/res/drawable-xhdpi/push_small.png index 4b8a195..f327bd6 100644 --- a/app/src/main/res/drawable-xhdpi/push_small.png +++ b/app/src/main/res/drawable-xhdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/push.png b/app/src/main/res/drawable-xxhdpi/push.png index 57056be..42cde7c 100644 --- a/app/src/main/res/drawable-xxhdpi/push.png +++ b/app/src/main/res/drawable-xxhdpi/push.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/push_small.png b/app/src/main/res/drawable-xxhdpi/push_small.png index dd40d82..3315832 100644 --- a/app/src/main/res/drawable-xxhdpi/push_small.png +++ b/app/src/main/res/drawable-xxhdpi/push_small.png Binary files differ diff --git a/app/src/main/res/drawable-xxxhdpi/push.png b/app/src/main/res/drawable-xxxhdpi/push.png deleted file mode 100644 index 9b01303..0000000 --- a/app/src/main/res/drawable-xxxhdpi/push.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/drawable-xxxhdpi/push_small.png b/app/src/main/res/drawable-xxxhdpi/push_small.png index 18a80d0..8094bfc 100644 --- a/app/src/main/res/drawable-xxxhdpi/push_small.png +++ b/app/src/main/res/drawable-xxxhdpi/push_small.png Binary files differ