From bd285b4d2346f1a77be98ed53f7db139ee3218fa Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Nov 2020 16:24:43 +0800 Subject: [PATCH 1/5] add Matrix --- app/build.gradle | 12 ++++++++++++ build.gradle | 1 + 2 files changed, 13 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 70605f40a2..01cdfbcdc0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -372,6 +372,18 @@ dependencies { apply from: "./functions/crashreport.gradle" apply from: "./functions/widgets.gradle" apply from: "./functions/tts.gradle" + + implementation group: "com.tencent.matrix", name: "matrix-trace-canary", version:'0.6.6', changing: true + +} + +apply plugin: 'com.tencent.matrix-plugin' +matrix { + trace { + enable = true //if you don't want to use trace canary, set false + baseMethodMapFile = "${project.buildDir}/matrix_output/Debug.methodmap" + blackListFile = "${project.projectDir}/matrixTrace/blackMethodList.txt" + } } android.applicationVariants.all { variant -> diff --git a/build.gradle b/build.gradle index d210cb3ce4..e4354571d3 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,7 @@ buildscript { classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71' classpath "com.alibaba:arouter-register:1.0.2" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' + classpath ("com.tencent.matrix:matrix-gradle-plugin:0.6.6") { changing = true } // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } From b85738b920f35abdd80cda17013a4c4a48c93473 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Nov 2020 17:07:27 +0800 Subject: [PATCH 2/5] code style : reduce build compile time about 5s --- .../service/CarCorderController.kt | 55 ++++++++++--------- .../service/InformationUploadController.kt | 4 +- .../module/guide/fragment/GuideFragment.kt | 1 + .../guide/guide/GuideStageFiveFragment.kt | 1 + .../guide/guide/GuideStageFourFragment.kt | 1 + .../guide/guide/GuideStageOneFragment.kt | 1 + .../guide/guide/GuideStageThreeFragment.kt | 1 + .../guide/guide/GuideStageTwoFragment.kt | 1 + .../module/left/panel/LeftPanelProvider.kt | 2 + .../mogo/module/push/utils/AnalyticsUtils.kt | 2 + .../com/mogo/module/push/view/FloatView.kt | 24 ++++---- .../navi/ui/search/ChoosePathFragment.kt | 32 +++++------ .../module/share/StrategyShareProvider.kt | 2 + .../mogo/module/share/manager/UploadHelper.kt | 1 + .../mogo/module/splash/SplashProvider.kt | 2 + 15 files changed, 73 insertions(+), 57 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index 1e214e38c2..ba77e7ec50 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt @@ -19,6 +19,7 @@ import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrateg import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrategyMinSpeed import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.getStrategyType import java.io.File +import kotlin.math.abs /** * @description 记录仪相关操作 @@ -169,16 +170,16 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { // TANLU_ROAD_WORK // ) // ) { - taskAsync(1_500) { - try { +// taskAsync(1_500) { +// try { // VoiceController.speakVoice("上报失败") // if (isCustom) { // sendGetInfoFailedReceiver(mType) // } - } catch (e: java.lang.Exception) { - e.printStackTrace() - } - } +// } catch (e: java.lang.Exception) { +// e.printStackTrace() +// } +// } //获取图片失败也上报，图片不打点 if (isCustom) { @@ -215,19 +216,19 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { return } - var minSpeedPic = + val minSpeedPic = getStrategyMinSpeed( AbsMogoApplication.getApp().applicationContext, "pic", getStrategyType("pic") ) - var maxSpeedPic = + val maxSpeedPic = getStrategyMaxSpeed( AbsMogoApplication.getApp().applicationContext, "pic", getStrategyType("pic") ) - var speed = LocationUtil.getInstance().getSpeed() + val speed = LocationUtil.getInstance().getSpeed() if (!TextUtils.isEmpty(mType)) { Log.d(TAG, "onTakePhotoSuccess mType != null") @@ -240,8 +241,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { "onTakePhotoSuccess maxSpeedPic = $maxSpeedPic ---> speed = $speed ---->minSpeedPic= $minSpeedPic" ) if (maxSpeedPic == -1) { - if (speed >= (Math.abs(minSpeedPic) / 3.6f)) { - Log.d(TAG, "onTakePhotoSuccess abs =" + (Math.abs(minSpeedPic) / 3.6f)) + if (speed >= (abs(minSpeedPic) / 3.6f)) { + Log.d(TAG, "onTakePhotoSuccess abs =" + (abs(minSpeedPic) / 3.6f)) CosStatusController().uploadFile( mutableListOf(photoPath as String), entity, @@ -274,9 +275,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { //获取视频成功 override fun onTakeVideoSuccess(camera: Int, videoPath: String?) { - var thumbnailPath = + val thumbnailPath = AbsMogoApplication.getApp().applicationContext.filesDir.parent + File.separator + "Thumbnail${System.currentTimeMillis()}.jpg" - var isSuccess = getVideoThumbnail(videoPath!!, thumbnailPath) + val isSuccess = getVideoThumbnail(videoPath!!, thumbnailPath) Log.d( TAG, "getVideo onTakeVideoSuccess===$videoPath -----> isSuccess= $isSuccess ----> mType = $mType --- mainInfoId = $mainInfoId" @@ -291,39 +292,39 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { } if (isSuccess) { - var minSpeedVideo = getStrategyMinSpeed( + val minSpeedVideo = getStrategyMinSpeed( AbsMogoApplication.getApp().applicationContext, "video", getStrategyType("video") ) - var maxSpeedVideo = getStrategyMaxSpeed( + val maxSpeedVideo = getStrategyMaxSpeed( AbsMogoApplication.getApp().applicationContext, "video", getStrategyType("video") ) - var speed = LocationUtil.getInstance().getSpeed() + val speed = LocationUtil.getInstance().getSpeed() entity?.let { - if (entity.isCustom) { - compressVideo(videoPath, thumbnailPath, entity) + if (it.isCustom) { + compressVideo(videoPath, thumbnailPath, it) }else if (entity.fromType in STRATEGY_UPLOAD_TYPE_ARRAY) { // 属于策略上报 - compressVideo(videoPath, thumbnailPath, entity) + compressVideo(videoPath, thumbnailPath, it) } else { Log.d( TAG, "onTakeVideoSuccess maxSpeedVideo = $maxSpeedVideo --->speed= $speed + minSpeedVideo = $minSpeedVideo" ) if (maxSpeedVideo == -1) { - Log.d(TAG, "onTakeVideoSuccess 111 abs =" + (Math.abs(minSpeedVideo) / 3.6f)) - if (speed >= (Math.abs(minSpeedVideo) / 3.6f)) { + Log.d(TAG, "onTakeVideoSuccess 111 abs =" + (abs(minSpeedVideo) / 3.6f)) + if (speed >= (abs(minSpeedVideo) / 3.6f)) { //获取视频以及缩略图成功,开始上报 - compressVideo(videoPath, thumbnailPath, entity) + compressVideo(videoPath, thumbnailPath, it) } } if (minSpeedVideo > 0 && maxSpeedVideo > 0) { Log.d(TAG, "onTakeVideoSuccess minSpeedVideo > 0 -- speed = $speed") if ((speed >= (minSpeedVideo / 3.6f)) && speed <= (maxSpeedVideo / 3.6f)) { - compressVideo(videoPath, thumbnailPath, entity) + compressVideo(videoPath, thumbnailPath, it) } } } @@ -333,7 +334,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { } } - var videoAndThumbMap: MutableMap = mutableMapOf() + private var videoAndThumbMap: MutableMap = mutableMapOf() //获取视频失败 override fun onTakeVideoFail(camera: Int) { @@ -377,12 +378,12 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { /** * 压缩视频并且上传 */ - fun compressVideo(videoPath: String, thumbnailPath: String, entity: TakeEntity) { + private fun compressVideo(videoPath: String, thumbnailPath: String, entity: TakeEntity) { Log.d( TAG, - "outputVideoPath = " + outputVideoPath + ">> videoPath=" + videoPath + " isCustom = ${entity?.isCustom}" + "outputVideoPath = " + outputVideoPath + ">> videoPath=" + videoPath + " isCustom = ${entity.isCustom}" ) - var startTime = System.currentTimeMillis() + val startTime = System.currentTimeMillis() Thread(Runnable { try { VideoProcessor.processor(AbsMogoApplication.getApp().applicationContext) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt index e43b1bc9f5..e0c14ed1c3 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/InformationUploadController.kt @@ -44,7 +44,7 @@ object InformationUploadController { it.cosParameter = cosParameter it.isCustomSend = isCustomSend it.callback = callback - tryUploadInformation(it) +// tryUploadInformation(it) } } @@ -71,7 +71,7 @@ object InformationUploadController { it.informationType = informationType it.newsType = newsType it.operType = operType - tryUploadInformation(it) +// tryUploadInformation(it) } } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt index dac7b8733e..1e67d33689 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/fragment/GuideFragment.kt @@ -43,6 +43,7 @@ class GuideFragment : MvpFragment(), GuideC adapter = GuideAdapter(this) moduleGuideViewPager.adapter = adapter (moduleGuideViewPager.getChildAt(0) as RecyclerView).layoutManager!!.isItemPrefetchEnabled = false + @Suppress("DEPRECATION") moduleGuideIndicator.setSliderColor(context!!.resources.getColor(R.color.module_guide_indicator_dark), context!!.resources.getColor(R.color.module_guide_indicator_white)) .setSliderWidth(context!!.resources.getDimension(R.dimen.dp_22)) .setSlideMode(IndicatorSlideMode.NORMAL) diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt index 341bbda15d..64b3a4d15e 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFiveFragment.kt @@ -30,6 +30,7 @@ class GuideStageFiveFragment : MvpFragment> { override fun initViews() { if(!DebugConfig.isLauncher()){ + @Suppress("DEPRECATION") moduleGuidePageFive.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_five) } } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt index 434bb09496..0b703259fb 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageFourFragment.kt @@ -30,6 +30,7 @@ class GuideStageFourFragment : MvpFragment> { override fun initViews() { if(!DebugConfig.isLauncher()){ + @Suppress("DEPRECATION") moduleGuidePageFour.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_four) } } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt index b609a9b0b0..6844e29fc7 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageOneFragment.kt @@ -31,6 +31,7 @@ class GuideStageOneFragment : MvpFragment> { override fun initViews() { containerFragment?.visibleRight() if(!DebugConfig.isLauncher()){ + @Suppress("DEPRECATION") moduleGuidePageOne.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_one) } } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt index 1d8e35d73a..88238ecc21 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageThreeFragment.kt @@ -30,6 +30,7 @@ class GuideStageThreeFragment : MvpFragment> { override fun initViews() { if(!DebugConfig.isLauncher()){ + @Suppress("DEPRECATION") moduleGuidePageThree.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_three) } } diff --git a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt index 1986051ca3..37e7a8d29a 100644 --- a/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt +++ b/modules/mogo-module-guide/src/main/java/com/mogo/module/guide/guide/GuideStageTwoFragment.kt @@ -30,6 +30,7 @@ class GuideStageTwoFragment : MvpFragment> { override fun initViews() { if(!DebugConfig.isLauncher()){ + @Suppress("DEPRECATION") moduleGuidePageTwo.background = context!!.resources!!.getDrawable(R.mipmap.module_guide_item_stage_two) } } diff --git a/modules/mogo-module-left-panel-noop/src/main/java/com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt b/modules/mogo-module-left-panel-noop/src/main/java/com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt index 808dda1171..60a4a2e26b 100644 --- a/modules/mogo-module-left-panel-noop/src/main/java/com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt +++ b/modules/mogo-module-left-panel-noop/src/main/java/com/zhidao/mogo/module/left/panel/LeftPanelProvider.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package com.zhidao.mogo.module.left.panel import android.content.Context diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt index 4bc5fabfdd..817acd92a6 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package com.mogo.module.push.utils import android.util.ArrayMap diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt index 71a4f3237c..69725a94d2 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt @@ -2,6 +2,7 @@ package com.mogo.module.push.view import android.animation.Animator import android.animation.ObjectAnimator +import android.annotation.SuppressLint import android.content.Context import android.graphics.PixelFormat import android.os.Build @@ -87,7 +88,7 @@ class FloatView constructor( } private fun turnNextMessage() { - pushViewModel?.pushBean?.apply { + pushViewModel.pushBean?.apply { showTimeout = 0 updateTimer() } @@ -123,17 +124,17 @@ class FloatView constructor( pushTimer.text = if (bean.showTimeout > 99) "" else "${bean.showTimeout}s" // image - if (bean.imageUrl.isNullOrEmpty() && bean.QRCode.isNullOrEmpty()) { + if (bean.imageUrl.isEmpty() && bean.QRCode.isEmpty()) { pushImage.gone() - } else if (!bean.imageUrl.isNullOrEmpty()) { - var params = pushImage.layoutParams + } else if (bean.imageUrl.isNotEmpty()) { + val params = pushImage.layoutParams params.width = getImgWidth() params.height = getImgHeight() pushImage.layoutParams = params pushImage.visible() GlideApp.with(this).load(bean.imageUrl).into(pushImage) - } else if (!bean.QRCode.isNullOrEmpty()) { - var params = pushImage.layoutParams + } else if (bean.QRCode.isNotEmpty()) { + val params = pushImage.layoutParams params.width = getQrImgWidth() params.height = getQrImgHeight() pushImage.layoutParams = params @@ -167,7 +168,7 @@ class FloatView constructor( } // content - if (bean.content.isNullOrEmpty()) { + if (bean.content.isEmpty()) { pushContent.gone() } else { pushContent.text = bean.content @@ -175,7 +176,7 @@ class FloatView constructor( } // tts - if (!bean?.tts?.isNullOrEmpty()) { + if (bean.tts.isNotEmpty()) { AIAssist.getInstance(context).speakTTSVoice(bean.tts) } } @@ -185,6 +186,7 @@ class FloatView constructor( abstract fun getQrImgWidth(): Int abstract fun getQrImgHeight(): Int + @SuppressLint("SetTextI18n") override fun timer(time: Int) { Logger.d(TAG, "time = $time") pushTimer.text = "${time}s" @@ -211,7 +213,7 @@ class FloatView constructor( private var topViewStatusListener = object : IMogoTopViewStatusListener { override fun onViewRemoved(view: View?) { isAddWindow = false - if (pushViewModel?.pushBean?.showTimeout ?: 0 > 0) { + if (pushViewModel.pushBean?.showTimeout ?: 0 > 0) { if (getApis(context).statusManagerApi.isV2XShow) { // 被中断的消息，需要再次被显示一次 uiHandler.removeCallbacks(delayClosePush) @@ -332,7 +334,7 @@ class FloatView constructor( override fun setBean(bean: PushBean) { super.setBean(bean) - var paddingBottom: Int = 0 + var paddingBottom = 0 if (pushButton.isVisible) { paddingBottom = context.resources.getDimensionPixelSize(R.dimen.module_push_content_paddingBottom_vertical) @@ -467,7 +469,7 @@ class FloatView constructor( private fun updateTimer() { uiHandler.removeCallbacks(delayClosePush) - var time = pushViewModel.pushBean?.showTimeout ?: 0 + val time = pushViewModel.pushBean?.showTimeout ?: 0 if (time > 0) { pushViewModel.pushBean!!.showTimeout-- pushViewController?.timer(time) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt index 2986dbbf45..f7fd9cffef 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt @@ -81,7 +81,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB } override fun onCalculateSuccess() { - var calculatedStrategies = SearchApisHolder.getNaviApis().calculatedStrategies + val calculatedStrategies = SearchApisHolder.getNaviApis().calculatedStrategies if (calculatedStrategies != null && calculatedStrategies.size > 0) { mAdapter.setDatas(calculatedStrategies) mAdapter.selectTag = calculatedStrategies[0].tagId @@ -143,14 +143,14 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB return R.layout.fragment_search_category } - var mogoTip: MogoLatLng? = null + private var mogoTip: MogoLatLng? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mogoTip = arguments?.getParcelable(AMapConstants.KEY_PARCELABLE) + mogoTip = arguments?.getParcelable(AMapConstants.KEY_PARCELABLE) } // 是否开启导航 - var isStartedNavi = false + private var isStartedNavi = false override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -167,7 +167,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB SearchApisHolder.getRegisterCenterApis().registerMogoNaviListener(AMapConstants.PATH_FRAGMENT_CHOOSE_PATH, this) - var arrayList = ArrayList() + val arrayList = ArrayList() mAdapter = CalculatePathAdapter(activity, arrayList) rv_search_result.layoutManager = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false) @@ -185,7 +185,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB } mAdapter.setOnClickListener { - var item = it.getTag(R.id.tag_item) as MogoCalculatePath + val item = it.getTag(R.id.tag_item) as MogoCalculatePath selectPath(item) } @@ -202,7 +202,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB } private fun registerRetryVoice() { - AIAssist.getInstance(context).registerUnWakeupCommand("retry", arrayOf("重试"), this) + AIAssist.getInstance(context).registerUnWakeupCommand("retry", arrayOf("重试"), this) } private fun unregisterRetryVoice() { @@ -229,7 +229,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB private fun selectPath(item: MogoCalculatePath?) { item?.let { - mAdapter.setSelectTag(item.tagId) + mAdapter.selectTag = item.tagId if (SearchApisHolder.getNaviApis().itemClickInteraction != null) { SearchApisHolder.getNaviApis().itemClickInteraction.onItemClicked(item.tagId) } @@ -265,11 +265,10 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB } private fun choosePath(intent: Intent?) { - var dataJsonStr = intent?.getStringExtra("data") ?: "" + val dataJsonStr = intent?.getStringExtra("data") ?: "" try { - var jsonObj = JSONObject(dataJsonStr) - var routePlan = jsonObj.optString("route_choice", " ") - when (routePlan) { + val jsonObj = JSONObject(dataJsonStr) + when (jsonObj.optString("route_choice", " ")) { "fastest" -> { // 时间最短 selectItem(mTimeShortestPosition) @@ -282,19 +281,18 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB } } } catch (e: Exception) { - + e.printStackTrace() } } companion object { - @JvmField - val TAG: String = "ChoosePathFragment" + const val TAG: String = "ChoosePathFragment" fun newInstance(searchPoi: MogoLatLng): Fragment { - var bundle = Bundle() + val bundle = Bundle() bundle.putParcelable(AMapConstants.KEY_PARCELABLE, searchPoi) - var choosePathFragment = ChoosePathFragment() + val choosePathFragment = ChoosePathFragment() choosePathFragment.arguments = bundle return choosePathFragment } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt index 1045e2414f..f0ab2cfd02 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package com.mogo.module.share import android.content.Context diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt index 66921a0a6f..142c0d06f2 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt @@ -59,6 +59,7 @@ object UploadHelper { } else { // 没网就直接提示失败 AIAssist.getInstance(context).speakTTSVoice("分享失败，请检查网络") + @Suppress("DEPRECATION") TipToast.tip("分享失败，请检查网络", TipDrawable(context.resources.getDrawable(R.drawable.module_share_upload_fail))) } } diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt index 207206469e..b3f4d9292d 100644 --- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt +++ b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package com.zhidao.mogo.module.splash import android.content.Context From a58aa2caaf89dc625b533bb7683a6f82a58cc3ad Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Nov 2020 17:40:24 +0800 Subject: [PATCH 3/5] add kotlin parallel and incremental,plus gradle cache --- app/build.gradle | 18 +++++++++--------- build.gradle | 2 +- gradle.properties | 25 ++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 01cdfbcdc0..19b4d87013 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -373,18 +373,18 @@ dependencies { apply from: "./functions/widgets.gradle" apply from: "./functions/tts.gradle" - implementation group: "com.tencent.matrix", name: "matrix-trace-canary", version:'0.6.6', changing: true +// implementation group: "com.tencent.matrix", name: "matrix-trace-canary", version:'0.6.6', changing: true } -apply plugin: 'com.tencent.matrix-plugin' -matrix { - trace { - enable = true //if you don't want to use trace canary, set false - baseMethodMapFile = "${project.buildDir}/matrix_output/Debug.methodmap" - blackListFile = "${project.projectDir}/matrixTrace/blackMethodList.txt" - } -} +//apply plugin: 'com.tencent.matrix-plugin' +//matrix { +// trace { +// enable = true //if you don't want to use trace canary, set false +// baseMethodMapFile = "${project.buildDir}/matrix_output/Debug.methodmap" +// blackListFile = "${project.projectDir}/matrixTrace/blackMethodList.txt" +// } +//} android.applicationVariants.all { variant -> def buildTime = new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+08:00")) diff --git a/build.gradle b/build.gradle index e4354571d3..0891543e2b 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71' classpath "com.alibaba:arouter-register:1.0.2" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' - classpath ("com.tencent.matrix:matrix-gradle-plugin:0.6.6") { changing = true } +// classpath ("com.tencent.matrix:matrix-gradle-plugin:0.6.6") { changing = true } // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle.properties b/gradle.properties index 79795072ab..27be743610 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,30 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. #org.gradle.jvmargs=-Xmx1536m +org.gradle.daemon=true +org.gradle.configureondemand=true +org.gradle.parallel=true org.gradle.jvmargs=-Xmx4096m + +#开启gradle缓存 +org.gradle.caching=true +android.enableBuildCache=true + +#开启kotlin的增量和并行编译 +kotlin.incremental=true +kotlin.incremental.java=true +kotlin.caching.enabled=true +#开启kotlin并行编译 +kotlin.parallel.tasks.in.project=true + +#优化kapt +#并行运行kapt1.2.60版本以上支持 +kapt.use.worker.api=true +#增量编译 kapt1.3.30版本以上支持 +kapt.incremental.apt=true +#kapt avoiding 如果用kapt依赖的内容没有变化，会完全重用编译内容，省掉app:kaptGenerateStubsDebugKotlin的时间 +kapt.include.compile.classpath=false + # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects @@ -18,7 +41,7 @@ org.gradle.jvmargs=-Xmx4096m android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -org.gradle.parallel=true + ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ From f751e1a30817046fc88e00e75665a88a5ebceef5 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 10 Nov 2020 19:22:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B1=82=E5=8A=A9UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values/colors.xml | 1 + .../res/layout/module_ext_layout_entrance.xml | 8 ++++---- .../res/values-xhdpi-1920x1000/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 2 ++ .../scene/help/V2XSeekHelpButton.java | 2 +- .../main/res/drawable/bg_v2x_cancel_help.xml | 15 +++++++++++++++ .../layout/module_v2x_event_share_item.xml | 4 ++-- .../icon_heart_second_light.png | Bin 2184 -> 1687 bytes .../icon_heart_unchoose_light.png | Bin 2039 -> 1115 bytes .../drawable/icon_heart_second_light.png | Bin 822 -> 701 bytes .../drawable/icon_heart_unchoose_light.png | Bin 771 -> 486 bytes .../main/module-common-res/values/colors.xml | 4 ++++ .../drawable/bg_v2x_cancel_help_light.xml | 15 +++++++++++++++ .../bg_v2x_event_description_light.xml | 4 ++-- 15 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml create mode 100644 skin/mogo-skin-light/src/main/module-common-res/values/colors.xml create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml diff --git a/modules/mogo-module-common/src/main/res/values/colors.xml b/modules/mogo-module-common/src/main/res/values/colors.xml index d73639033d..0856fc721d 100644 --- a/modules/mogo-module-common/src/main/res/values/colors.xml +++ b/modules/mogo-module-common/src/main/res/values/colors.xml @@ -3,4 +3,5 @@ #7f000000 #FFFFFF #FFFFFF + #FFFFFF \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 97b5c3903e..434ab6b7c4 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -146,8 +146,8 @@ android:background="@drawable/module_ext_dw_common_corner_bkg" android:gravity="center" android:text="前方\n实况" - android:textColor="#FFFFFF" - android:textSize="@dimen/module_ext_navi_exit_textSize" + android:textColor="@color/module_commons_FFF_333" + android:textSize="@dimen/v2x_cancel_help_text_size" android:textStyle="bold" android:visibility="gone" tools:visibility="visible" /> @@ -160,8 +160,8 @@ android:background="@drawable/module_ext_dw_common_corner_bkg" android:gravity="center" android:text="取消\n求助" - android:textColor="#FFFFFF" - android:textSize="@dimen/module_ext_navi_exit_textSize" + android:textColor="@color/module_commons_FFF_333" + android:textSize="@dimen/v2x_cancel_help_text_size" android:textStyle="bold" android:visibility="gone" tools:visibility="visible" /> diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 75f2f2b1fa..25cd518534 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -52,6 +52,7 @@ 32px 60px 32px + 30px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 1fa92b0372..7e1bb606da 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -52,6 +52,7 @@ 32px 60px 32px + 30px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index fcf04ade3f..68b1975ee0 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -53,6 +53,7 @@ 20px 30px 16px + 14px 8px @@ -171,4 +172,5 @@ 10px 22px 16px + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java index c032668c54..00a06744ca 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java @@ -54,7 +54,7 @@ public class V2XSeekHelpButton implements IV2XButton { tv = V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2); tv.setText("取消\n求助"); tv.setVisibility(View.VISIBLE); - tv.setBackgroundResource(R.drawable.bg_v2x_event_live_show); + tv.setBackgroundResource(R.drawable.bg_v2x_cancel_help); tv.setOnClickListener(v -> { //调用取消求助接口 // TODO: 2020/5/18 回调，显示对话框 diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml new file mode 100644 index 0000000000..8882692332 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index 044f98c29d..6bf0a69a87 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -33,7 +33,7 @@ android:layout_alignTop="@+id/road_case_style" android:paddingRight="@dimen/dp_28" android:text="100" - android:textColor="#FFFFFF" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_26" /> E5tj{+Fn?Wmk@4 zLqWTei!nbgUWfzPI&(DL^8d znu4>9w|L0m{D07JG_%xq920vQ6eH_Q0rYWb2y55i!%p-Q+sQ@El1ox z&JP!b)|Hh@cfpZ|VGo{oce#Q4`o6gDzRo`4j*Vsv zYicSIUVlc<&)K7C+VP?Y81`TCw$1GB{^HEJ^NS&Xj0p@uQ$;H4wfxL1gp?zmV6!`R zkeU_`;@=)^|+x0H`3x|NGq>i{(K=bn-Sof zopoioJR-;xd>h_87JG6nJr?95_C}YwyUHvAOmzyupd>kx#@PVIuVI-j1Ymp;$eq}4h!Fb*RZ<}O$g$iDdNeAj zP+7<9mqZDyGNn>nWdS8A%~>d`8ii0e5PhdEV_f77ncYafG7ivhXP(E2r>fs zfq&CX{Y-v1_VEco)H0O`sGvt&WQ+IEB@qBfkBY*cZzuqvatI`I+|Cd_3Z=8D$v#bR z-h|6HhUD#Aj3`65tOj6eGcmlYfYyr*SM`?qd!RoRmfa3eH{)k^sly9>=xwIT4=x zO>!l&=L-@Ip{$7!4tEbB$+tZqUs*c=%Zu`Isc|_)$@PO@9+oQj&5K zBq?(e9zVnLXi9>hApwq+m>Siy+MmPKAD2Qh>rmeY*m;4a4FB@T&|8fFdXfN9l91?N z&d&hP=f;(Q8V)^Hqv0OcPJjfT@pxIB)!p~z>|1Z24B)T)b*N!aLX0yiN)Du?bYhN1 z18SrmAtj=Fzu`QK`~a2Nn162*TDELiG>}w2!sa8)OsOY0<&)Fb6ecu)BysO5^*)Jh z5+UDE!ZnUbfOUgsu4}A>6PhiR=s|nd-d-5^{XD)t=|&+T#<7DS@RQFTu@1Za>O zA&GOC9|M7^0_NAXx*r=oVR!CKn!5WoHLY09|2e%USBAUOE0KiuWOKsMlK|)J2O<2* zF$y;%fiv~5h8y)7Dxf{p^1${CMbH;Mf2ygce-lO;5%y;x$N$N=*Y>~bUQKu)9OuCN zGj=n+s@q`txjcX9J!JrAPJ}xD+xWzy=B~k^Ljd)|Sv!x6FykTvORxn*K-?hOX(Fv>S|P z7O1PE$xG6{``*3x`1ySAyKB-)RRnKx-#PdE_Q&%VLt4r6e^X{>_2DZNK1Zea^Ms6Y{-uN%-gQ^?Sw6jV|EAIC{>?AvV?#p+w>uVUXaeR&2FU@UMxrHhf5mg?b3O$T?!e9;rM3&_kWC zc%s^|u{eYv)2-`MY^bKGKRYncd4_Y>JqHi|cJ1;(<$dYCPdp3kPT)b4OkGaEU#}F8 z{PE+1gMSC_0M7Tpq6TgenAU(4VQKA4{o8+JFSNJ)!G>_3Dv8nNW`sm0j6$E>y6flI z7-6mkVG)pO0Ej|B>rBnp;&hdO27`e1H&^q4hOc zef0RpVA4iC(5$J6)V#D__RSV-<^_JRa1sPm!G8cwvoO7{-hO-Ouv&G^_(U=6-d#99 zHCfMW0`g$Q7)E1)*ac?a0wcN{y#_dU}?)M(NKTe<`^pKGZu! zXV=>2Up$XE*^9NSupBNnQP$eXdq2tSv~O*0y$oGjmd6F@rO@YbcBnN_`CnLX=8~DwVCHn4=X`b+%^h zv6CGT@^sFK0w@$_$x31xBR;?+34hUSWooosMyYK+D{|-VW2d%HwXUZTce1V!CO~(b zAn=NVK|{1_SJ(47gIoxmu;Tg1v58*TXpr_uI0H4fnQvcT*YB?tz$MoS;owJ)|LH4< z4L^$!H?#v>3I^TJ{VM@nf5T_8b=?p4?Hk#0!$p{6n&`t~v^a6}J21o}h=0GEIPuQQ z@aIcIqiTqg$Gj=-wTBPGR#%_F!9g74H*ZNzx*2|RvE)09%Bq| z3KABC1Xd18jD0vhMoLZ$41a9PJET|uR5bD5tx6hPy}VfDM7Rl z4(0frg)#||2x|j=kuC%#Ap|LiFo}`5nQJhIGbizwN9@Jgf`kh`X@4}r8jqB}SzV&l zG%H91LN!wmb~#UIwtDwL%goa`PG#kjrv=Qd1QL*=i<)kLyFdWPkroLk)_`~xU7e$3@{l^oz=lY6SO>w#6PK3X%MD43MWt0?DtS86kjZNotay3i?gLS>5A0lH^$cEqTk2ik?j5j5D5e%Fz;j_1W<_J*`gLu5*TA!bbl>pcI@cj^;;8xt+{jj zPp6+9=!7NoRvqK}vYAT^}v;R2Vr1L9R{=k#J&=e*#AK#b1L z%yb>;>Dlszg5zgJk+;u018vOb!p4pMToU~f7+nlf2B>BaCN-xraLpzLwVte~3%KdW zIEvJW-e)xf_kSS$X8pk7Ia{eroi6JoYiE@&(NzF`aD_H5hw#{!CAR`{~z zCwliF*fRnEZ6GyqN#1()KOv9<{#QiuO>A+h{umMb4H7!l_i!gmHE!&$!3ERH*Ztr6 lr|(_2cX;^Mcm1z`{{)x7@1|dS=^Ow6002ovPDHLkV1hzIEnENq diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_light.png index 09ab4af9e358c0e0388249c2207cab6a1727ea6e..003cf9aa07acfd65ac46e304124e9beb1910885f 100644 GIT binary patch delta 1082 zcmV-A1jYOJ58DWkFn20i-=If{sGB895j$jnke)^6clu& zK^ZhEoD|}qK{asLOos&$6pbPpL|HbeXs&rnB&f_wI>~}mu4%Wt{eHXsoco^TK9?&& z3!d}5>-~7vyVqWO?=v&QSXx?ov*&&C2*)A#0{9L5Dz6!hMt?70{0`2`%s+tt9aQX& zt=>9ts}A^H_1?f<)?%VgMVI>*@g`O{s zFuH;C%NSAXlDUQt`|u=@ylc|a&r|`gC5XKfxHDbT@4{K4<%Kl_uYk)vo1h)OVnQ3t zT)u3=OMQh(QGZiGobE1{hD_WGvJVD-PU1NP zJR=+XoO)+|ApW`MTx}o7FTrPYXP4uFhHuB6U>i`Qt&NU*?6EqQ?dcjp;3=Gb zn^P#qZkwrdKlpD0hsW$jFs*h-Pv3Exne&z84*1gZ>e6wFrt!4A+GMrWiB|Q;KJHdN z41YXHamv+>K+DOAKl8SJ$Zw5DUKX2dM7SGOuohQ;>~Nbm&0q6|?2!lbtI~)K33sUF z*4M^UYcsLs%)`;CIX|uCpuER9@#E-!q;#7r3&$^4+jz~Xu^~ITa&FBTdN^4h--if3 z+AmZ^YO(%6e;dmJUTw{rX8X7D6uFacw156Rup9s80ii6aXzXzH#ZD|-{lB2$J49bM z#yb*+OhdkmX2G2xLg5I?)m}~fEH!hr0p{HpY$QP%@-ROJYD0DLY7aFM-_K~+z{FQ7 z>&PoMl0+IZ?*ZU{_K2s6%;ngL&Exxar3Q$1V^xhLxo_xx=I)S-Wx>`yMeM|C8Z#iT z8`srHie#GdarZl4oAHnKN#p*KWm{h?UK}03jhEB07*qoM6N<$f>whW AnE(I) delta 2013 zcmV<32O{{}2=@<=Fnt8OG=9I!#)#Nf#srB%pv;RDb|cQUNV2 zKvb3*65P-wPRm@rimL8FW4YOLhN9HsE7nzRl-SWQ__YIHFc6U z*Y}(me$R~0wN2Bg2#KS6?|i-U&htL+$DC^n&$03OBWkCo7k~Gtwd3P+zp&oja>n1V z)~~c$cExJtc>Cm&E`=K*`1hWE`ib9bE*gn2lH$PJ|i~Afqjd3ixjzjb4=-?ll z^-b;U?AeDmO*Dgvsrh}AlMDNsal5_v;4Hv37H==08gRlQ(5@3g2A_`%#+h!ib`^_+ zW7P(`8rk4t>LzbiolOjq?Sg*QxkO)p*~Fr$n8$W|ynp@DL8%W|0Vi3t%nhOM9mhnv z`p(}MTh6a0hc;U00$S{q!-w}==Miq^qGwlS;P3` z+@4sQ2RuGW$<)TA+Im}=7_L75{Lrr#7ZY9S!@+2kQyC~Pex*3fsR_RdvI z)&pz8n_&FfloE>_mw{%eob zrKKf*?OKQUfDi1|w+A_eyg_4+q6ose6Rth`?0>$$iQt|R4fGTjof*hx*_hE31P(KR zZvB;!k-Zm-bou>|l8uY_`}=IlineYIZyh+W_l=F~O~0pPe0=^}&Y7=3Zg9^1`MKu~ zz0wG&J$LThmP?mbzK6%|HKw|9`}U6WM~?iM$j2PPA3whE0&Xszk(ZpSp}F>c+u5

o893DBf9bJI3Q+xgN3`;v1f} zZ})!)(U6kP)+VM%hSW4M$Apcf9|6ZYa8azFYhs1?=0GWW_g(X)fIu|f);21LiV)k1 zP((G+n;ffbU|&pLrec)yQW8Tj_o?#LmVZcvohZ$M%Z`}mQS6Bg&0CkUV#P^=LT!vx zPHoDQIbRGm5Q&0LNE1aUZqU)95Gx@()ZJ9YK9Jvk|CVJJ!hNT3QdGj}L@DSgCVxbe zAzO8*S0152a-6PyH83#nzLN`qzKr?USvIN73ApBVd8RR;u2G5tx%lA0z31t#hkyO# zgUytk*|LrOF;GjrnWDTSSM*Me(ZffREG{;5GAc|E<{DZ}!sYa)cOv!E&ULuTAb z!AC05!u0f+FJkg8y15X2)i*T?h9-o6$A1R5lIv}`o`F$Nc2_2 z?DE*ylgkai8OX6?Gv9H}?$$vl$eYlvyo{D0By`9nB?SFk&!tqr95pHZu74o0kFb?g zYyhK+ix$_Cqc-B{s4SY9_@8WKpePr( z1Wgngz)9A#Ssy8HSSSZ+jC(U1GP1C`(O|LUFY-F!zoz19fNH2Ph$iPLEaC##nv*ge zL>5XHR)x%*0aC7n$cU@8f`5c86cRv|mpAwNv zAseZDu#)RruJ*-h=oc)RLk(tq4X_PJ){HsRQa;ruyE91M24a9!DjRM9a$#H7L1sld zyn#Ir!q|cjA6`{$mT%Rnpb0pLASaCz*y&#&d{nyyo{tFq1qJDb%<*)L-{0$wtG4eMC zsIo}wqy~3i0YN_X0)J4T#G~5s9SxVqYXYi#V`+d97oM1xWXK6tbn z(=KI$>WAUF)bR>fUBxBpl^F^;t$5bf`uHXT$N^bE_W&u5GJ_f1^~;xETRwX9sN9yH zO+cDS&UgGfd6>BB&j+u$AzRe+QJk5<`W6-z%NuKLT%~ZeY=4Vj%@<|{7+e0@=upBf`OUZtnCqVYeR&h?{jc2vlKb-SWZ^9OXN*xJUq7tu0p%9eVuYod7gv z-4#e9BtTq;yb0dZFE=O-TGRvupQzWkxBy04j&voHafA1*e-01-Z+sj8jqd*nNV7@pi4$i&UsbkWMX*WF vR%`1&hK2^-+$i^d>+8=Of2u$IzaIE+C^4S=O6!u?00000NkvXXu0mjfZDRKK diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_light.png index e26dbe8a7bf4deb95504989940b92596bda2c7a1..e805f56811717226301b0bd842bbe3504b376705 100644 GIT binary patch delta 664 zcmV;J0%!fU2E7H4F@JYSL_t(I5tUO*Yg0iKK4U0RCxAfz<~(NzrEibAQC;w!aDo5#()<9Fs}Vu}lK;LAC4 z<~!evi$Fs0Jwy=>8(rwvL1b`fKvb|eiV2<0u>Yt6V{QS| zh(c-_5wX{Flu*+f)t@ii4I-KnVl%WPN2r4^Em`*SAAg!FTnh|66k=PcLy*9>RrJ&M z(apteL2NLmkyQD!c?HP9XQb>^m2 ybvVCp8F6Vv{x>DZ`7c{MId~86=E%R2egi!xAQ4(7vb#k90000Y5ltrV%)bUy+AuVZ`X|5BG%^S)Q_Q0 z&rxbprLCIJ_wNs1xNvz7F)wG5YrA)Ey~)|74QdE_q$Ip^P18fj3s^YMECsgS9qY$& z(v^vsVw{Tb2tELC9-WOCqPaGV6^9C-V1=*7WCiYmC4aBVg^1(V5~?1?BtMQQfTO_Y z0KnuNSaZ8}Y!1Cst1VPIDp77%&k?wH^u_^v?w+FMPGt)p1AH{2b01k#4Ml1nzff!Zib@hn6Q~h z%CLug+<%A+R*Sy8r5DQyrnUM z5?M*zC^nf*mZ1Xe`e@i!qX`*Q7FpD=XdVj*^Kofag+1T%-l2cX6}72my0V+(|lew z#tL+oU~FStw8;Y%MRqW%pbQ?t186KZm%xBLDd*r%a13S&JbxyEH@(~V;-IYwTNf<-T5`u?F1?%(Mx1Y2%HcMi_)tYb>PLNBuOqC3im|32>M+p^wdsZ z9q6#O$gCpLXhYx(zo_B&aC{HGarIc#{I3z}NBD>=TYJ4GvOsHs;1_{+!0~HM)k7-~j%;s5lB{TX%E>I;Tz04RmLkPAur_*##-k z9d`iJnC_m~p$cta^hAM)ve?JWZWhzvx-kvzH{bB}l^Sc$V9Cacf2pG`j5Rq?>;-23 z#d_JPKkaD(V;RNtMs=6f(G9l}zS?FXgkjO)1jYzZqB(WqZN;uBP=cH5S0US>pt{qq qZN~)9FQ(ui`0;OL75D~390Qx%j7wzz0000^YA-24=OIi12;2g zGV|S;Z@x>^JB>y|so+d!auHE&JU@}#1|}>{t+sNp zR$Dz6e4Yaa%qj1EBBDFYvdzrK3nhXW?j4Q5kY{QuiaOp?f*Cr_Ns?0n8wyp216(+j z%E}c%bwCW&4uAe|q?^U!)n+$i$8Wv9c0P{RM|XsXXJ(%1k&zGMXkUhhd973`{hFV@ ze}c6xxYWI!p1$!e5O)WScSJZL;SPJh%{nrnX;6ki?0fB55*ALGIPpZONMyZ*)q?&g z)q2-n^hzl+p^DSs6FDTR?p<_9{31%}=ZX{(C5($dLw};hBO#WS%a=c96jUn9C%u;g zBHi)5qKt-{rE9Oklmng?79JdpBE3Hl7)YI*9DlKshJhc)PY%WLjh_PNNs}KVrh5@G08R(SM2^-D;I0F>Nj>QF4Sx|rifOu?zY*uWE9RzDq zfGU^sk|eT@H+IBhd7vD?X_x-6U7dO+Ill!8~Qno<_@cD zjL?2~a|Ax{MvP(5EdX&39b$AO + + #333333 + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml new file mode 100644 index 0000000000..418d03a9bb --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml index 48d0b7deb6..79c69fb8a2 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -4,8 +4,8 @@ From c9a0e0efb5007f6b55bc341655934879fde2bb03 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Nov 2020 19:52:15 +0800 Subject: [PATCH 5/5] remove ndk filter in v2x module --- modules/mogo-module-v2x/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle index c245d03849..52c1c51a4c 100644 --- a/modules/mogo-module-v2x/build.gradle +++ b/modules/mogo-module-v2x/build.gradle @@ -22,7 +22,7 @@ android { } } ndk { - abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a" } }