From 0193767269dfaa24d861d5a2b1ff65bc79302b9e Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Wed, 22 Feb 2023 20:55:00 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E5=8A=A0=E5=85=A5=E6=88=BF=E9=96=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/ui/search/SearchAdapter.java | 25 +++++++++++--- .../erban/ui/search/SearchDetailFragment.java | 8 ++++- app/src/main/res/drawable/bg_e6e6f0_15.xml | 9 +++++ app/src/main/res/drawable/bg_e6e6f0_30.xml | 9 +++++ app/src/main/res/drawable/bg_ffbc51_15.xml | 9 +++++ .../main/res/layout/activity_search_hall.xml | 26 +++++++------- app/src/main/res/values/strings.xml | 7 ++++ .../res/layout/item_association_room.xml | 4 +-- .../hall/activity/ModuleHallActivity.java | 4 +++ .../hall/adapter/AssociationRoomAdapter.java | 21 +++++++++--- .../hall/fragment/AssociationRoomFragment.kt | 32 ++++++++++++++++++ .../res/drawable-xhdpi/ic_hall_add.webp | Bin 0 -> 578 bytes .../res/layout/activity_module_hall.xml | 24 +++++++++++++ .../layout/layout_hall_msg_view_holder.xml | 4 +-- .../erban/upgrade/AppUpdateDialog.java | 13 ++----- .../association/bean/HallListInfo.java | 4 +-- .../room/bean/SearchRoomInfo.java | 9 +++++ 17 files changed, 167 insertions(+), 41 deletions(-) create mode 100644 app/src/main/res/drawable/bg_e6e6f0_15.xml create mode 100644 app/src/main/res/drawable/bg_e6e6f0_30.xml create mode 100644 app/src/main/res/drawable/bg_ffbc51_15.xml create mode 100644 app/src/module_labour_union/res/drawable-xhdpi/ic_hall_add.webp diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java index 658b7cbeb..8dc6f2bb3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java @@ -6,6 +6,8 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.coorchice.library.SuperTextView; @@ -65,8 +67,24 @@ public class SearchAdapter extends BaseQuickAdapter + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_e6e6f0_30.xml b/app/src/main/res/drawable/bg_e6e6f0_30.xml new file mode 100644 index 000000000..dcf385631 --- /dev/null +++ b/app/src/main/res/drawable/bg_e6e6f0_30.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_ffbc51_15.xml b/app/src/main/res/drawable/bg_ffbc51_15.xml new file mode 100644 index 000000000..1b82524fd --- /dev/null +++ b/app/src/main/res/drawable/bg_ffbc51_15.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search_hall.xml b/app/src/main/res/layout/activity_search_hall.xml index d1b29fc5c..ae476a65a 100644 --- a/app/src/main/res/layout/activity_search_hall.xml +++ b/app/src/main/res/layout/activity_search_hall.xml @@ -2,13 +2,14 @@ @@ -81,8 +82,8 @@ android:id="@+id/ll_search_detail" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="gone"> + android:visibility="gone" /> + android:layout_height="match_parent" /> + android:visibility="gone"> + android:layout_height="wrap_content"/> - + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ef80936fa..c391fb73f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5074,5 +5074,12 @@ 最多只能添加20個標簽哦~ 設置你的個人標簽 TA的標簽 + 待通過 + 去審核 + 已發送邀請,等待用戶通過 + 加入房間 + 待審核 + 通過邀請 + 加入房間申請 \ No newline at end of file diff --git a/app/src/module_bank_card/res/layout/item_association_room.xml b/app/src/module_bank_card/res/layout/item_association_room.xml index 73da2f8de..c14a8cfff 100644 --- a/app/src/module_bank_card/res/layout/item_association_room.xml +++ b/app/src/module_bank_card/res/layout/item_association_room.xml @@ -81,9 +81,9 @@ android:layout_width="70dp" android:layout_height="25dp" android:layout_marginEnd="@dimen/dp_16" - android:background="@drawable/bg_common_select" + android:background="@drawable/bg_common_confirm_15" android:gravity="center" - android:textColor="@color/color_selector_6d6b89_false_ffffff" + android:textColor="@color/color_white" android:textSize="@dimen/sp_12" tools:text="@string/have_apply" /> diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java index 9a1137cf5..6ece36f29 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java @@ -97,6 +97,7 @@ public class ModuleHallActivity extends BaseMvpActivity + val bean = associationRoomAdapter.getItem(position) + bean?.let { + if(it.hallBtnStatus == 2){ + toast(getString(R.string.can_not_apply_7_day)) + return@let + } + if (it.hallBtnStatus == 3){ + + return@let + } + dialogManager.showProgressDialog(context) + HallModel.get().applyJoinHall(it.hallId) + .compose(RxHelper.bindFragment(this)) + .subscribe(object : BeanObserver() { + override fun onErrorMsg(error: String) { + dialogManager.dismissDialog() + toast(error) + } + + override fun onSuccess(s: String) { + dialogManager.dismissDialog() + it.hallBtnStatus = 2 + associationRoomAdapter.notifyItemChanged(position) + toast(s) + } + }) + } + } rvDelegate = RVDelegate.Builder() .setAdapter(associationRoomAdapter) .setRecyclerView(binding.recyclerView) diff --git a/app/src/module_labour_union/res/drawable-xhdpi/ic_hall_add.webp b/app/src/module_labour_union/res/drawable-xhdpi/ic_hall_add.webp new file mode 100644 index 0000000000000000000000000000000000000000..de118a4995e69efb289673e45a51c887f5935ff9 GIT binary patch literal 578 zcmWIYbaS&}Vqge&bqWXzu!!JdU|=u+VsS9?baoCn!3g9sFrEOBEI_H;ypp0IcPE92 z$S4Jn7z`vP7Zxx$&AP0MMV^olXG&^uGEmV6AXX^?S`KuR2#_t34q + + + @@ -233,4 +254,7 @@ + + + diff --git a/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml b/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml index add876a75..382015a88 100644 --- a/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml +++ b/app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + tools:text="@string/room_join_request" /> bannerInfos; public boolean newUser; + private int hallBtnStatus;//0不显示,4可邀请,5待通过,6通过申请 + private int hallRecordId;//当hallBtnStatus=6时返回申请记录Id + public SearchRoomInfo() { } @@ -75,6 +78,9 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt bannerInfos = in.createTypedArrayList(BannerInfo.CREATOR); + hallBtnStatus = in.readInt(); + hallRecordId = in.readInt(); + } @@ -91,6 +97,9 @@ public class SearchRoomInfo extends RoomInfo implements Parcelable, MultiItemEnt dest.writeTypedList(bannerInfos); + dest.writeInt(hallBtnStatus); + dest.writeInt(hallRecordId); + } public String getNick() {