diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeTabRoomFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeTabRoomFragment.kt index 974944910..090a9ff05 100644 --- 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( 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() + 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 } diff --git 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 index b8b717856..9bc3201bb 100644 --- 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 target, boolean isFirstResource) { return false; } + @Override public boolean onResourceReady(Drawable resource, Object model, Target 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() { - @Override - public void onSubscribe(Disposable d) { + String adid = ""; + UserModel.get().requestCompleteUserInfo(userInfo, channel, uid, roomUid, shareCode, adid) + .compose(bindUntilEvent(FragmentEvent.DESTROY)) + .subscribe(new SingleObserver() { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onSuccess(UserInfo userInfo) { - getDialogManager().dismissDialog(); - ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_REGISTER); -// HashMap 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 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 diff --git a/app/src/main/res/layout/activity_login_password.xml b/app/src/main/res/layout/activity_login_password.xml index 539528fdf..98702fc04 100644 --- 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" diff --git a/mode.json b/mode.json index b7c8ab44e..cabc22df3 100644 --- a/mode.json +++ b/mode.json @@ -1,140 +1,52 @@ { "code": 200, "message": "success", - "data": { - "uid": 3224, - "erbanNo": 6228657, - "birth": 1137772800000, - "phoneAreaCode": "86", - "nick": "Molistar", - "defUser": 1, - "gender": 1, - "avatar": "https://image.pekolive.com/bfed3b08-1ebe-42dc-b9a4-619cb2da0e43.gif", - "region": "The United Arab Emirates", - "followNum": 4, - "fansNum": 3, - "hasPrettyErbanNo": false, - "hasRegPacket": false, - "userLevelVo": { - "experAmount": 9871478, - "charmAmount": 202300214, - "experUrl": "https://image.pekolive.com/Wealth_36.png", - "charmUrl": "https://image.pekolive.com/Charm_52.png", - "experLevelName": "Lv36", - "charmLevelName": "Lv52", - "experLevelGrp": "", - "charmLevelGrp": "", - "experLevelSeq": 36, - "charmLevelSeq": 52 + "data": [ + { + "id": 6, + "name": "Hot", + "seq": 1 }, - "nameplatePic": "https://image.pekolive.com/11094f2f00fb491f963132463bab97ec.png", - "nameplateWord": " ", - "isCustomWord": true, - "newUser": false, - "userHeadwear": { - "uid": 3224, - "headwearId": 199, - "headwearName": "VIP9Headdress", - "used": true, - "buyTime": 1732617755000, - "expireTime": 1734753600000, - "expireDays": 4, - "status": 1, - "pic": "https://image.pekolive.com/Vip9headdress.png", - "effect": "https://image.pekolive.com/Vip9headdress.svga", - "price": 0.00, - "renewPrice": 0.00, - "days": 15, - "comeFrom": 3, - "labelType": 0, - "limitDesc": "", - "originalPrice": 7, - "redirectLink": "", - "type": 1 + { + "id": 14, + "name": "New", + "seq": 2 }, - "isBindPhone": false, - "isBindPasswd": true, - "isBindPaymentPwd": false, - "isCertified": false, - "isBindApple": false, - "bindType": 3, - "hallId": 242, - "userInfoSkillVo": { - "liveTag": false, - "liveSkillVoList": [] + { + "id": 18, + "name": "ماليزيا", + "seq": 3 }, - "platformRole": 0, - "privatePhoto": [ - { - "pid": 170, - "photoUrl": "https://image.pekolive.com/bcb1c5e8-d509-42e1-91fe-69d8a8feaf67.jpg", - "seqNo": 1, - "createTime": 1730192598000, - "review": true - }, - { - "pid": 159, - "photoUrl": "https://image.pekolive.com/551f2525-adf8-4c46-a8b6-d6bd25280275.jpg", - "seqNo": 1, - "createTime": 1729672102000, - "review": false - }, - { - "pid": 158, - "photoUrl": "https://image.pekolive.com/3010183c-8ce6-4e44-bfdd-890a941cef0b.jpg", - "seqNo": 1, - "createTime": 1729672095000, - "review": false - } - ], - "registerDay": 110, - "createTime": 1724986857000, - "isFirstCharge": false, - "isReview": false, - "userVipInfoVO": { - "vipIcon": "https://image.pekolive.com/v9.png", - "vipLevel": 9, - "vipName": "VIP9", - "vipLogo": "https://image.pekolive.com/v9.mp4\n\n", - "userCardBG": "https://image.molistar.xyz/V9_user_bg.png\n\n", - "nameplateId": 9, - "nameplateUrl": "https://image.molistar.xyz/VIP9_nameplate.png", - "micCircle": "https://image.molistar.xyz/v9_mic_cycle.svga", - "micNickColour": "#FF9D9A", - "friendNickColour": "#FF9D9A", - "preventKick": true, - "enterHide": false, - "preventTrace": true, - "preventFollow": true, - "uploadGifAvatar": true, - "privateChatLimit": false, - "enterRoomEffects": "https://image.molistar.xyz/v9_enter_effect.svga", - "expireTime": 1734753600000 + { + "id": 19, + "name": "Egypt", + "seq": 3 }, - "userInfoCardPic": "https://image.pekolive.com/123455 (1).png", - "micCircle": "https://image.molistar.xyz/v9_mic_cycle.svga", - "micNickColor": "#FF9D9A", - "audioCard": { - "uid": 3224, - "status": 0 + { + "id": 20, + "name": "Turkey", + "seq": 3 }, - "labels": [], - "androidBubbleUrl": "https://image.pekolive.com/daochu9.png", - "iosBubbleUrl": "https://image.pekolive.com/daochu9.png", - "fromSayHelloChannel": false, - "showLimitCharge": false, - "visitNum": 0, - "inRoomNum": 7, - "banAccount": false, - "hasPermitRoom": true, - "isRechargeUser": false, - "inMic": false, - "partitionId": 2, - "infoCardVo": { - "effectType": 1, - "effect": "https://image.pekolive.com/vip5_roomcard_same.mp4" + { + "id": 21, + "name": "Azerbaijan", + "seq": 4 }, - "hasSuperRole": true - }, - "timestamp": 1734512981363 + { + "id": 23, + "name": "Singapore", + "seq": 4 + }, + { + "id": 22, + "name": "Cyprus", + "seq": 5 + }, + { + "id": 24, + "name": "تايوان", + "seq": 5 + } + ], + "timestamp": 1734520059020 }