diff --git a/app/build.gradle b/app/build.gradle index 6329f1c110..19b4d87013 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -373,8 +373,19 @@ 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 + } +//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")) def flavor = variant.productFlavors.collect { it.name }.join('-') diff --git a/build.gradle b/build.gradle index d210cb3ce4..0891543e2b 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 } diff --git a/gradle.properties b/gradle.properties index a95ab390e3..343c7e7243 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/ 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 5b75545d89..8aa47180e3 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 记录仪相关操作 @@ -175,16 +176,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) { @@ -222,19 +223,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") @@ -247,8 +248,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, @@ -283,9 +284,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" @@ -300,39 +301,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) } } } @@ -342,7 +343,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { } } - var videoAndThumbMap: MutableMap = mutableMapOf() + private var videoAndThumbMap: MutableMap = mutableMapOf() //获取视频失败 override fun onTakeVideoFail(camera: Int) { @@ -387,12 +388,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-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 fbcc5e2099..99476d878e 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-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 36277458c3..0a4e97698c 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 @@ -61,6 +61,7 @@ object UploadHelper { // 没网就直接提示失败 Logger.e("UploadHelper", "upload not net ") 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 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" } } 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" /> + + #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 @@