Browse Source

feat 版本更新

lihao1 2 years ago
parent
commit
108efaa203

+ 0 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/task/ObjectEntity.kt

@@ -75,7 +75,6 @@ data class InfosForObj(
 data class InfosforBuild(
     val floorMap: String,
     val state: String,
-    val height: Int,
     val floorSequenceID: Int,
 )
 

+ 8 - 4
demo/src/main/java/com/sybotan/android/demo/adapter/PictureAdapter.java

@@ -75,10 +75,14 @@ public class PictureAdapter extends BaseRecyclerViewAdapter<Photos> {
                 String url = Constant.ServerImgIPDown + photos.key;
                 FileInputStream fis = null;
                 try {
-                    fis = new FileInputStream(photos.path);
-                    Bitmap bitmap = BitmapFactory.decodeStream(fis);
-                    ImageView imageView = (ImageView) holder.getView(R.id.node_nine_pic_iv);
-                    imageView.setImageBitmap(bitmap);
+                    if (!TextUtils.isEmpty(photos.path)) {
+                        fis = new FileInputStream(photos.path);
+                        Bitmap bitmap = BitmapFactory.decodeStream(fis);
+                        ImageView imageView = (ImageView) holder.getView(R.id.node_nine_pic_iv);
+                        imageView.setImageBitmap(bitmap);
+                    } else {
+                        loadImageViewCornersByPath(mContext, url, holder.getView(R.id.node_nine_pic_iv));
+                    }
                 } catch (FileNotFoundException e) {
                     e.printStackTrace();
                     loadImageViewCornersByPath(mContext, url, holder.getView(R.id.node_nine_pic_iv));

+ 2 - 2
gradle.properties

@@ -17,14 +17,14 @@ SAGA_SERVICE_VERSION=1.4.140
 MAVEN_REPO_RELEASE_URL=http\://dev.dp.sagacloud.cn\:8082/repository/maven-releases/
 EVENTBUS_VERSION=3.1.1
 EASYPERMISSIONS_VERSION=1.2.0
-SAGA_ANDROID_VERSION=1.0.11
+SAGA_ANDROID_VERSION=1.0.13
 JUNIT_VERSION=5.3.1
 KOTLIN_VERSION=1.5.31
 SAGA_GROUP=cn.sagacloud
 SYBOTAN_KOTLIN_VERSION=1.2.42
 android.useAndroidX=true
 LICENSE_NAME=The Apache Software License, Version 2.0
-SAGA_CODE=23
+SAGA_CODE=25
 MAVEN_REPO_SNAPSHOT_URL=http\://dev.dp.sagacloud.cn\:8082/repository/maven-snapshots/
 NEXUS_USERNAME=saga
 DEVELOPER_ID=Andy.Sybotan