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

app/src/main/AndroidManifest.xml

@@ -91,6 +91,7 @@
         android:icon="@mipmap/app_logo"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:requestLegacyExternalStorage="true"
         android:resizeableActivity="true"
         android:supportsRtl="true"
         android:theme="@style/MyMaterialTheme"

app/src/main/java/com/nnbc123/app/ui/im/avtivity/NimP2PMessageActivity.java

@@ -17,7 +17,6 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.coorchice.library.SuperTextView;
 import com.netease.nim.uikit.api.NimUIKit;
 import com.netease.nim.uikit.api.model.contact.ContactChangedObserver;
 import com.netease.nim.uikit.api.model.main.OnlineStateChangeObserver;
@@ -99,7 +98,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
     private TextView tvTips;
     private View tipsLayout;
     private ImageView closeIcon;
-    private SuperTextView ivAttention;
+    private ImageView ivAttention;
     @Nullable
     private UserInfo buddyUserInfo;
     private final ContactChangedObserver friendDataChangedObserver = new ContactChangedObserver() {
@@ -169,7 +168,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
             IMFriendModel.get().addCloseTipsAccount(sessionId);
             tipsLayout.setVisibility(View.GONE);
         });
-
+        ivAttention = (ImageView) findViewById(R.id.iv_attention);
         // 单聊特例话数据，包括个人信息，黑名单
         addBlackList();
         requestBuddyInfo();
@@ -287,18 +286,8 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
                 if (AuthModel.get().getCurrentUid() != userInfo.getUid() && !SystemUidUtil.isSystemUid(sessionId)) {
                     PraiseModel.get().isPraised(AuthModel.get().getCurrentUid(), userInfo.getUid()).subscribe();
                 }
-
-                if (AuthModel.get().getCurrentUid() != userInfo.getUid()) {
-                    PraiseModel.get().isPraised(AuthModel.get().getCurrentUid(), userInfo.getUid()).subscribe();
-                }
-
-                ivAvatar = (ImageView) findViewById(R.id.iv_avatar);
-                ImageLoadUtils.loadAvatar(userInfo.getAvatar(),ivAvatar);
-                tvMessage = (TextView) findViewById(R.id.tv_message);
-                tvMessage.setText(userTitleName);
-                tvDesc = (TextView) findViewById(R.id.tv_desc);
-                tvDesc.setText(userInfo.getUserDesc());
-
+                buddyUserInfo = userInfo;
+                displayAntiFraudTips();
             }
         });
 

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

@@ -16,7 +16,6 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.viewpager.widget.ViewPager;
 
@@ -45,7 +44,6 @@ import com.nnbc123.app.relation.cp.fragment.UserInfoCpFragment;
 import com.nnbc123.app.ui.im.avtivity.NimFriendModel;
 import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity;
 import com.nnbc123.app.ui.user.adapter.SelfPhotoAdapter;
-import com.nnbc123.app.ui.user.adapter.UserInfoIndicatorAdapter;
 import com.nnbc123.app.ui.user.adapter.UserInfoPagerAdapter;
 import com.nnbc123.app.ui.user.adapter.UserInfoPhotoAdapter;
 import com.nnbc123.app.ui.user.view.UserInfoDynamicFragment;
@@ -62,12 +60,10 @@ import com.nnbc123.app.ui.widget.rollviewpager.RollPagerView;
 import com.nnbc123.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper;
 import com.nnbc123.app.utils.RegexUtil;
 import com.nnbc123.app.vip.VipHelper;
-import com.nnbc123.core.module_hall.hall.bean.ClanAndHallInfo;
-import com.nnbc123.core.module_hall.hall.bean.ClanInfo;
-import com.nnbc123.xchat_android_constants.XChatConstants;
 import com.nnbc123.core.auth.AuthModel;
 import com.nnbc123.core.im.friend.IMFriendModel;
 import com.nnbc123.core.level.UserLevelVo;
+import com.nnbc123.core.module_hall.hall.bean.ClanInfo;
 import com.nnbc123.core.praise.PraiseModel;
 import com.nnbc123.core.praise.event.IsLikedEvent;
 import com.nnbc123.core.praise.event.PraiseEvent;
@@ -87,6 +83,7 @@ import com.nnbc123.library.annatation.ActLayoutRes;
 import com.nnbc123.library.utils.ListUtils;
 import com.nnbc123.library.utils.SingleToastUtil;
 import com.nnbc123.library.utils.SizeUtils;
+import com.nnbc123.xchat_android_constants.XChatConstants;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -511,8 +508,9 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                 finish();
                 break;
 
-            case R.id.tv_edit:
             case R.id.iv_edit:
+
+            case R.id.tv_edit:
                 editClick(identityState);
                 break;
 

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

@@ -15,6 +15,7 @@ import com.fourmob.datetimepicker.date.DatePickerDialog
 import com.hjq.toast.ToastUtils
 import com.netease.nim.uikit.StatusBarUtil
 import com.netease.nim.uikit.common.util.sys.TimeUtil
+import com.nnbc123.app.ErbanTakePhotoActivity
 import com.nnbc123.app.R
 import com.nnbc123.app.UIHelper
 import com.nnbc123.app.application.XChatApplication
@@ -22,6 +23,7 @@ import com.nnbc123.app.audio.RecordingVoiceActivity
 import com.nnbc123.app.base.BaseViewBindingActivity
 import com.nnbc123.app.common.util.BitmapUtil
 import com.nnbc123.app.databinding.ActivityUserInfoModifyBinding
+import com.nnbc123.app.takephoto.model.TResult
 import com.nnbc123.app.ui.login.ModifyInfoActivity
 import com.nnbc123.app.ui.user.UserPhotoAdapter.ImageClickListener
 import com.nnbc123.app.ui.utils.ImageLoadUtils
@@ -56,7 +58,7 @@ import java.util.concurrent.TimeUnit
  * @author zhouxiangfeng
  */
 class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBinding>(),
-    View.OnClickListener,
+    View.OnClickListener,ErbanTakePhotoActivity.TakePhotoCallBack,
     TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener, ImageClickListener,
     EasyPermissions.PermissionCallbacks {
     private var datePickerDialog: DatePickerDialog? = null
@@ -561,5 +563,26 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
         dialogManager.dismissDialog()
         mJob?.cancel()
     }
+    @SuppressLint("CheckResult")
+    override fun takeSuccess(result: TResult?) {
+        dialogManager.showProgressDialog(this@UserInfoModifyActivity, "请稍后")
+        FileModel.get()
+            .uploadFile(result!!.image.compressPath)
+            .compose(bindToLifecycle())
+            .subscribe { url, throwable ->
+                if (throwable != null) {
+                    onUploadFail()
+                } else {
+                    onUpload(url)
+                }
+            }
+    }
+
+    override fun takeFail(result: TResult?, msg: String?) {
+        toast(msg)
+    }
+
+    override fun takeCancel() {
+    }
 
 }

gradle.properties

@@ -27,7 +27,7 @@ channel_file=channel.txt
 
 COMPILE_SDK_VERSION=32
 MIN_SDK_VERSION=21
-TARGET_SDK_VERSION=29
+TARGET_SDK_VERSION=32
 
-version_name=1.1.0
-version_code=110
+version_name=1.1.1
+version_code=111