From b907057c3e6171bbe9be104c5fbafce76b008aff Mon Sep 17 00:00:00 2001
From: hch <16607480311@163.com>
Date: Tue, 31 Oct 2023 18:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=BE=A9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/shayu/onetoone/activity/MainActivity.java    | 2 +-
 .../java/com/shayu/onetoone/activity/fragments/MyFragment.java | 3 +++
 .../com/shayu/onetoone/activity/login/CompleteActivity.java    | 2 +-
 OneToOne/src/main/res/layout/rc_extension_input_panel.xml      | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
index 54f40f7e6..ef6025ec3 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
@@ -127,7 +127,7 @@ public class MainActivity extends AbsOTOActivity {
             }
         });
         CallClientManager.getManager();
-        checkVersion();
+        //checkVersion();
     }
 
     /**
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
index 6ecd92b51..e51036898 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
@@ -383,6 +383,9 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
     private void showData(UserBean u) {
         mBannerList.clear();
         mBannerListNew.clear();
+        if (u == null) {
+            return;
+        }
         if (!StringUtil.isEmpty(u.getSlide())) {
             mBannerListNew.addAll(JSON.parseArray(u.getSlide(), SlideBean.class));
             for (SlideBean bean : mBannerListNew) {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
index b74d068d9..0f078bbf5 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
@@ -229,7 +229,7 @@ public class CompleteActivity extends AbsOTOActivity {
 
                     @Override
                     public void onError(String error) {
-
+                        Toast.makeText(mContext, error, Toast.LENGTH_SHORT).show();
                     }
                 });
             }
diff --git a/OneToOne/src/main/res/layout/rc_extension_input_panel.xml b/OneToOne/src/main/res/layout/rc_extension_input_panel.xml
index 876eefe7b..41437011c 100644
--- a/OneToOne/src/main/res/layout/rc_extension_input_panel.xml
+++ b/OneToOne/src/main/res/layout/rc_extension_input_panel.xml
@@ -30,6 +30,7 @@
         android:background="@drawable/rc_ext_panel_editbox_background"
         android:hint="@string/layout_call_input_tips1"
         android:maxLines="4"
+        android:maxEms="300"
         android:textColorHint="#BDBDBD"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout2"