fix ; bug fix

2024-12-18 21:05:28 +08:00
parent 52ee9fdfac
commit b2dab994f3
4 changed files with 133 additions and 201 deletions
--- a/app/src/main/java/com/chwl/app/home/fragment/HomeTabRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/home/fragment/HomeTabRoomFragment.kt
@@ -16,6 +16,7 @@ import com.chwl.app.home.adapter.HomeRoomAdapter
 import com.chwl.app.support.FragmentVisibleStateHelper
 import com.chwl.app.ui.utils.RVDelegate
 import com.chwl.core.home.bean.HomeRoomInfo
+import com.chwl.library.common.util.isVerify
 import com.chwl.library.utils.ListUtils

 /**
@@ -105,24 +106,26 @@ class HomeTabRoomFragment : BaseViewBindingFragment<HomeTabRoomFragmentBinding>(
                    isLoadBanner = false
                    return@let
                }
-                val newData = adapter.data.toMutableList()
-                if (newData != null) {

-                    val homeRoomInfo = HomeRoomInfo().apply {
-                        isBanner = true
-                        bannerVoList = it
-                    }
-
-                    if (newData.size >= 6) {
-                        newData.add(5,homeRoomInfo)
-                    } else {
-                        newData.add(homeRoomInfo)
-                    }
-                    adapter.setNewData(newData)
-                    isLoadBanner = false
-                    return@let
+                var newData = mutableListOf<HomeRoomInfo>()
+                if (adapter?.data != null) {
+                    newData = adapter.data.filter { !it.isBanner }.toMutableList()
                }

+                val homeRoomInfo = HomeRoomInfo().apply {
+                    isBanner = true
+                    bannerVoList = it
+                }
+
+                if (newData.size >= 6) {
+                    newData.add(5,homeRoomInfo)
+                } else {
+                    newData.add(homeRoomInfo)
+                }
+                adapter.setNewData(newData)
+                isLoadBanner = false
+                return@let
+
            }
            isLoadBanner = false
        }
--- a/app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java
+++ b/app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java
@@ -162,16 +162,28 @@ public class AddUserInfoFragment extends BaseFragment
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.ok_btn:
+
+                if (tvNick.getText() != null) {
+                    toast(ResUtil.getString(R.string.login_fragment_adduserinfofragment_01));
+                    return;
+                }
+
                if (TextUtils.isEmpty(tvNick.getText().toString().trim())) {
                    toast(ResUtil.getString(R.string.login_fragment_adduserinfofragment_01));
                    return;
                }
+
                if (gender == -1) {
                    toast(ResUtil.getString(R.string.login_fragment_adduserinfofragment_02));
                    return;
                }
+
                InitInfo initInfo = InitialModel.get().getCacheInitInfo();
-                if (initInfo != null && initInfo.isCheckInviteCode() && TextUtils.isEmpty(tvCode.getText())) {
+                String code = "";
+                if (tvCode.getText() != null) {
+                    code = tvCode.getText().toString().trim();
+                }
+                if (initInfo != null && initInfo.isCheckInviteCode() && TextUtils.isEmpty(code)) {
                    String message = ResUtil.getString(R.string.login_fragment_adduserinfofragment_03);
                    getDialogManager().showOkCancelDialog(
                            message,
@@ -277,9 +289,12 @@ public class AddUserInfoFragment extends BaseFragment
            public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
                return false;
            }
+
            @Override
            public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
-                mTvCountry.setDrawableEmpty(resource,null, ResourcesKtxKt.getDrawable(R.drawable.base_ic_arrow_right),null);
+                try {
+                    mTvCountry.setDrawableEmpty(resource, null, ResourcesKtxKt.getDrawable(R.drawable.base_ic_arrow_right), null);
+                } catch (Exception e) {}
                return false;
            }
        });
@@ -287,68 +302,70 @@ public class AddUserInfoFragment extends BaseFragment


    private void commit(String nick, String avatarUrl, int gender, String shareCode) {
-        UserInfo userInfo = new UserInfo();
-        userInfo.setUid(AuthModel.get().getCurrentUid());
-        userInfo.setNick(nick);
-        userInfo.setAvatar(avatarUrl);
+        try {
+            UserInfo userInfo = new UserInfo();
+            userInfo.setUid(AuthModel.get().getCurrentUid());
+            userInfo.setNick(nick);
+            userInfo.setAvatar(avatarUrl);

-        if (gender == UserInfo.GENDER_MALE || gender == UserInfo.GENDER_FEMALE) {
-            userInfo.setGender(gender);
-        } else {
-            toast(ResUtil.getString(R.string.login_fragment_adduserinfofragment_07));
-            return;
-        }
+            if (gender == UserInfo.GENDER_MALE || gender == UserInfo.GENDER_FEMALE) {
+                userInfo.setGender(gender);
+            } else {
+                toast(ResUtil.getString(R.string.login_fragment_adduserinfofragment_07));
+                return;
+            }

-        //不选国家不给注册
-        Object country = mTvCountry.getTag();
-        if (country != null && country instanceof CountryBean) {
-            userInfo.setRegionId(((CountryBean) country).id);
-        } else {
-            toast(ResUtil.getString(R.string.regionTips));
-            return;
-        }
+            //不选国家不给注册
+            Object country = mTvCountry.getTag();
+            if (country != null && country instanceof CountryBean) {
+                userInfo.setRegionId(((CountryBean) country).id);
+            } else {
+                toast(ResUtil.getString(R.string.regionTips));
+                return;
+            }


-        getDialogManager().showProgressDialog(getContext(), ResUtil.getString(R.string.login_fragment_adduserinfofragment_08));
-        LinkedInfo linkedInfo = LinkedModel.get().getLinkedInfo();
+            getDialogManager().showProgressDialog(getContext(), ResUtil.getString(R.string.login_fragment_adduserinfofragment_08));
+            LinkedInfo linkedInfo = LinkedModel.get().getLinkedInfo();

-        String channel = "";
-        String roomUid = "";
-        String uid = "";
-        if (linkedInfo != null) {
-            channel = linkedInfo.getChannel();
-            roomUid = linkedInfo.getRoomUid();
-            uid = linkedInfo.getUid();
-        }
-        INVITE_USER_CODE = shareCode;
-        String finalChannel = channel;
+            String channel = "";
+            String roomUid = "";
+            String uid = "";
+            if (linkedInfo != null) {
+                channel = linkedInfo.getChannel();
+                roomUid = linkedInfo.getRoomUid();
+                uid = linkedInfo.getUid();
+            }
+            INVITE_USER_CODE = shareCode;
+            String finalChannel = channel;
 //        String adid = Adjust.getAdid();
-        String adid = "";
-        UserModel.get().requestCompleteUserInfo(userInfo, channel, uid, roomUid, shareCode, adid)
-                .compose(bindUntilEvent(FragmentEvent.DESTROY))
-                .subscribe(new SingleObserver<UserInfo>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
+            String adid = "";
+            UserModel.get().requestCompleteUserInfo(userInfo, channel, uid, roomUid, shareCode, adid)
+                    .compose(bindUntilEvent(FragmentEvent.DESTROY))
+                    .subscribe(new SingleObserver<UserInfo>() {
+                        @Override
+                        public void onSubscribe(Disposable d) {

-                    }
+                        }

-                    @Override
-                    public void onSuccess(UserInfo userInfo) {
-                        getDialogManager().dismissDialog();
-                        ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_REGISTER);
-//                        HashMap<String, Object> map = new HashMap<>(2);
-//                        map.put(FirebaseAnalytics.Param.METHOD, finalChannel);
-//                        ReportManager.get().reportEvent(FirebaseAnalytics.Event.SIGN_UP, map);
-                        AuthModel.get().setThirdUserInfo(null);
-                        getActivity().finish();
-                    }
+                        @Override
+                        public void onSuccess(UserInfo userInfo) {
+                            getDialogManager().dismissDialog();
+                            ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_REGISTER);
+    //                        HashMap<String, Object> map = new HashMap<>(2);
+    //                        map.put(FirebaseAnalytics.Param.METHOD, finalChannel);
+    //                        ReportManager.get().reportEvent(FirebaseAnalytics.Event.SIGN_UP, map);
+                            AuthModel.get().setThirdUserInfo(null);
+                            getActivity().finish();
+                        }

-                    @Override
-                    public void onError(Throwable e) {
-                        getDialogManager().dismissDialog();
-                        toast(e.getMessage());
-                    }
-                });
+                        @Override
+                        public void onError(Throwable e) {
+                            getDialogManager().dismissDialog();
+                            toast(e.getMessage());
+                        }
+                    });
+        } catch (Exception e) {}
    }

    @Override
--- a/app/src/main/res/layout/activity_login_password.xml
+++ b/app/src/main/res/layout/activity_login_password.xml
@@ -317,7 +317,7 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_48"
        android:layout_marginStart="@dimen/dp_36"
-        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_30"
        android:layout_marginEnd="@dimen/dp_36"
        android:background="@drawable/base_shape_f3f5fa_26dp"
        app:layout_constraintEnd_toEndOf="parent"