3-group-android/Musicoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ocean 2024-07-15 18:56:41 +08:00
parent 2ce6d61bae
commit 2c7a8e3169
5 changed files with 126 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/melody/offline/music/activity/BaseActivity.kt
View File

@ -36,29 +36,27 @@ open class BaseActivity : AppCompatActivity(), LifecycleOwner {
appStore.shouldEnterMusicPage = true appStore.shouldEnterMusicPage = true
} }
LogTag.LogD(TAG, "BaseActivity withPermission shouldEnterMusicPage->${appStore.shouldEnterMusicPage}") LogTag.LogD(TAG, "BaseActivity withPermission shouldEnterMusicPage->${appStore.shouldEnterMusicPage}")
if (!appStore.shouldEnterMusicPage) { return appStore.shouldEnterMusicPage
return false // // 不允许的国家代码
} // val restrictedCountries = setOf(
// 不允许的国家代码 //// "CN",
val restrictedCountries = setOf( // "HK",
// "CN", // "TW",
"HK", // "JP",
"TW", // "KR",
"JP", //// "GB",
"KR", //// "CH",
// "GB", //// "BE",
// "CH", //// "MO",
// "BE", //// "SG"
// "MO", // )
// "SG" // // 检查是否包含当前的国家代码
) // LogTag.LogD(TAG, "BaseActivity withPermission ipCountryCode->${appStore.ipCountryCode}")
// 检查是否包含当前的国家代码 // if (appStore.ipCountryCode in restrictedCountries) {
LogTag.LogD(TAG, "BaseActivity withPermission ipCountryCode->${appStore.ipCountryCode}") // return false
if (appStore.ipCountryCode in restrictedCountries) { // }
return false // // 如果不在受限国家代码中，则继续其他检查
} // return withIso()
// 如果不在受限国家代码中，则继续其他检查
return withIso()
} }
private fun withIso(): Boolean { private fun withIso(): Boolean {

44
app/src/main/java/melody/offline/music/activity/MoBaseActivity.kt
View File

@ -358,29 +358,27 @@ abstract class MoBaseActivity : AppCompatActivity(), MusicPlayerView.PlaySkipFor
appStore.shouldEnterMusicPage = true appStore.shouldEnterMusicPage = true
} }
LogTag.LogD(TAG, "withPermission shouldEnterMusicPage->${appStore.shouldEnterMusicPage}") LogTag.LogD(TAG, "withPermission shouldEnterMusicPage->${appStore.shouldEnterMusicPage}")
if (!appStore.shouldEnterMusicPage) { return appStore.shouldEnterMusicPage
return false // // 不允许的国家代码
} // val restrictedCountries = setOf(
// 不允许的国家代码 //// "CN",
val restrictedCountries = setOf( // "HK",
// "CN", // "TW",
"HK", // "JP",
"TW", // "KR",
"JP", //// "GB",
"KR", //// "CH",
// "GB", //// "BE",
// "CH", //// "MO",
// "BE", //// "SG"
// "MO", // )
// "SG" // // 检查是否包含当前的国家代码
) // LogTag.LogD(TAG, "withPermission ipCountryCode->${appStore.ipCountryCode}")
// 检查是否包含当前的国家代码 // if (appStore.ipCountryCode in restrictedCountries) {
LogTag.LogD(TAG, "withPermission ipCountryCode->${appStore.ipCountryCode}") // return false
if (appStore.ipCountryCode in restrictedCountries) { // }
return false // // 如果不在受限国家代码中，则继续其他检查
} // return withIso()
// 如果不在受限国家代码中，则继续其他检查
return withIso()
} }
private fun withIso(): Boolean { private fun withIso(): Boolean {

85
app/src/main/java/melody/offline/music/fragment/SearchFragment.kt
View File

@ -90,6 +90,8 @@ class SearchFragment : MoBaseFragment<FragmentSearchBinding>(), TextWatcher,
R.layout.ad_layout_admob_banner, R.layout.ad_layout_admob_banner,
R.layout.ad_layout_max_banner R.layout.ad_layout_max_banner
) )
LogTag.LogD(TAG, "search onResume")
} }
private fun initView() { private fun initView() {
@ -162,34 +164,46 @@ class SearchFragment : MoBaseFragment<FragmentSearchBinding>(), TextWatcher,
when (it) { when (it) {
is Request.SearchSuggestions -> { is Request.SearchSuggestions -> {
val input = binding.searchEdit.text.toString().trim() val input = binding.searchEdit.text.toString().trim()
Innertube.searchSuggestions(SearchSuggestionsBody(input = input)) if (input.isNotEmpty()) {
?.onSuccess { suggestionsList -> Innertube.searchSuggestions(SearchSuggestionsBody(input = input))
LogTag.LogD(TAG, "suggestionsList->${suggestionsList?.size}") ?.onSuccess { suggestionsList ->
if (suggestionsList != null) { LogTag.LogD(
AnalysisUtil.logEvent(AnalysisUtil.SEARCH_SUG_SHOW) TAG,
showSearchSuggestions() "suggestionsList->${suggestionsList?.size}"
searchSuggestionsList.clear() )
searchSuggestionsList.addAll(suggestionsList) if(binding.searchEdit.text.toString().trim().isNotEmpty()){
searchSuggestionsAdapterAdapter?.notifyDataSetChanged() if (suggestionsList != null) {
} else { AnalysisUtil.logEvent(AnalysisUtil.SEARCH_SUG_SHOW)
showSearchSuggestions()
searchSuggestionsList.clear()
searchSuggestionsList.addAll(suggestionsList)
searchSuggestionsAdapterAdapter?.notifyDataSetChanged()
} else {
binding.searchSuggestionsLayout.visibility = View.GONE
}
}else{
searchSuggestionsList.clear()
searchSuggestionsAdapterAdapter?.notifyDataSetChanged()
binding.searchSuggestionsLayout.visibility = View.GONE
}
}?.onFailure { error ->
LogTag.LogD(TAG, "searchSuggestions onFailure->${error}")
binding.searchSuggestionsLayout.visibility = View.GONE binding.searchSuggestionsLayout.visibility = View.GONE
} }
}?.onFailure { error -> }
LogTag.LogD(TAG, "searchSuggestions onFailure->${error}")
binding.searchSuggestionsLayout.visibility = View.GONE
}
} }
is Request.SearchData -> { is Request.SearchData -> {
AnalysisUtil.logEvent(AnalysisUtil.SEARCH_TRIGGER)
LolAdWrapper.shared.showAdTiming(
requireActivity(), AdPlacement.INST_SEARCH
)
showLoadingLayout()
binding.contentLayout.removeAllViews()
binding.searchEdit.clearFocus()
val input = it.input val input = it.input
if (input.isNotEmpty()) { if (input.isNotEmpty()) {
AnalysisUtil.logEvent(AnalysisUtil.SEARCH_TRIGGER)
LolAdWrapper.shared.showAdTiming(
requireActivity(), AdPlacement.INST_SEARCH
)
showLoadingLayout()
binding.contentLayout.removeAllViews()
binding.searchEdit.clearFocus()
searchHistorySet.clear() searchHistorySet.clear()
searchHistorySet.addAll(appStore.searchHistoryStore) searchHistorySet.addAll(appStore.searchHistoryStore)
if (!appStore.searchHistoryStore.contains(input)) {//把不存在的记录保存到集合中 if (!appStore.searchHistoryStore.contains(input)) {//把不存在的记录保存到集合中
@ -223,10 +237,19 @@ class SearchFragment : MoBaseFragment<FragmentSearchBinding>(), TextWatcher,
}?.onFailure { }?.onFailure {
showNoContentLayout() showNoContentLayout()
} }
LolAdWrapper.shared.loadAdIfNotCached(
requireActivity(), AdPlacement.INST_SEARCH
)
} }
LolAdWrapper.shared.loadAdIfNotCached( }
requireActivity(), AdPlacement.INST_SEARCH }
) }
events.onReceive {
when (it) {
Event.FragmentOnResume -> {
LogTag.LogD(TAG, "search FragmentOnResume")
updateHistoryUi()
} }
} }
} }
@ -236,8 +259,11 @@ class SearchFragment : MoBaseFragment<FragmentSearchBinding>(), TextWatcher,
override fun onHiddenChanged(hidden: Boolean) { override fun onHiddenChanged(hidden: Boolean) {
super.onHiddenChanged(hidden) super.onHiddenChanged(hidden)
LogTag.LogD(TAG, "search onHiddenChanged->$hidden")
if (!hidden) { if (!hidden) {
binding.searchEdit.requestFocus() binding.searchEdit.requestFocus()
showSearchHistory()
updateHistoryUi()
} else { } else {
binding.searchEdit.clearFocus() binding.searchEdit.clearFocus()
binding.searchEdit.text.clear() binding.searchEdit.text.clear()
@ -273,6 +299,12 @@ class SearchFragment : MoBaseFragment<FragmentSearchBinding>(), TextWatcher,
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
}
override fun afterTextChanged(s: Editable?) {
requests.trySend(Request.SearchSuggestions)
if (s.isNullOrEmpty()) {//没有输入内容，隐藏删除按钮，展示历史记录，重新获取焦点弹出键盘。 if (s.isNullOrEmpty()) {//没有输入内容，隐藏删除按钮，展示历史记录，重新获取焦点弹出键盘。
binding.deleteInputBtn.visibility = View.GONE binding.deleteInputBtn.visibility = View.GONE
showSearchHistory() showSearchHistory()
@ -283,11 +315,8 @@ class SearchFragment : MoBaseFragment<FragmentSearchBinding>(), TextWatcher,
} }
} }
override fun afterTextChanged(s: Editable?) {
requests.trySend(Request.SearchSuggestions)
}
override fun onFocusChange(v: View?, hasFocus: Boolean) { override fun onFocusChange(v: View?, hasFocus: Boolean) {
LogTag.LogD(TAG,"onFocusChange hasFocus->$hasFocus")
handler.postDelayed({ handler.postDelayed({
if (hasFocus) { if (hasFocus) {
showImm() showImm()

25
app/src/main/java/melody/offline/music/http/UploadEventName.kt
View File

@ -5,6 +5,7 @@ import okhttp3.Call
import okhttp3.Response import okhttp3.Response
import org.json.JSONObject import org.json.JSONObject
import melody.offline.music.sp.AppStore import melody.offline.music.sp.AppStore
import melody.offline.music.util.AnalysisUtil
import melody.offline.music.util.LogTag import melody.offline.music.util.LogTag
import java.io.IOException import java.io.IOException
@ -29,13 +30,17 @@ class UploadEventName {
BaseApiUtil.shared.postJson(context, "first_open"), BaseApiUtil.shared.postJson(context, "first_open"),
object : okhttp3.Callback { object : okhttp3.Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
val jsonObject = JSONObject()
jsonObject.put("fail", e.toString())
val map = mutableMapOf(Pair(AnalysisUtil.PARAM_VALUE, jsonObject.toString()))
AnalysisUtil.logEvent(AnalysisUtil.APP_FIRST_OPEN_FAIL, map)
} }
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
try { try {
LogTag.LogD(TAG, "first_open response->${response}") LogTag.LogD(TAG, "first_open response->${response}")
if (response.code == 200) { if (response.code == 200) {
AnalysisUtil.logEvent(AnalysisUtil.APP_FIRST_OPEN_SUCCESS)
val responseData = response.body?.string() val responseData = response.body?.string()
if (responseData != null) { if (responseData != null) {
val jsonObject = JSONObject(responseData) val jsonObject = JSONObject(responseData)
@ -46,7 +51,13 @@ class UploadEventName {
AppStore(context).firstOpenIsSucceed = true AppStore(context).firstOpenIsSucceed = true
} }
} }
}else{
val jsonObject = JSONObject()
jsonObject.put("fail", response)
val map = mutableMapOf(Pair(AnalysisUtil.PARAM_VALUE, jsonObject.toString()))
AnalysisUtil.logEvent(AnalysisUtil.APP_FIRST_OPEN_FAIL, map)
} }
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
} }
@ -64,13 +75,17 @@ class UploadEventName {
BaseApiUtil.shared.postJson(context, "app_open"), BaseApiUtil.shared.postJson(context, "app_open"),
object : okhttp3.Callback { object : okhttp3.Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
val jsonObject = JSONObject()
jsonObject.put("fail", e.toString())
val map = mutableMapOf(Pair(AnalysisUtil.PARAM_VALUE, jsonObject.toString()))
AnalysisUtil.logEvent(AnalysisUtil.APP_OPEN_FAIL, map)
} }
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
try { try {
LogTag.LogD(TAG, "start_program response->${response}") LogTag.LogD(TAG, "start_program response->${response}")
if (response.code == 200) { if (response.code == 200) {
AnalysisUtil.logEvent(AnalysisUtil.APP_OPEN_SUCCESS)
val responseData = response.body?.string() val responseData = response.body?.string()
if (responseData != null) { if (responseData != null) {
val jsonObject = JSONObject(responseData) val jsonObject = JSONObject(responseData)
@ -78,7 +93,13 @@ class UploadEventName {
LogTag.LogD(TAG, "start_program jsonObject->${jsonObject}") LogTag.LogD(TAG, "start_program jsonObject->${jsonObject}")
LogTag.LogD(TAG, "start_program status->${status}") LogTag.LogD(TAG, "start_program status->${status}")
} }
}else{
val jsonObject = JSONObject()
jsonObject.put("fail", response)
val map = mutableMapOf(Pair(AnalysisUtil.PARAM_VALUE, jsonObject.toString()))
AnalysisUtil.logEvent(AnalysisUtil.APP_OPEN_FAIL, map)
} }
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
} }

4
app/src/main/java/melody/offline/music/util/AnalysisUtil.kt
View File

@ -38,6 +38,10 @@ object AnalysisUtil {
const val RATING_DIALOG_OK_CLICK = "rating_dialog_ok_click" const val RATING_DIALOG_OK_CLICK = "rating_dialog_ok_click"
const val RATING_DIALOG_CANCEL_CLICK = "rating_dialog_cancel_click" const val RATING_DIALOG_CANCEL_CLICK = "rating_dialog_cancel_click"
const val HOME_A_TO_B = "home_a_to_b" const val HOME_A_TO_B = "home_a_to_b"
const val APP_FIRST_OPEN_SUCCESS = "app_first_open_success"
const val APP_FIRST_OPEN_FAIL = "app_first_open_fail"
const val APP_OPEN_SUCCESS = "app_open_success"
const val APP_OPEN_FAIL = "app_open_fail"
private const val AD_INST_SPLASH_SUCCESS = "ad_user_open_success"//首页开屏广告展示成功 private const val AD_INST_SPLASH_SUCCESS = "ad_user_open_success"//首页开屏广告展示成功