code style opt, reduce build time : 1m30s

2020-11-10 16:18:36 +08:00
parent 8b59221f71
commit b2af80dce8
42 changed files with 184 additions and 399 deletions
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/SettingManager.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/SettingManager.kt
@@ -49,41 +49,41 @@ object SettingManager : IMogoSettingManager {
    private var isGpsSimulator: Boolean = false

    override fun getPathPrefer(): Int {
-        return settings!!.getInt(KEY_PAHT_PREFER, 0)
+        return settings.getInt(KEY_PAHT_PREFER, 0)
    }

    override fun getVolume(): Int {
-        return settings!!.getInt(KEY_VOLUME, 0)
+        return settings.getInt(KEY_VOLUME, 0)
    }

    override fun getVoiceStyle(): Int {
-        return settings!!.getInt(KEY_VOICE_STYLE, R.id.rb_navi_detail)
+        return settings.getInt(KEY_VOICE_STYLE, R.id.rb_navi_detail)
    }

    override fun getMapType(): Int {
-        return settings!!.getInt(KEY_MAP_TYPE, R.id.rb_navi_day)
+        return settings.getInt(KEY_MAP_TYPE, R.id.rb_navi_day)
    }

    fun setPathPrefer(type: Int) {
-        settings!!.edit()
+        settings.edit()
                .putInt(KEY_PAHT_PREFER, type)
                .apply()
    }

    fun setVolume(type: Int) {
-        settings!!.edit()
+        settings.edit()
                .putInt(KEY_VOLUME, type)
                .apply()
    }

    fun setVoiceStyle(type: Int) {
-        settings!!.edit()
+        settings.edit()
                .putInt(KEY_VOICE_STYLE, type)
                .apply()
    }

    fun setMapType(type: Int) {
-        settings!!.edit()
+        settings.edit()
                .putInt(KEY_MAP_TYPE, type)
                .apply()
    }
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
@@ -19,7 +19,6 @@ import com.mogo.module.common.map.Scene
 import com.mogo.module.common.utils.CarSeries
 import com.mogo.module.navi.R
 import com.mogo.module.navi.constants.SearchApisHolder
-import com.mogo.module.navi.manager.AddressManager
 import com.mogo.module.navi.ui.adapter.SearchCategoryAdapter
 import com.mogo.module.navi.ui.base.BaseFragment
 import com.mogo.module.navi.uitls.BitmapUtils
@@ -34,17 +33,16 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa

    override fun onCmdSelected(cmd: String?) {
        if (cmd?.startsWith("position") == true) {
-            var index = cmd.substring(8)
+            val index = cmd.substring(8)
            mAdapter.current = index.toInt()
            updateMarker(false)
            goPath()
        }
    }

-    private val TAG: String = "CategorySearchFragment"
    private var addMarkers: ArrayList<IMogoMarker> = ArrayList()
-    var arrayList = ArrayList<MogoMarkerOptions>()
-    var locationList = ArrayList<MogoLatLng>()
+    private var arrayList = ArrayList<MogoMarkerOptions>()
+    private var locationList = ArrayList<MogoLatLng>()

    private lateinit var cmds: ArrayList<String>

@@ -57,13 +55,13 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
        arrayList.clear()
        locationList.clear()

-        for (index in 0 until datums!!.size) {
-            var decodeResource = BitmapFactory.decodeResource(
+        for (index in datums!!.indices) {
+            val decodeResource = BitmapFactory.decodeResource(
                    resources,
                    if (mAdapter.current == index) R.mipmap.icon_search_category_checked else R.mipmap.icon_search_category_unchecked
            )

-            var createWaterMask = BitmapUtils.createWaterMask(
+            val createWaterMask = BitmapUtils.createWaterMask(
                    context,
                    decodeResource,
                    (index + 1).toString(),
@@ -76,15 +74,15 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
                    .owner("CategorySearchFragment")
                    .`object`(index)
 //          .anchor(0.5f, 1f)
-                    .longitude(datums[index].point?.lng ?: 0.0)
+                    .longitude(datums[index].point?.lon ?: 0.0)
            arrayList.add(options)
            if (locationList.size < 3) {
                locationList.add(datums[index].point)
            }

-            var int2String = StringUtils.int2String(index + 1)
+            val int2String = StringUtils.int2String(index + 1)
            AIAssist.getInstance(context).registerUnWakeupCommand("position${index}", arrayOf("第${int2String}个", "第${int2String}条"), this)
-            cmds.add("position" + index)
+            cmds.add("position$index")

        }
        addMarkers()
@@ -92,7 +90,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa

    private fun addMarkers() {
        addMarkers.clear()
-        var marginBounder = resources.getDimensionPixelSize(R.dimen.dp_60) * 2
+        val marginBounder = resources.getDimensionPixelSize(R.dimen.dp_60) * 2
        SearchApisHolder.getUiControllerApis().showBounds(TAG,
                locationList[0],
                locationList,
@@ -101,7 +99,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
        )

        for (options in arrayList) {
-            var addMarker = SearchApisHolder.getMarkerManager().addMarker(TAG, options)
+            val addMarker = SearchApisHolder.getMarkerManager().addMarker(TAG, options)
            addMarker.onMarkerClickListener = this
            addMarkers.add(addMarker)
        }
@@ -109,7 +107,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa

    private fun registerVoice() {
        for (index in 0 until cmds.size) {
-            var int2String = StringUtils.int2String(index + 1)
+            val int2String = StringUtils.int2String(index + 1)
            AIAssist.getInstance(context).registerUnWakeupCommand("position${index}", arrayOf("第${int2String}个", "第${int2String}条"), this)
        }
    }
@@ -125,7 +123,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
    }

    override fun onMarkerClicked(marker: IMogoMarker?): Boolean {
-        var index = marker?.mogoMarkerOptions?.`object` as Int
+        val index = marker?.mogoMarkerOptions?.`object` as Int
        mAdapter.current = index
        rv_search_result.smoothScrollToPosition(index)
        updateMarker()
@@ -142,7 +140,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
        category = arguments?.getString("category")
        mSearchPresenter = CategoryPresenter(this)
        lifecycle.addObserver(mSearchPresenter)
-        cmds = ArrayList<String>()
+        cmds = ArrayList()
    }

    override fun getLayoutId(): Int {
@@ -168,7 +166,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
            goPath()
        }
        mAdapter.setOnClickListener {
-            var position = it.getTag(R.id.tag_position) as Int
+            val position = it.getTag(R.id.tag_position) as Int
            mAdapter.current = position
            updateMarker()
        }
@@ -183,13 +181,12 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
    }

    private fun updateMarker(moveToCenter: Boolean = true) {
-
-        addMarkers?.get(mAdapter.lastPosition)?.setIcon(getMarkerIcon(mAdapter.lastPosition))
-        var current = addMarkers?.get(mAdapter.current)
-        current?.setIcon(getMarkerIcon(mAdapter.current))
-        current?.setToTop()
-        arrayList.get(mAdapter.lastPosition).icon(getMarkerIcon(mAdapter.lastPosition))
-        arrayList.get(mAdapter.current).icon(getMarkerIcon(mAdapter.current))
+        addMarkers[mAdapter.lastPosition].setIcon(getMarkerIcon(mAdapter.lastPosition))
+        val current = addMarkers[mAdapter.current]
+        current.setIcon(getMarkerIcon(mAdapter.current))
+        current.setToTop()
+        arrayList[mAdapter.lastPosition].icon(getMarkerIcon(mAdapter.lastPosition))
+        arrayList[mAdapter.current].icon(getMarkerIcon(mAdapter.current))
        if (moveToCenter) {
            SearchApisHolder.getStatusManager().setUserInteractionStatus(TAG, true, false)
            SearchApisHolder.getUiControllerApis().moveToCenter(current.position, CarSeries.CAR_SERIES_F80X == CarSeries.getSeries())
@@ -197,7 +194,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
    }

    private fun getMarkerIcon(index: Int): Bitmap {
-        var decodeResource = BitmapFactory.decodeResource(
+        val decodeResource = BitmapFactory.decodeResource(
                resources,
                if (mAdapter.current == index) R.mipmap.icon_search_category_checked else R.mipmap.icon_search_category_unchecked
        )
@@ -232,13 +229,16 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
    }

    companion object {
+
+        private const val TAG: String = "CategorySearchFragment"
+
        fun newInstance(category: String): Fragment {
            MapCenterPointStrategy.setMapCenterPointByScene(SearchApisHolder.getUiControllerApis(), Scene.CATEGORY_SEARCH)
-            var bundle = Bundle()
+            val bundle = Bundle()
            bundle.putString("category", category)
-            var categorySerachFragment = CategorySearchFragment()
-            categorySerachFragment.arguments = bundle
-            return categorySerachFragment
+            val categorySearchFragment = CategorySearchFragment()
+            categorySearchFragment.arguments = bundle
+            return categorySearchFragment
        }
    }
 }