diff --git a/Android_Mireo/app/build.gradle b/Android_Mireo/app/build.gradle index ca3a264..9049d95 100644 --- a/Android_Mireo/app/build.gradle +++ b/Android_Mireo/app/build.gradle @@ -119,9 +119,6 @@ dependencies { implementation 'com.github.Baseflow:PhotoView:2.3.0' - implementation 'com.tencent.bugly:crashreport:3.4.4' - implementation 'com.tencent.bugly:nativecrashreport:3.9.2' - implementation 'com.airbnb.android:lottie:4.1.0' implementation 'com.scwang.smart:refresh-layout-kernel:2.0.3' diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/aop/PermissionsAspect.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/aop/PermissionsAspect.kt index 804b73b..171804f 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/aop/PermissionsAspect.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/aop/PermissionsAspect.kt @@ -1,10 +1,9 @@ package com.localee.mireo.app.aop import android.app.Activity -import com.localee.mireo.app.other.PermissionCallback import com.hjq.permissions.XXPermissions import com.localee.mireo.app.manager.ActivityManager -import com.tencent.bugly.crashreport.CrashReport +import com.localee.mireo.app.other.PermissionCallback import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation.Around import org.aspectj.lang.annotation.Aspect @@ -15,7 +14,8 @@ import timber.log.Timber @Aspect class PermissionsAspect { @Pointcut("execution(@com.localee.mireo.app.aop.Permissions * *(..))") - fun method() {} + fun method() { + } @Around("method() && @annotation(permissions)") fun aroundJoinPoint(joinPoint: ProceedingJoinPoint, permissions: Permissions) { @@ -39,7 +39,11 @@ class PermissionsAspect { requestPermissions(joinPoint, activity, permissions.value) } - private fun requestPermissions(joinPoint: ProceedingJoinPoint, activity: Activity, permissions: Array) { + private fun requestPermissions( + joinPoint: ProceedingJoinPoint, + activity: Activity, + permissions: Array + ) { XXPermissions.with(activity) .permission(*permissions) .request(object : PermissionCallback() { @@ -49,7 +53,7 @@ class PermissionsAspect { // 获得权限,执行原方法 joinPoint.proceed() } catch (e: Throwable) { - CrashReport.postCatchedException(e) +// CrashReport.postCatchedException(e) } } } diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/app/AppApplication.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/app/AppApplication.kt index a558b89..e3d9656 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/app/AppApplication.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/app/AppApplication.kt @@ -36,7 +36,6 @@ import com.localee.mireo.app.utils.MsMMKVUtils import com.localee.mireo.app.utils.MsSystemUtlis import com.scwang.smart.refresh.layout.SmartRefreshLayout import com.scwang.smart.refresh.layout.api.RefreshLayout -import com.tencent.bugly.crashreport.CrashReport import com.tencent.mmkv.MMKV import okhttp3.OkHttpClient import timber.log.Timber @@ -122,10 +121,6 @@ class AppApplication : Application() { "en" ) headers.put("system-type", "android") - headers.put("app_id", "nice_short") - headers.put("system_version", "12") - headers.put("model", Build.MODEL) - headers.put("brand", Build.MANUFACTURER + "-" + Build.PRODUCT) headers.put( "app_version", MsSystemUtlis.getVerNameInfo(instance) @@ -139,7 +134,6 @@ class AppApplication : Application() { .into() GsonFactory.setJsonCallback { typeToken: TypeToken<*>, fieldName: String?, jsonToken: JsonToken -> - CrashReport.postCatchedException(IllegalArgumentException("Type parsing exception:$typeToken#$fieldName,the type returned by the background is:$jsonToken")) } if (AppConfig.isLogEnable()) { diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/manager/CacheDataManager.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/manager/CacheDataManager.kt index 91e73e2..c4728a8 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/manager/CacheDataManager.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/manager/CacheDataManager.kt @@ -2,7 +2,6 @@ package com.localee.mireo.app.manager import android.content.Context import android.os.Environment -import com.tencent.bugly.crashreport.CrashReport import java.io.File import java.math.BigDecimal @@ -49,7 +48,6 @@ object CacheDataManager { } } } catch (e: Exception) { - CrashReport.postCatchedException(e) } return size } 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 547e460..dd73805 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 @@ -47,7 +47,7 @@ class SearchActivity : AppActivity(), StatusAction { mKeyAdapter = SearchSearchAdapter() recycler?.adapter = mAdapter - getSearchHot() +// getSearchHot() } diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/activity/VideoPlayActivity.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/activity/VideoPlayActivity.kt index 33ebf1b..d8bb7a7 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/activity/VideoPlayActivity.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/activity/VideoPlayActivity.kt @@ -580,7 +580,6 @@ open class VideoPlayActivity : AppActivity(), VideoPlayAdapter.PlayerDetailColle override fun collection(episode: VideoDetailsApi.Bean.Episode) { singleClick { - if (!episode.is_lock) { if (shortVideo?.is_collect == true) { val exampleUnFavoriteDialog = ExampleUnFavoriteDialog(this) val tvThinkAgain = @@ -617,7 +616,6 @@ open class VideoPlayActivity : AppActivity(), VideoPlayAdapter.PlayerDetailColle ) } } - } } } } diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/HomeFragment.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/HomeFragment.kt index f8a04b5..64390c2 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/HomeFragment.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/fragment/HomeFragment.kt @@ -2,6 +2,7 @@ package com.localee.mireo.app.ui.fragment import android.content.Intent import android.graphics.Rect +import android.view.Display import android.view.View import android.view.ViewGroup import android.widget.ImageView @@ -46,6 +47,7 @@ import com.localee.mireo.app.utils.TranslatesUtils import com.youth.banner.Banner import com.youth.banner.listener.OnBannerListener + class HomeFragment : TitleBarFragment(), HomeBannerAdapter.HomeBannerOnClick, TabAdapter.OnTabListener, ViewPager.OnPageChangeListener { @@ -172,7 +174,6 @@ class HomeFragment : TitleBarFragment(), HomeBannerAdapter.HomeBan viewPager?.adapter = pagerAdapter viewPager?.addOnPageChangeListener(this@HomeFragment) - } override fun initData() { @@ -316,10 +317,10 @@ class HomeFragment : TitleBarFragment(), HomeBannerAdapter.HomeBan override fun onHttpSuccess(result: HttpData) { if (result.getData() == null) { - layoutShort?.visibility = View.GONE + layoutCritically?.visibility = View.GONE } else { result.getData()?.let { - layoutShort?.visibility = View.VISIBLE + layoutCritically?.visibility = View.VISIBLE criticallyAdapter?.submitList(it.list) } } @@ -366,12 +367,6 @@ class HomeFragment : TitleBarFragment(), HomeBannerAdapter.HomeBan }) } - - override fun onDestroy() { - super.onDestroy() - - } - override fun bannerAdd(dataRes: RecommendBean) { dataRes.short_play_id?.let { doCollect(it) }; } diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/videoPaly/ExampleSeriesNumAdapter.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/videoPaly/ExampleSeriesNumAdapter.kt index 0fcbcaa..093f175 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/videoPaly/ExampleSeriesNumAdapter.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/videoPaly/ExampleSeriesNumAdapter.kt @@ -17,9 +17,11 @@ class ExampleSeriesNumAdapter : ) { holder.setText(R.id.example_tv_num_episodes, item) if (currentPosition == position) { - holder.setTextColor(R.id.example_tv_num_episodes, context.getColor(R.color.white)) + holder.setTextColor(R.id.example_tv_num_episodes, context.getColor(R.color.example_color_F56490)) + holder.setVisible(R.id.example_v_num_episodes, true) } else { - holder.setTextColor(R.id.example_tv_num_episodes, Color.parseColor("#40FFFFFF")) + holder.setTextColor(R.id.example_tv_num_episodes, context.getColor(R.color.example_color_d9d9d9)) + holder.setVisible(R.id.example_v_num_episodes, false) } } diff --git a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/videoPaly/VideoPlayerView.kt b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/videoPaly/VideoPlayerView.kt index 9f3853b..de3a4b9 100644 --- a/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/videoPaly/VideoPlayerView.kt +++ b/Android_Mireo/app/src/main/java/com/localee/mireo/app/ui/videoPaly/VideoPlayerView.kt @@ -307,16 +307,12 @@ class VideoPlayerView(context: Context, attrs: AttributeSet?) : player?.setMediaSource(buildMediaSource(episode.video_url)) player?.prepare() exampleTvEpisodePlayerController?.setOnClickListener { - if (!episode.is_lock) { EventBus.getDefault() .post(MsConstants.Constants_RecommendPlayerView_DramaSeriesExample) - } } ivEpisodePlayerController?.setOnClickListener { - if (!episode.is_lock) { EventBus.getDefault() .post(MsConstants.Constants_RecommendPlayerView_DramaSeriesExample) - } } exampleIvBackController?.setOnClickListener { EventBus.getDefault() diff --git a/Android_Mireo/app/src/main/res/layout/browser_activity.xml b/Android_Mireo/app/src/main/res/layout/browser_activity.xml index 7c64611..36e6138 100644 --- a/Android_Mireo/app/src/main/res/layout/browser_activity.xml +++ b/Android_Mireo/app/src/main/res/layout/browser_activity.xml @@ -5,13 +5,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" + android:background="#121418" tools:context=".ui.activity.BrowserActivity"> + app:title="@string/web_title" + app:leftIcon="@drawable/bar_arrows_left_white" + app:lineVisible="false" + app:titleColor="@color/white" + /> + android:layout_height="match_parent" + android:background="@color/transparent" + /> diff --git a/Android_Mireo/app/src/main/res/layout/example_item_series_top.xml b/Android_Mireo/app/src/main/res/layout/example_item_series_top.xml index b94d19f..4723a2d 100644 --- a/Android_Mireo/app/src/main/res/layout/example_item_series_top.xml +++ b/Android_Mireo/app/src/main/res/layout/example_item_series_top.xml @@ -10,10 +10,22 @@ android:layout_height="wrap_content" android:layout_marginLeft="20dp" android:gravity="center" - android:textColor="#40FFFFFF" + android:text="sadsasd" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + \ No newline at end of file diff --git a/Android_Mireo/app/src/main/res/layout/home_fragment.xml b/Android_Mireo/app/src/main/res/layout/home_fragment.xml index 3971258..ddd2cf8 100644 --- a/Android_Mireo/app/src/main/res/layout/home_fragment.xml +++ b/Android_Mireo/app/src/main/res/layout/home_fragment.xml @@ -71,18 +71,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - - - - - - - - - - - - diff --git a/Android_Mireo/app/src/main/res/values/strings.xml b/Android_Mireo/app/src/main/res/values/strings.xml index a9cb727..122cb0f 100644 --- a/Android_Mireo/app/src/main/res/values/strings.xml +++ b/Android_Mireo/app/src/main/res/values/strings.xml @@ -162,7 +162,7 @@ Set a login password of 6 to 18 characters. Please re-enter the password. - Setting title + Setting Language Switch Simplified Chinese Traditional Chinese diff --git a/Android_Mireo/common.gradle b/Android_Mireo/common.gradle index ea356f7..d9a49a1 100644 --- a/Android_Mireo/common.gradle +++ b/Android_Mireo/common.gradle @@ -4,10 +4,10 @@ android { compileSdk 34 defaultConfig { - minSdk 21 + minSdk 24 targetSdk 34 versionName '1.0.0' - versionCode 32 + versionCode 1 } compileOptions {