From 6435dceb4a0d7a5b4d0f92dddc5d09fe66e73971 Mon Sep 17 00:00:00 2001 From: yuyl <765782212@qq.com> Date: Wed, 16 Apr 2025 19:50:02 +0800 Subject: [PATCH] UI commit --- Android_Mireo/app/build.gradle | 2 +- .../mireo/app/ui/activity/SearchActivity.kt | 28 ++++++++++++--- .../mireo/app/ui/fragment/ListTabFragment.kt | 18 ++++++++++ .../mireo/app/ui/fragment/MessageFragment.kt | 36 ++++++++++++++----- .../mireo/app/ui/fragment/SharedViewModel.kt | 7 ++++ .../src/main/res/layout/fragment_list_tab.xml | 3 +- .../app/src/main/res/layout/item_list_tab.xml | 1 + .../src/main/res/layout/message_fragment.xml | 26 ++++++++++---- .../src/main/res/layout/status_activity.xml | 1 + 9 files changed, 99 insertions(+), 23 deletions(-) diff --git a/Android_Mireo/app/build.gradle b/Android_Mireo/app/build.gradle index 1f8fbf3..9049d95 100644 --- a/Android_Mireo/app/build.gradle +++ b/Android_Mireo/app/build.gradle @@ -40,7 +40,7 @@ android { jniDebuggable true zipAlignEnabled false shrinkResources false - minifyEnabled true + minifyEnabled false signingConfig signingConfigs.config addManifestPlaceholders([ 'app_name': 'Mireo Debug' diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/activity/SearchActivity.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/activity/SearchActivity.kt index dd73805..556fc69 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/activity/SearchActivity.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/activity/SearchActivity.kt @@ -4,10 +4,15 @@ import android.content.Intent import android.text.Editable import android.text.TextUtils import android.text.TextWatcher +import android.view.KeyEvent +import android.view.inputmethod.EditorInfo import android.widget.EditText import android.widget.ImageView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.hjq.http.EasyHttp +import com.hjq.http.config.IRequestApi +import com.hjq.http.listener.HttpCallbackProxy import com.localee.mireo.app.R import com.localee.mireo.app.action.StatusAction import com.localee.mireo.app.app.AppActivity @@ -18,9 +23,6 @@ import com.localee.mireo.app.other.MsConstants.CONSTANTS_short_play_id import com.localee.mireo.app.ui.adapter.SearchHotAdapter import com.localee.mireo.app.ui.adapter.SearchSearchAdapter import com.localee.mireo.app.widget.StatusLayout -import com.hjq.http.EasyHttp -import com.hjq.http.config.IRequestApi -import com.hjq.http.listener.HttpCallbackProxy class SearchActivity : AppActivity(), StatusAction { @@ -72,9 +74,24 @@ class SearchActivity : AppActivity(), StatusAction { override fun afterTextChanged(editable: Editable) { } }) + etSearch?.setOnEditorActionListener { _, actionId, _ -> + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + true + } else { + false + } + } + etSearch?.setOnKeyListener { _, keyCode, event -> + if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) { + true + } else { + false + } + } mAdapter?.setOnItemClickListener { adapter, view, position -> - val searchHot: com.localee.mireo.app.http.api.SearchHotApi.Bean.Data = adapter.items.get(position) + val searchHot: com.localee.mireo.app.http.api.SearchHotApi.Bean.Data = + adapter.items.get(position) startActivity( Intent( this, @@ -86,7 +103,8 @@ class SearchActivity : AppActivity(), StatusAction { }) } mKeyAdapter?.setOnItemClickListener { adapter, view, position -> - val search: com.localee.mireo.app.http.api.SearchSearchApi.Bean.Data = adapter.items.get(position) + val search: com.localee.mireo.app.http.api.SearchSearchApi.Bean.Data = + adapter.items.get(position) startActivity( Intent( this, diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/ListTabFragment.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/ListTabFragment.kt index 4cb915b..6ce58fa 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/ListTabFragment.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/ListTabFragment.kt @@ -110,6 +110,8 @@ class ListTabFragment : TitleBarFragment(), OnRefreshLoadMoreListe for (i in detailList.indices) { if (detailList[i].short_play_id == historyBean.short_play_id) { detailList.removeAt(i) + viewModel.meToHistoryCheckAction(0) + break } } } else { @@ -189,9 +191,25 @@ class ListTabFragment : TitleBarFragment(), OnRefreshLoadMoreListe } + fun setCancel() { + val allData: List? = mAdapter?.items + for (i in allData?.indices!!) { + allData[i].is_check = false + } + detailList.clear() + mAdapter?.selectEdit = !mAdapter?.selectEdit!! + mAdapter?.notifyDataSetChanged() + if (llDelete?.visibility == View.VISIBLE) + llDelete?.visibility = View.GONE + else + llDelete?.visibility = View.VISIBLE + + } + fun setAllSelect(isSelect: Boolean) { val allData: List? = mAdapter?.items if (isSelect) { + detailList.clear() for (i in allData?.indices!!) { allData[i].is_check = true } diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/MessageFragment.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/MessageFragment.kt index 22da9a3..4a08115 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/MessageFragment.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/MessageFragment.kt @@ -1,6 +1,7 @@ package com.localee.mireo.app.ui.fragment import android.view.View +import android.widget.FrameLayout import android.widget.ImageView import android.widget.TextView import androidx.appcompat.widget.AppCompatCheckBox @@ -32,6 +33,7 @@ class MessageFragment : TitleBarFragment(), TabAdapter.OnTabListen private val tabView: RecyclerView? by lazy { findViewById(R.id.rv_list_tab) } private val viewPager: ViewPager? by lazy { findViewById(R.id.viewPager) } private val tvCancel: TextView? by lazy { findViewById(R.id.tv_cancel) } + private val flSelectCheck: FrameLayout? by lazy { findViewById(R.id.fl_select_check) } private val cbSelectCheck: AppCompatCheckBox? by lazy { findViewById(R.id.cb_select_check) } private var tabAdapter: TabAdapter? = null @@ -92,7 +94,7 @@ class MessageFragment : TitleBarFragment(), TabAdapter.OnTabListen tvCancel?.visibility = View.VISIBLE ivMore?.visibility = View.GONE tabView?.visibility = View.INVISIBLE - cbSelectCheck?.visibility = View.VISIBLE + flSelectCheck?.visibility = View.VISIBLE listTabOneFragment.setEdit() } @@ -106,25 +108,37 @@ class MessageFragment : TitleBarFragment(), TabAdapter.OnTabListen tvCancel?.visibility = View.GONE ivMore?.visibility = View.VISIBLE tabView?.visibility = View.VISIBLE - cbSelectCheck?.visibility = View.GONE - listTabOneFragment.setEdit() + cbSelectCheck?.isChecked = false + flSelectCheck?.visibility = View.GONE + listTabOneFragment.setCancel() + } - cbSelectCheck?.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - listTabOneFragment.setAllSelect(true) - } else { + flSelectCheck?.setOnClickListener { + if (cbSelectCheck?.isChecked == true){ + cbSelectCheck?.isChecked = false listTabOneFragment.setAllSelect(false) - + }else{ + cbSelectCheck?.isChecked = true + listTabOneFragment.setAllSelect(true) } } +// cbSelectCheck?.setOnCheckedChangeListener { buttonView, isChecked -> +// if (isChecked) { +// listTabOneFragment.setAllSelect(true) +// } else { +// listTabOneFragment.setAllSelect(false) +// } +// } + + viewModel.listTabAction.observe(this) { data -> tvCancel?.visibility = View.GONE ivMore?.visibility = View.VISIBLE tabView?.visibility = View.VISIBLE cbSelectCheck?.isChecked = false - cbSelectCheck?.visibility = View.GONE + flSelectCheck?.visibility = View.GONE listTabOneFragment.setEdit() } @@ -139,6 +153,10 @@ class MessageFragment : TitleBarFragment(), TabAdapter.OnTabListen } } } + viewModel.meToHistoryCheckAction.observe(this) { data -> + cbSelectCheck?.isChecked = false; + } + } diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/SharedViewModel.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/SharedViewModel.kt index b77fe48..6d57dc6 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/SharedViewModel.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/SharedViewModel.kt @@ -25,4 +25,11 @@ class SharedViewModel : ViewModel() { fun meToHistoryAction(data: Int) { _meToHistoryAction.value = data } + + private val _meToHistoryCheckAction = MutableLiveData() + val meToHistoryCheckAction: LiveData get() = _meToHistoryCheckAction + + fun meToHistoryCheckAction(data: Int) { + _meToHistoryCheckAction.value = data + } } \ No newline at end of file diff --git a/Android_Mireo/app/src/main/res/layout/fragment_list_tab.xml b/Android_Mireo/app/src/main/res/layout/fragment_list_tab.xml index c757f15..412085d 100644 --- a/Android_Mireo/app/src/main/res/layout/fragment_list_tab.xml +++ b/Android_Mireo/app/src/main/res/layout/fragment_list_tab.xml @@ -10,13 +10,14 @@ android:id="@+id/rl_status_refresh" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_above="@+id/ll_delete" app:srlEnablePreviewInEditMode="false"> + > - + > + + + +