diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 369ff9de4b..e17e5519c1 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -138,6 +138,8 @@ public class AMapNaviViewWrapper implements IMogoMapView, mMapView.setRouteOverlayVisible( false ); mMapView.setCarOverlayVisible( false ); mMapView.setNaviMode( AMapNaviView.CAR_UP_MODE ); + + setRenderFps( 20 ); } } @@ -631,4 +633,14 @@ public class AMapNaviViewWrapper implements IMogoMapView, MotionEvent upEvent = MotionEvent.obtain(downTime + 100, eventTime + 100, MotionEvent.ACTION_UP, 0,0, metaState); mMapView.dispatchTouchEvent(upEvent); } + + @Override + public void setRenderFps( int fps ) { + if ( checkAMapView() ) { + if ( mMapView.getMap() != null ) { + mMapView.getMap().setRenderFps( fps ); + Logger.d( TAG, "设置刷新帧率 fps = %s", fps ); + } + } + } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java index fee5856728..aa872c69b9 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java @@ -177,4 +177,11 @@ public class AMapUIController implements IMogoMapUIController { mClient.startJumpAnimation( marker, high, interpolator, duration ); } } + + @Override + public void setRenderFps( int fps ) { + if ( mClient != null ) { + mClient.setRenderFps( fps ); + } + } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 89f8593d08..764808e96c 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -61,9 +61,10 @@ public interface IMogoMapUIController { /** * 设置锁车缩放级别 + * * @param var1 级别 3-20 */ - void setLockZoom(int var1); + void setLockZoom( int var1 ); /** * 预览全程 @@ -138,4 +139,11 @@ public interface IMogoMapUIController { * @param duration 动画时间 */ void startJumpAnimation( IMogoMarker marker, float high, Interpolator interpolator, long duration ); + + /** + * 设置刷新帧率 + * + * @param fps + */ + void setRenderFps( int fps ); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index 1b008b9743..b1f6d6e6f6 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -170,4 +170,11 @@ public class MogoMapUIController implements IMogoMapUIController { mDelegate.startJumpAnimation( marker, high, interpolator, duration ); } } + + @Override + public void setRenderFps( int fps ) { + if ( mDelegate != null ) { + mDelegate.setRenderFps( fps ); + } + } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 5a5324203f..36bf0f03b4 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -21,8 +21,6 @@ import com.mogo.map.location.MogoLocation; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.module.common.MogoModule; -import com.mogo.module.common.MogoModulePaths; import com.mogo.module.main.assist.MapBroadCastHelper; import com.mogo.module.main.cards.CardModulesAdapter; import com.mogo.module.main.cards.MogoModulesHandler; @@ -32,7 +30,6 @@ import com.mogo.module.main.cards.OrientedViewPager; import com.mogo.module.main.cards.VerticalStackTransformer; import com.mogo.module.main.constants.MainConstants; import com.mogo.module.main.windowview.WindowViewHandler; -import com.mogo.module.service.ServiceConst; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cardmanager.IMogoCardManager; @@ -276,7 +273,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); - MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); +// MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); mMogoModuleHandler = new MogoModulesManager( this ); mMogoMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation(); diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt index 08bbc985f5..b59d2d88dc 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt @@ -1,7 +1,5 @@ package com.mogo.module.navi.ui.setting -import android.content.Context -import android.media.AudioManager import android.os.Bundle import android.view.View import android.widget.CompoundButton @@ -9,7 +7,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import com.alibaba.android.arouter.facade.annotation.Route -import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.commons.debug.DebugConfig import com.mogo.map.constants.BroadcastMode import com.mogo.map.uicontroller.EnumMapUI import com.mogo.module.common.MogoModulePaths @@ -21,33 +19,10 @@ import com.mogo.module.navi.manager.AddressManager import com.mogo.module.navi.manager.SettingManager import com.mogo.module.navi.manager.VolumeManager import com.mogo.module.navi.ui.base.BaseFragment -import com.mogo.service.MogoServicePaths -import com.mogo.service.module.IMogoSettingManager -import kotlinx.android.synthetic.main.fragment_navi_setting.iv_back -import kotlinx.android.synthetic.main.fragment_navi_setting.iv_navi_sound_high -import kotlinx.android.synthetic.main.fragment_navi_setting.iv_navi_sound_low -import kotlinx.android.synthetic.main.fragment_navi_setting.iv_sound_minus -import kotlinx.android.synthetic.main.fragment_navi_setting.iv_sound_plus -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_auto -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_day -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_detail -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_draft -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_fee -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_high_way -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_jam -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_night -import kotlinx.android.synthetic.main.fragment_navi_setting.rb_navi_no_high_way -import kotlinx.android.synthetic.main.fragment_navi_setting.rg_navi_day_night -import kotlinx.android.synthetic.main.fragment_navi_setting.rg_navi_sound_type -import kotlinx.android.synthetic.main.fragment_navi_setting.sb_navi_volume_progress -import kotlinx.android.synthetic.main.fragment_navi_setting.tv_navi_clear_company_address -import kotlinx.android.synthetic.main.fragment_navi_setting.tv_navi_clear_home_address -import kotlinx.android.synthetic.main.fragment_navi_setting.tv_navi_company_address -import kotlinx.android.synthetic.main.fragment_navi_setting.tv_navi_home_address +import kotlinx.android.synthetic.main.fragment_navi_setting.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -import java.util.HashMap /** * @author zyz @@ -242,6 +217,30 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { AddressManager.goHome() } } + + if (DebugConfig.isDebug()) { + sb_navi_fps_progress.setOnSeekBarChangeListener(object : OnSeekBarChangeListener{ + override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) { + if (progress == 0) { + tv_fps_value.text = "-1" + SearchServiceHolder.getMapUIController().setRenderFps(-1) + } else { + tv_fps_value.text = "${progress}" + SearchServiceHolder.getMapUIController().setRenderFps(progress) + } + } + + override fun onStartTrackingTouch(seekBar: SeekBar?) { + } + + override fun onStopTrackingTouch(seekBar: SeekBar?) { + } + }) + } else { + tv_navi_fps.visibility = View.GONE + ll_navi_fps.visibility = View.GONE + } + } private fun updateHome() { diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml index 743b7574f9..128d9cdd89 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml @@ -370,6 +370,7 @@ + + + + + + + + + + diff --git a/modules/mogo-module-search/src/main/res/values/strings.xml b/modules/mogo-module-search/src/main/res/values/strings.xml index 3eeafea9be..e29a469f1e 100644 --- a/modules/mogo-module-search/src/main/res/values/strings.xml +++ b/modules/mogo-module-search/src/main/res/values/strings.xml @@ -40,4 +40,5 @@ 清除 去设置公司 日夜模式 + 设置刷新帧率