[BugFix]点击邀请工会信息闪退

app/src/main/java/com/nnbc123/app/ui/user/UserInfoModifyActivity.kt

@@ -94,6 +94,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        init()
         UserModel.get().getUserInfo(userId).subscribe(userInfoUpdateObserver)
         PhotoCompressUtil.clearCompressCache()
     }
@@ -248,7 +249,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
 
                     // 点击跳转到我的声音页面
                     UIHelper.showMyVoiceAct(this@UserInfoModifyActivity, Method.AUDIO, "编辑资料")
-                    isAvatar = false
                 }, R.string.ask_again,
                 Manifest.permission.RECORD_AUDIO
             )
@@ -406,7 +406,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
                 }
                 UCrop.REQUEST_CROP -> mUri?.path?.let {
                     try {
-                        mJob?.cancel()
                         mJob = PhotoCompressUtil.compress(
                             this,
                             it,
@@ -444,6 +443,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
         }
     }
 
+
     /**
      * 第三方图片裁剪框架Ucrop
      */
@@ -492,7 +492,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
         UCrop.of(sourceUri, destinationUri).withOptions(options).withAspectRatio(1f, 1f)
             .withMaxResultSize(800, 800).start(this)
     }
-
     private fun onUpload(url: String?) {
         if (isAvatar) {
             val user = UserInfo()
@@ -547,6 +546,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
             .doOnError { throwable: Throwable -> throwable.printStackTrace() }.subscribe()
     }
 
+
     override fun needSteepStateBar(): Boolean {
         return true
     }
@@ -561,7 +561,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
     override fun onDestroy() {
         super.onDestroy()
         dialogManager.dismissDialog()
-        mJob?.cancel()
     }
     @SuppressLint("CheckResult")
     override fun takeSuccess(result: TResult?) {
@@ -583,6 +582,8 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
     }
 
     override fun takeCancel() {
+
     }
 
+
 }

app/src/main/java/com/nnbc123/app/ui/user/UserModifyPhotosActivity.kt

@@ -8,11 +8,16 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
+import android.text.TextUtils
 import android.view.View
 import android.widget.GridView
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 import com.hjq.toast.ToastUtils
 import com.netease.nim.uikit.StatusBarUtil
+import com.netease.nim.uikit.common.util.sys.TimeUtil
 import com.nnbc123.app.R
 import com.nnbc123.app.application.XChatApplication
 import com.nnbc123.app.base.TitleBar
@@ -21,7 +26,9 @@ import com.nnbc123.app.common.util.BitmapUtil
 import com.nnbc123.app.takephoto.app.TakePhotoActivity
 import com.nnbc123.app.takephoto.compress.CompressConfig
 import com.nnbc123.app.ui.user.UserModifyPhotosAdapter.PhotoItemClickListener
+import com.nnbc123.app.ui.utils.ImageLoadUtils
 import com.nnbc123.app.ui.widget.dialog.CommonTipDialog
+import com.nnbc123.app.utils.RegexUtil
 import com.nnbc123.core.file.FileModel
 import com.nnbc123.core.user.UserModel
 import com.nnbc123.core.user.bean.UserInfo
@@ -55,6 +62,11 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener,
 
     private var mUri: Uri? = null
     private var mJob: Job? = null
+    private val tvDesc: TextView? = null
+
+    private var audioFileUrl: String? = null
+    private val civAvatar: ImageView? = null
+    private val ivAvatarAuditiong: ImageView? = null
 
     companion object {
         const val FLAG_CHANGE = "isChanged"
@@ -95,6 +107,12 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener,
             updateView()
         }
     }
+    fun click(position: Int, userPhoto: UserPhoto?, isOwner: Boolean) {
+        if (userPhoto != null) {
+//            UIHelper.showModifyPhotosAct(UserInfoModifyActivity.this, userId);
+            startForResult(this, userId, UserInfoModifyActivity.Method.PHOTO)
+        }
+    }
 
     private fun initView() {
         initWhiteTitleBar("我的相册")
@@ -167,7 +185,10 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener,
                 })
         }
     }
-
+    private fun setTvDesc(desc: String) {
+        tvDesc!!.text =
+            if (TextUtils.isEmpty(desc)) getString(R.string.label_hint_desc_setting) else desc
+    }
     override fun onPhotoItemClick(position: Int) {
         if (userInfo == null) {
             return

app/src/main/java/com/nnbc123/app/ui/user/UserPhotoAdapter.java

@@ -1,10 +1,11 @@
 package com.nnbc123.app.ui.user;
 
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.nnbc123.app.R;
 import com.nnbc123.app.common.widget.RectRoundImageView;
 import com.nnbc123.app.ui.utils.ImageLoadUtils;
@@ -39,6 +40,7 @@ public class UserPhotoAdapter extends RecyclerView.Adapter<UserPhotoAdapter.User
         isSmall = small;
     }
 
+
     public interface ImageClickListener {
         void click(int position, UserPhoto userPhoto, boolean isOwner);
     }

app/src/module_album/java/com/zhihu/matisse/engine/impl/GlideEngine.java

@@ -21,6 +21,7 @@ import android.net.Uri;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.netease.nim.uikit.support.glide.GlideApp;
 import com.zhihu.matisse.engine.ImageEngine;
 
@@ -47,6 +48,8 @@ public class GlideEngine implements ImageEngine {
         GlideApp.with(context)
                 .asBitmap()
                 .load(uri)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(true)
                 .placeholder(placeholder)
                 .override(resize, resize)
                 .centerCrop()