From 1bae5d8f53720fa56ee26d8276e667a361dc66fb Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Wed, 29 Mar 2023 21:07:04 +0800
Subject: [PATCH] =?UTF-8?q?[BugFix]=E4=BF=AE=E5=BE=A9firebase=E7=9A=84?=
 =?UTF-8?q?=E5=B4=A9=E6=BD=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/ui/login/LoginCodeActivity.kt       |  4 ++--
 .../res/layout/activity_convert_diamond.xml   |  1 +
 .../publish/view/PublishActivity.java         | 13 +++-------
 .../activity/WatchMessagePictureActivity.java | 24 -------------------
 4 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt
index 8dabe4403..601387c46 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt
@@ -133,8 +133,8 @@ class LoginCodeActivity : BaseViewBindingActivity<ActivityLoginCodeBinding>() {
 
                 override fun onError(e: Throwable) {
                     dialogManager.dismissDialog()
-                    toast(e.message)
-                    LogUtils.e(e.message)
+                    toast(e.message ?: "獲取驗證碼失敗")
+                    LogUtils.e(e.message ?: "獲取驗證碼失敗")
                 }
 
             })
diff --git a/app/src/main/res/layout/activity_convert_diamond.xml b/app/src/main/res/layout/activity_convert_diamond.xml
index 36bfa1f62..211be374d 100644
--- a/app/src/main/res/layout/activity_convert_diamond.xml
+++ b/app/src/main/res/layout/activity_convert_diamond.xml
@@ -157,6 +157,7 @@
                 android:textColor="@color/color_1F1A4E"
                 android:textColorHint="@color/color_CBB788"
                 android:textSize="@dimen/sp_16"
+                android:maxLength="18"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/viewDiamond" />
 
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
index 4d6c300bc..fa1ae2712 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
@@ -4,9 +4,7 @@ package com.yizhuan.erban.community.publish.view;
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -55,6 +53,7 @@ import com.yizhuan.xchat_android_library.common.photo.PhotoProvider;
 import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil;
 import com.yizhuan.xchat_android_library.common.util.PhotosCompressCallback;
 import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions;
+import com.yizhuan.xchat_android_library.easyphoto.utils.settings.SettingsUtils;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 import com.zhihu.matisse.Matisse;
@@ -602,14 +601,8 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
                 @Override
                 public void onOk() {
                     //同意跳到应用详情页面
-                    Uri packageUri = Uri.parse("package:${packageName}");
-                    Intent intent = new Intent(
-                            Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-                            packageUri
-                    );
-                    startActivityForResult(
-                            intent, REQUEST_CODE_STORAGE
-                    );
+                    SettingsUtils.startMyApplicationDetailsForResult(PublishActivity.this,
+                            getPackageName());
                 }
 
                 @Override
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java
index 7c13cc683..a0e77074b 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java
@@ -570,29 +570,5 @@ public class WatchMessagePictureActivity extends UI {
             });
         });
 
-//        String srcFilename = attachment.getFileName();
-//        //默认jpg
-//        String extension = TextUtils.isEmpty(attachment.getExtension()) ? "jpg" : attachment.getExtension();
-//        srcFilename += ("." + extension);
-//
-//        String picPath = StorageUtil.getSystemImagePath();
-//        String dstPath = picPath + srcFilename;
-//        if (AttachmentStore.copy(path, dstPath) != -1) {
-//            try {
-//                ContentValues values = new ContentValues(2);
-//                values.put(MediaStore.Images.Media.MIME_TYPE, C.MimeType.MIME_JPEG);
-//                values.put(MediaStore.Images.Media.DATA, dstPath);
-//                getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-////                Toast.makeText(WatchMessagePictureActivity.this, getString(R.string.picture_save_to), Toast.LENGTH_LONG).show();
-//                SingleToastUtil.showToastShort(R.string.picture_save_to);
-//            } catch (Exception e) {
-//                // may be java.lang.UnsupportedOperationException
-////                Toast.makeText(WatchMessagePictureActivity.this, getString(R.string.picture_save_fail), Toast.LENGTH_LONG).show();
-//                SingleToastUtil.showToastShort(R.string.picture_save_fail);
-//            }
-//        } else {
-////            Toast.makeText(WatchMessagePictureActivity.this, getString(R.string.picture_save_fail), Toast.LENGTH_LONG).show();
-//            SingleToastUtil.showToastShort(R.string.picture_save_fail);
-//        }
     }
 }