From ce13d6a9597cea250487a1eb289c5d8e95a79465 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Tue, 8 Nov 2022 23:07:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E6=9C=83=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 2 +- .../application/GlobalHandleManager.java | 2 +- .../erban/association/AssociationViewModel.kt | 8 +- .../adapter/AssociationAdapter.java | 19 ++- .../adapter/AssociationRoomAdapter.java | 24 ++- .../fragment/AssociationFragment.kt | 20 +-- .../fragment/AssociationRoomFragment.kt | 79 +++++++++- .../home/activity/AssociationActivity.kt | 3 +- .../yizhuan/erban/home/fragment/MeFragment.kt | 3 +- .../yizhuan/erban/ui/login/LoginActivity.java | 2 +- .../erban/ui/setting/SettingActivity.java | 2 +- .../ui/user/view/UserInfoInfoFragment.kt | 3 +- .../color_selector_6d6b89_false_ffffff.xml | 7 + .../color_selector_9168fa_false_b3b3c3.xml | 7 + .../drawable/bg_time_date_disable_select.xml | 9 ++ .../main/res/drawable/bg_time_date_select.xml | 5 + .../drawable/bg_time_date_select_normal.xml | 13 ++ .../res/drawable/shape_white_top_18dp.xml | 7 + .../main/res/layout/activity_association.xml | 9 +- .../res/layout/fragment_association_room.xml | 47 ++++++ app/src/main/res/values/strings.xml | 7 + .../res/layout/item_association.xml | 63 ++++---- .../res/layout/item_association_room.xml | 75 +++++++++ .../hall/activity/ClanIncomeActivity.java | 1 + .../hall/activity/ModuleClanActivity.java | 2 +- .../hall/activity/ModuleHallActivity.java | 7 +- .../hall/view/dialog/TimePickerDialog.java | 36 ++++- .../res/drawable-xhdpi/icon_date_arrow.png | Bin 0 -> 428 bytes .../res/drawable-xhdpi/icon_date_arrow.webp | Bin 418 -> 0 bytes .../bg_gradient_363e45_2b4658_r10.xml | 13 ++ .../res/layout/activity_clan_income.xml | 75 +++++---- .../res/layout/dialog_custom_time_picker.xml | 49 ++++++ .../erban/upgrade/AppUpgradeHelper.java | 145 +++++------------- .../association/AssociationModel.kt | 8 +- core/src/main/res/values/strings.xml | 2 +- gradle.properties | 4 +- 36 files changed, 532 insertions(+), 226 deletions(-) create mode 100644 app/src/main/res/color/color_selector_6d6b89_false_ffffff.xml create mode 100644 app/src/main/res/color/color_selector_9168fa_false_b3b3c3.xml create mode 100644 app/src/main/res/drawable/bg_time_date_disable_select.xml create mode 100644 app/src/main/res/drawable/bg_time_date_select.xml create mode 100644 app/src/main/res/drawable/bg_time_date_select_normal.xml create mode 100644 app/src/main/res/drawable/shape_white_top_18dp.xml create mode 100644 app/src/module_bank_card/res/layout/item_association_room.xml create mode 100644 app/src/module_labour_union/res/drawable-xhdpi/icon_date_arrow.png delete mode 100644 app/src/module_labour_union/res/drawable-xhdpi/icon_date_arrow.webp create mode 100644 app/src/module_labour_union/res/drawable/bg_gradient_363e45_2b4658_r10.xml diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index f1be306f5..5e0de8a01 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -249,7 +249,7 @@ public class MainActivity extends BaseMvpActivity mMainTabLayout.setMainTabInfoList(mainTabInfos); } }); - AppUpgradeHelper.checkAppUpgrade(this, false, false); + AppUpgradeHelper.checkAppUpgrade(this); initMaterialView(); onParseIntent(); updateDatas(); diff --git a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java b/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java index ab890dcfe..4934cbaab 100644 --- a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java +++ b/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java @@ -62,7 +62,7 @@ public class GlobalHandleManager { @Subscribe(threadMode = ThreadMode.MAIN) public void onImPushUpdateAppEvent(ImPushUpdateAppEvent event) { - AppUpgradeHelper.checkAppUpgrade((RxAppCompatActivity) getActivity(), false, true, event.getInfo()); + AppUpgradeHelper.checkAppUpgrade((RxAppCompatActivity) getActivity(), event.getInfo()); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/main/java/com/yizhuan/erban/association/AssociationViewModel.kt b/app/src/main/java/com/yizhuan/erban/association/AssociationViewModel.kt index 7f0f97ac8..f19223c18 100644 --- a/app/src/main/java/com/yizhuan/erban/association/AssociationViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/association/AssociationViewModel.kt @@ -10,12 +10,12 @@ import com.yizhuan.xchat_android_core.bean.response.ListResult class AssociationViewModel : BaseViewModel() { //公会列表 - private val _clanListLiveData = MutableLiveData?>() - val clanListLiveData: MutableLiveData?> = _clanListLiveData + private val _clanListLiveData = MutableLiveData?>() + val clanListLiveData: MutableLiveData?> = _clanListLiveData //牌照房列表 - private val _hallListLiveData = MutableLiveData?>() - val hallListLiveData: MutableLiveData?> = _hallListLiveData + private val _hallListLiveData = MutableLiveData?>() + val hallListLiveData: MutableLiveData?> = _hallListLiveData fun getClanList() { safeLaunch( diff --git a/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationAdapter.java b/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationAdapter.java index e5fab78ac..27e765558 100644 --- a/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationAdapter.java @@ -2,6 +2,7 @@ package com.yizhuan.erban.association.adapter; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; @@ -17,19 +18,21 @@ public class AssociationAdapter extends BaseQuickAdapter { public AssociationRoomAdapter() { - super(R.layout.item_association); + super(R.layout.item_association_room); } @@ -25,12 +26,15 @@ public class AssociationRoomAdapter extends BaseQuickAdapter( private lateinit var associationAdapter: AssociationAdapter private lateinit var rvDelegate: RVDelegate - private val associationViewModel: AssociationViewModel by activityViewModels() + private val associationViewModel: AssociationViewModel by viewModels() override fun init() { - associationAdapter = - AssociationAdapter() + associationAdapter = AssociationAdapter() associationAdapter.onItemClickListener = BaseQuickAdapter.OnItemClickListener { _: BaseQuickAdapter<*, *>?, _: View?, position: Int -> val info = associationAdapter.getItem(position) @@ -44,7 +45,7 @@ class AssociationFragment : BaseViewBindingFragment( } } rvDelegate = RVDelegate.Builder() - .setAdapter(associationAdapter) + .setLayoutManager(LinearLayoutManager(context)) .setRecyclerView(binding.recyclerView) .setEmptyView( EmptyViewHelper.createEmptyView( @@ -52,12 +53,13 @@ class AssociationFragment : BaseViewBindingFragment( ResUtil.getString(R.string.association_list_empty) ) ) - .setLayoutManager(LinearLayoutManager(mContext)) + .setAdapter(associationAdapter) .build() - associationViewModel.clanListLiveData.observe(this) { - rvDelegate.loadData(it) + associationViewModel.clanListLiveData.observe(viewLifecycleOwner) { + associationAdapter.setNewData(it) } + associationViewModel.getClanList() } diff --git a/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationRoomFragment.kt index 318f8fc2e..4631528d3 100644 --- a/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationRoomFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationRoomFragment.kt @@ -1,19 +1,26 @@ package com.yizhuan.erban.association.fragment import android.os.Bundle +import android.text.TextUtils +import android.view.KeyEvent import android.view.View -import androidx.fragment.app.activityViewModels +import android.view.inputmethod.EditorInfo +import android.widget.TextView +import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.chad.library.adapter.base.BaseQuickAdapter import com.yizhuan.erban.R +import com.yizhuan.erban.association.AssociationViewModel +import com.yizhuan.erban.association.adapter.AssociationRoomAdapter import com.yizhuan.erban.base.BaseViewBindingFragment import com.yizhuan.erban.common.EmptyViewHelper import com.yizhuan.erban.databinding.FragmentAssociationRoomBinding -import com.yizhuan.erban.association.AssociationViewModel -import com.yizhuan.erban.association.adapter.AssociationAdapter -import com.yizhuan.erban.association.adapter.AssociationRoomAdapter +import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.xchat_android_core.association.HallListInfo +import com.yizhuan.xchat_android_core.module_hall.hall.HallModel +import com.yizhuan.xchat_android_core.utils.net.BeanObserver +import com.yizhuan.xchat_android_core.utils.net.RxHelper import com.yizhuan.xchat_android_library.utils.ResUtil @@ -31,14 +38,66 @@ class AssociationRoomFragment : BaseViewBindingFragment - private val associationViewModel: AssociationViewModel by activityViewModels() + private val associationViewModel: AssociationViewModel by viewModels() override fun init() { + binding.mTvSearch.setOnClickListener { + if (!TextUtils.isEmpty(binding.etSearch.text.toString())) { + val hallList = rvDelegate.adapter.data + val list = hallList.filter { it.hallName.contains(binding.mTvSearch.text.toString()) } + rvDelegate.setNewData(list) + }else{ + toast(getString(R.string.search_input_room_or_id)) + } + } + binding.etSearch.setOnEditorActionListener(TextView.OnEditorActionListener { v, actionId, event -> //以下方法防止两次发送请求 + if (actionId == EditorInfo.IME_ACTION_SEARCH && event != null || event != null && event.keyCode == KeyEvent.KEYCODE_ENTER) { + if (event.action == KeyEvent.ACTION_UP) { //发送请求 + val newStr: String = binding.etSearch.text.toString().trim { it <= ' ' } + if (!TextUtils.isEmpty(newStr)) { + val hallList = rvDelegate.adapter.data + val list = hallList.filter { it.hallName.contains(newStr) } + rvDelegate.setNewData(list) + } else { + toast(getString(R.string.search_input_room_or_id)) + } + return@OnEditorActionListener true //自己消费 + } + return@OnEditorActionListener true + } + false + }) associationRoomAdapter = AssociationRoomAdapter() associationRoomAdapter.onItemClickListener = BaseQuickAdapter.OnItemClickListener { _: BaseQuickAdapter<*, *>?, _: View?, position: Int -> - + val info = associationRoomAdapter.getItem(position) + ModuleHallActivity.start( + context, + info?.hallId ?: 0L, + info?.ownerUid ?: 0L + ) } + associationRoomAdapter.setOnItemChildClickListener { adapter, view, position -> + val bean = associationRoomAdapter.getItem(position) + bean?.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.applyBtnStatus = 2 + associationRoomAdapter.notifyItemChanged(position) + toast(s) + } + }) + } + } rvDelegate = RVDelegate.Builder() .setAdapter(associationRoomAdapter) .setRecyclerView(binding.recyclerView) @@ -52,9 +111,15 @@ class AssociationRoomFragment : BaseViewBindingFragment( val viewPager: ViewPager = binding.viewPagerDetail val magicIndicator: MagicIndicator = binding.magicIndicator val fragmentList: MutableList = ArrayList() - val pagerAdapter = UserInfoPagerAdapter(supportFragmentManager, fragmentList) + val pagerAdapter = CommonPagerAdapter(supportFragmentManager, fragmentList) val tagList: MutableList = ArrayList() tagList.add(getString(R.string.me_association)) tagList.add(getString(R.string.me_room)) diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt index f4caa71a4..c3be6505c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt @@ -333,8 +333,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { ModuleHallActivity.start( context, clanAndHallInfo?.hall?.hallId ?: 0L, - clanAndHallInfo?.hall?.ownerUid ?: 0L, - clanAndHallInfo?.clan?.elderUid ?: 0L + clanAndHallInfo?.hall?.ownerUid ?: 0L ) } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java index 10cfa285a..7d02f6bf8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java @@ -58,7 +58,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener onFindViews(); onSetListener(); setProtocol(); - AppUpgradeHelper.checkAppUpgrade(this, false, false); + AppUpgradeHelper.checkAppUpgrade(this); } private void onFindViews() { diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java index 84a0a8f17..88bc66a0a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java @@ -139,7 +139,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene PermissionGuideActivity.Companion.start(context); break; case R.id.rly_check: - AppUpgradeHelper.checkAppUpgrade(this, true, false, getDialogManager()); + AppUpgradeHelper.checkAppUpgrade(this, getDialogManager()); break; } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt b/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt index d466319ba..4ffcf7c23 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt @@ -117,8 +117,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment + + + + + + diff --git a/app/src/main/res/color/color_selector_9168fa_false_b3b3c3.xml b/app/src/main/res/color/color_selector_9168fa_false_b3b3c3.xml new file mode 100644 index 000000000..8a1cbd3a2 --- /dev/null +++ b/app/src/main/res/color/color_selector_9168fa_false_b3b3c3.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/src/main/res/drawable/bg_time_date_disable_select.xml b/app/src/main/res/drawable/bg_time_date_disable_select.xml new file mode 100644 index 000000000..7a92374a8 --- /dev/null +++ b/app/src/main/res/drawable/bg_time_date_disable_select.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_time_date_select.xml b/app/src/main/res/drawable/bg_time_date_select.xml new file mode 100644 index 000000000..52fd3756c --- /dev/null +++ b/app/src/main/res/drawable/bg_time_date_select.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_time_date_select_normal.xml b/app/src/main/res/drawable/bg_time_date_select_normal.xml new file mode 100644 index 000000000..f63d51dfa --- /dev/null +++ b/app/src/main/res/drawable/bg_time_date_select_normal.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_white_top_18dp.xml b/app/src/main/res/drawable/shape_white_top_18dp.xml new file mode 100644 index 000000000..3ff580f32 --- /dev/null +++ b/app/src/main/res/drawable/shape_white_top_18dp.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_association.xml b/app/src/main/res/layout/activity_association.xml index 5d2dd8f05..78a89bbed 100644 --- a/app/src/main/res/layout/activity_association.xml +++ b/app/src/main/res/layout/activity_association.xml @@ -18,16 +18,11 @@ android:layout_width="match_parent" android:layout_height="25dp" android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/dp_10" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/title_bar"/> + android:layout_marginTop="@dimen/dp_10" /> + android:layout_height="match_parent"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_association_room.xml b/app/src/main/res/layout/fragment_association_room.xml index ce676aea9..8ee4b31f0 100644 --- a/app/src/main/res/layout/fragment_association_room.xml +++ b/app/src/main/res/layout/fragment_association_room.xml @@ -4,8 +4,55 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + + + + + + 你還沒有關註任何Peko好友哦! \n快去添加關註吧! 搜索昵稱或ID 搜索用戶ID + 搜索房間名稱或ID + 請輸入房間名稱或ID 在線中… 客服 @@ -4942,5 +4944,10 @@ 總支出%s鉆 以後再説 暫時沒有禮物 + 已申請 + 申請加入 + 日 + 周 + 月 \ No newline at end of file diff --git a/app/src/module_bank_card/res/layout/item_association.xml b/app/src/module_bank_card/res/layout/item_association.xml index 43fd7dddd..3f2584a30 100644 --- a/app/src/module_bank_card/res/layout/item_association.xml +++ b/app/src/module_bank_card/res/layout/item_association.xml @@ -3,68 +3,79 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/cl_root" - android:gravity="center_vertical" - android:layout_marginTop="@dimen/dp_18" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_18" + android:layout_marginEnd="@dimen/dp_15" + android:gravity="center_vertical" android:orientation="horizontal"> + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_10"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + tools:text="1" /> - + + android:layout_height="@dimen/dp_40" + android:layout_marginStart="@dimen/dp_10" + android:src="@drawable/default_avatar" /> + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_8" + android:textColor="@color/color_1F1A4E" + android:textSize="@dimen/sp_15" + android:textStyle="bold" + tools:text="公會名稱" /> + android:layout_weight="1" /> + android:layout_height="30dp" + android:layout_marginEnd="@dimen/dp_6" /> + + \ 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 new file mode 100644 index 000000000..338c1779c --- /dev/null +++ b/app/src/module_bank_card/res/layout/item_association_room.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java index 5ed501328..c8635b3fe 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java @@ -283,5 +283,6 @@ public class ClanIncomeActivity extends BaseMvpActivity { HallInfo hallInfo = hallListAdapter.getItem(position); if (hallInfo != null) { - ModuleHallActivity.start(context, hallInfo.getHallId(), hallInfo.getOwnerUid(), otherUid); + ModuleHallActivity.start(context, hallInfo.getHallId(), hallInfo.getOwnerUid()); } }); } 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 81cefa9d7..7a68fe1db 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 @@ -63,7 +63,6 @@ public class ModuleHallActivity extends BaseMvpActivityz@qLn7SY zPCKvV8Yt4fUtaF;4OwIJZ+tu_8YXqLcy#TWBr&lwY0(s(y^ZA)G~X-ypFZu|TH}J! z^EaPg^L>3q^6l1dzrJn1c2oA^75g)lxm&qr&y=rWztJ+k{+xb-chF{@ zImf4&z3@!C#xKLvy>h|!YR^j>XYO2Eo1nV3mTC2*zEg)n*?cC{?XXQ)%kbzJTjNir zA5BXxYZXK`w3g*D|Fha4y6e%}`BO{cMAwNONV%;0t7fZRTX=%krBJ?@+y>4fTgP8# zdcAj@Yh5jB;K;X}`{zQw9k&=?H)*{KemUzUo5yZjW`pZx7{0I1{~-N;Vx;EL9>o*D P;Ail3^>bP0l+XkK>3qH| literal 0 HcmV?d00001 diff --git a/app/src/module_labour_union/res/drawable-xhdpi/icon_date_arrow.webp b/app/src/module_labour_union/res/drawable-xhdpi/icon_date_arrow.webp deleted file mode 100644 index d92288de969373ac10cdc882fa016369fff59da4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmV;T0bTx5Nk&GR0RRA3MM6+kP&il$0000G0000M000aC06|PpNSgov00D=gpluuJ z(of@$`9MTOK9DS1ZrhD0cZsX5CB%xrd~g`qw$fbOA)cUdx6^-nXbBPhpMc`E(CF2B zr!T+xnB|{`Ht@@a&3>?!k;5k)lKo&S$t>ZO^rauj4M{R9c*b4H3rbU+Rt@*46+fXe z)oV9!3#I4|wWWd19>Z8t&HzVOqx}nkvf=1rK2LDFbDv!5(#Ml6MzpS4?Rr5Jn8Bu{Db}H00-#6^VjF0 z?xzV#djA(~fB^paxnk4*lp*WpqIsIBUR+#dPzh<9R&9*9p3>sYPc-O}jfg1nlfqG$ji MdyTTj@U{Q|0KD + + + + + + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_clan_income.xml b/app/src/module_labour_union/res/layout/activity_clan_income.xml index 27e9e5c90..45c6f9fcd 100644 --- a/app/src/module_labour_union/res/layout/activity_clan_income.xml +++ b/app/src/module_labour_union/res/layout/activity_clan_income.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> @@ -23,23 +24,23 @@ + android:background="@drawable/bg_gradient_363e45_2b4658_r10"> - + android:textSize="@dimen/sp_14" + tools:text="@string/layout_activity_clan_income_02" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@+id/tv_month_day_end"/> + tools:text="@string/layout_activity_clan_income_03" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_month_day_start" + app:layout_constraintBottom_toBottomOf="parent"/> - + - + + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_13" + android:layout_marginBottom="13dp" + android:layout_toEndOf="@id/ll_day_group" + android:background="@color/white_transparent_10" /> + android:textSize="@dimen/sp_16" /> diff --git a/app/src/module_labour_union/res/layout/dialog_custom_time_picker.xml b/app/src/module_labour_union/res/layout/dialog_custom_time_picker.xml index 17de07ea7..2be332b3a 100644 --- a/app/src/module_labour_union/res/layout/dialog_custom_time_picker.xml +++ b/app/src/module_labour_union/res/layout/dialog_custom_time_picker.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="bottom" android:orientation="vertical"> @@ -10,6 +11,54 @@ android:id="@+id/toolbar" layout="@layout/timepicker_toolbar" /> + + + + + + + + + + ? = + suspend fun getClanList(): List? = launchRequest { api.getClanList() } - suspend fun getHallList(): ListResult? = + suspend fun getHallList(): List? = launchRequest { api.getHallList() } @@ -27,13 +27,13 @@ object AssociationModel : BaseModel() { * 获取公會周榜 */ @GET("/clan/list") - suspend fun getClanList(): ServiceResult> + suspend fun getClanList(): ServiceResult> /** * 获取牌照房 */ @GET("/hall/list") - suspend fun getHallList(): ServiceResult> + suspend fun getHallList(): ServiceResult> } diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index fab07d7da..b413a76c7 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -587,7 +587,7 @@ 點贊 取消贊 公會成員啟動應用 - 申請成功 + 發送成功，請耐心等待 移除廳成員成功 您的申請已提交 邀請成功 diff --git a/gradle.properties b/gradle.properties index f6a9b6ab8..eb3c1c031 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,5 +24,5 @@ only_arm64=false channel_file=channel.txt -version_name=1.1.3 -version_code=113 \ No newline at end of file +version_name=1.1.7 +version_code=117 \ No newline at end of file