From 69abf6071ac0feed0b3bf2da7f906f57659ed5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 12 Feb 2020 18:48:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化了地图的气泡高亮展示性能，放到了子线程 --- .../service/marker/MapMarkerManager.java | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 6025257b38..10a74a29a8 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -77,7 +77,8 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag .getMogoSocketManager() .registerOnMessageListener(401001, this); - MarkerServiceHandler.getMogoCardManager().registerCardChangedListener("LAUNCHER_MARKER_MODULE", new IMogoCardChangedListener() { + MarkerServiceHandler.getMogoCardManager() + .registerCardChangedListener("LAUNCHER_MARKER_MODULE", new IMogoCardChangedListener() { @Override public void onSwitched(int position, String moduleName) { @@ -184,26 +185,32 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag // 对指定类型高亮处理 - public synchronized static void highlightedMarker(String typeTag) { - try { - Map> allMarker = MarkerServiceHandler.getMarkerManager().getAllMarkers(); - for (Map.Entry> entry : allMarker.entrySet()) { - String keyStr = entry.getKey(); - List markerList = entry.getValue(); + public synchronized static void highlightedMarker(final String typeTag) { + Handler handler = new Handler(); + handler.post(new Runnable() { + @Override + public void run() { + try { + Map> allMarker = MarkerServiceHandler.getMarkerManager().getAllMarkers(); + for (Map.Entry> entry : allMarker.entrySet()) { + String keyStr = entry.getKey(); + List markerList = entry.getValue(); - if (keyStr.equals(typeTag)) { - for (IMogoMarker marker : markerList) { - marker.setAlpha(1f); - } - } else { - for (IMogoMarker marker : markerList) { - marker.setAlpha(0.7f); + if (keyStr.equals(typeTag)) { + for (IMogoMarker marker : markerList) { + marker.setAlpha(1f); + } + } else { + for (IMogoMarker marker : markerList) { + marker.setAlpha(0.7f); + } + } } + } catch (Exception e) { + e.printStackTrace(); } } - } catch (Exception e) { - e.printStackTrace(); - } + }); } /** @@ -327,7 +334,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag } // 将数据同步给探路，避免探路每次 perform 的时候去拉取，造成消耗 - MogoDataHandler.getInstance().invoke( ServiceConst.CARD_TYPE_ROAD_CONDITION, exploreWayList); + MogoDataHandler.getInstance().invoke(ServiceConst.CARD_TYPE_ROAD_CONDITION, exploreWayList); if (exploreWayList != null) { for (MarkerExploreWay markerExploreWay : exploreWayList) { if (!markerExploreWay.getCanLive()) { From 13463aa79bddd8b05c98fb94dbd9e69c8fd0bc2d Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 12 Feb 2020 21:06:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI-175?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foudations/mogo-commons/build.gradle | 3 ++ .../com/mogo/module/map/VoiceConstants.java | 2 +- .../module/navi/manager/AddressManager.kt | 3 ++ .../navi/ui/setting/NaviSettingFragment.kt | 49 +++++++++++++++++-- modules/mogo-module-tanlu/build.gradle | 1 - 5 files changed, 53 insertions(+), 5 deletions(-) diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index 10c8490898..41630f2f28 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -45,6 +45,9 @@ dependencies { implementation project(":foudations:mogo-utils") compileOnly project(":libraries:mogo-map-api") } + api 'org.greenrobot:eventbus:3.1.1' + + } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java index d68f8b471a..eb2a1bc06c 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java @@ -40,7 +40,7 @@ public class VoiceConstants { */ public static final String CMD_MAP_HISTORY = "com.ileja.navi.map.history"; public static final String CMD_MAP_HISTORY_UN_WAKEUP = "CMD_MAP_HISTORY_UN_WAKEUP"; - public static final String[] CMD_MAP_HISTORY_TRIGGER_WORDS = {"查询导航历史记录"}; + public static final String[] CMD_MAP_HISTORY_TRIGGER_WORDS = {"导航历史"}; /** diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt index d995bf154c..91ef365590 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/AddressManager.kt @@ -17,6 +17,7 @@ import io.reactivex.ObservableEmitter import io.reactivex.ObservableOnSubscribe import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers +import org.greenrobot.eventbus.EventBus /** * @author zyz @@ -104,6 +105,8 @@ object AddressManager { } fun insert(searchPoi: SearchPoi) { + + EventBus.getDefault().post(searchPoi) if (searchPoi.type == DataConstants.TYPE_COMPANY_ADDRESS) { companyAddress = searchPoi } else { 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 ccd0996efb..dddc4c9907 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 @@ -14,6 +14,8 @@ import com.mogo.map.constants.BroadcastMode import com.mogo.map.uicontroller.EnumMapUI import com.mogo.module.common.MogoModulePaths import com.mogo.module.navi.R +import com.mogo.module.navi.bean.SearchPoi +import com.mogo.module.navi.constants.DataConstants import com.mogo.module.navi.constants.SearchServiceHolder import com.mogo.module.navi.manager.AddressManager import com.mogo.module.navi.manager.SettingManager @@ -41,6 +43,9 @@ import kotlinx.android.synthetic.main.fragment_navi_setting.tv_navi_clear_compan 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 org.greenrobot.eventbus.EventBus +import org.greenrobot.eventbus.Subscribe +import org.greenrobot.eventbus.ThreadMode import java.util.HashMap /** @@ -103,6 +108,9 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { } initViews() initEvent() + EventBus.getDefault() + .register(this) + } private fun initViews() { @@ -202,13 +210,12 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { tv_navi_clear_home_address.setOnClickListener { AddressManager.deleteHome() - updateHome() - + clearHome() } tv_navi_clear_company_address.setOnClickListener { AddressManager.deleteCompany() - updateCompany() + clearCompany() } tv_navi_company_address.setOnClickListener { @@ -234,6 +241,18 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { } } + private fun clearHome(){ + tv_navi_clear_home_address.visibility = View.GONE + tv_navi_home_address.text=getString(R.string.navi_set_home) + } + + + private fun clearCompany(){ + tv_navi_clear_company_address.visibility = View.GONE + tv_navi_company_address.text=getString(R.string.navi_set_company) + + } + private fun updateCompany() { if (AddressManager.hasCompany()) { tv_navi_company_address.text = AddressManager.companyAddress?.address @@ -242,4 +261,28 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { tv_navi_clear_company_address.visibility = View.GONE } } + + /** + * 分享弹框 + * @param event + */ + @Subscribe(threadMode = ThreadMode.MAIN) + fun onEventBus(searchPoi: SearchPoi?) { + if (searchPoi == null) { + return + } + if (searchPoi?.type == DataConstants.TYPE_COMPANY_ADDRESS) { + tv_navi_company_address.text=searchPoi.address + tv_navi_clear_company_address.visibility=View.VISIBLE + } else { + tv_navi_home_address.text=searchPoi.address + tv_navi_clear_home_address.visibility=View.VISIBLE + + } + } + + override fun onDestroyView() { + super.onDestroyView() + EventBus.getDefault().unregister(this) + } } diff --git a/modules/mogo-module-tanlu/build.gradle b/modules/mogo-module-tanlu/build.gradle index 2e567d7c7f..fa62f531e0 100644 --- a/modules/mogo-module-tanlu/build.gradle +++ b/modules/mogo-module-tanlu/build.gradle @@ -67,7 +67,6 @@ dependencies { implementation 'com.shuyu:gsyVideoPlayer-armv7a:7.1.1' implementation 'com.shuyu:gsyVideoPlayer-arm64:7.1.1' implementation 'com.shuyu:gsyVideoPlayer-java:7.1.1' - implementation 'org.greenrobot:eventbus:3.1.1' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() From ceaeea4bb1017b077620b7ad38ba1440e030d50e Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 12 Feb 2020 21:12:14 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI-174?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/navi/ui/setting/NaviSettingFragment.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 dddc4c9907..86cc2cacee 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 @@ -180,11 +180,11 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { when (checkedId) { R.id.rb_navi_day -> { SearchServiceHolder.getMapUIController() - .changeMapMode(EnumMapUI.Type_Night) + .changeMapMode(EnumMapUI.Type_Light) } R.id.rb_navi_night -> { SearchServiceHolder.getMapUIController() - .changeMapMode(EnumMapUI.Type_Light) + .changeMapMode(EnumMapUI.Type_Night) } R.id.rb_navi_auto -> { SearchServiceHolder.getMapUIController() From 35a75571f211f5b588bd7daaf5599bf73dc04b0d Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 12 Feb 2020 21:28:07 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI-161?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/fragment_navi_setting.xml | 2 +- .../src/main/res/layout/item_calculate_path_map.xml | 4 +++- modules/mogo-module-search/src/main/res/values/strings.xml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) 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 89cedce4a7..743b7574f9 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 @@ -265,7 +265,7 @@ android:layout_width="wrap_content" android:layout_height="@dimen/module_search_txt_setting_width" android:layout_marginTop="@dimen/dp_40" - android:text="@string/preference_navi_sound_type" + android:text="@string/preference_navi_day_mode" android:textColor="@color/white_80" android:textSize="@dimen/txt_normal" app:layout_constraintLeft_toLeftOf="parent" diff --git a/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml b/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml index 8b46cc02a9..1de2a6cf45 100644 --- a/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml +++ b/modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml @@ -30,7 +30,9 @@ android:layout_marginTop="4.5dp" android:textColor="@color/white" android:textSize="@dimen/dp_50" - app:layout_constraintLeft_toLeftOf="@+id/amap_calculate_item_strategy_name" + app:layout_constraintLeft_toLeftOf="parent" + android:layout_marginLeft="@dimen/dp_40" + app:layout_constraintTop_toBottomOf="@+id/amap_calculate_item_strategy_name" tools:text="40小时55分" /> 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 5832f4339e..3eeafea9be 100644 --- a/modules/mogo-module-search/src/main/res/values/strings.xml +++ b/modules/mogo-module-search/src/main/res/values/strings.xml @@ -39,4 +39,5 @@ 去设置家 清除 去设置公司 + 日夜模式 From 050bf3c397509db44b20b427ae9c42a07ab851bd Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Thu, 13 Feb 2020 10:32:57 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI-7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/dialog/NaviNoticeDialog.java | 2 +- .../ui/adapter/base/RecycleBaseAdapter.java | 4 + .../navi/ui/search/ChoosePathFragment.kt | 116 +++++++++++++++--- .../src/main/res/layout/fragment_search.xml | 1 + 4 files changed, 107 insertions(+), 16 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/dialog/NaviNoticeDialog.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/dialog/NaviNoticeDialog.java index 594bd06e89..e0705fa171 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/dialog/NaviNoticeDialog.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/dialog/NaviNoticeDialog.java @@ -26,7 +26,7 @@ public class NaviNoticeDialog extends Dialog implements View.OnClickListener { private IMogoMapService mMogoMapService; public NaviNoticeDialog(@NonNull Context context) { - super(context); + super(context, R.style.Theme_AppCompat_Dialog); this.mContext = context; mMogoMapService = (IMogoMapService) ARouter.getInstance() .build(MogoServicePaths.PATH_SERVICES_MAP) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java index 7b495a2e06..2608b12d68 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/base/RecycleBaseAdapter.java @@ -115,4 +115,8 @@ public abstract class RecycleBaseAdapter extends } return list.get(position); } + + public List getList() { + return list; + } } 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 8657696fd6..faf0f44ac4 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 @@ -2,9 +2,12 @@ package com.mogo.module.navi.ui.search import android.app.Service import android.os.Bundle +import android.text.TextUtils import android.view.View import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager +import com.mogo.commons.voice.AIAssist +import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.map.MogoLatLng import com.mogo.map.navi.IMogoNaviListener import com.mogo.map.navi.MogoCalculatePath @@ -26,7 +29,52 @@ import kotlinx.android.synthetic.main.include_search_bar.iv_navi_back * @author zyz * 2020-01-09. */ -class ChoosePathFragment : BaseFragment(), IMogoNaviListener { +class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallBack { + override fun onCmdSelected(cmd: String?) { + + when (cmd) { + "firstPath" -> { + selectItem(0) + startNavi() + + } + "secondPath" -> { + selectItem(1) + startNavi() + + } + "thirdPath" -> { + selectItem(2) + startNavi() + + } + "startNavi" -> { + startNavi() + } + + } + + } + + private fun selectItem(index: Int) { + + if (mAdapter.list.size > index) { + selectPath(mAdapter.list[index]) + } + } + + override fun onCmdAction(speakText: String?) { + } + + override fun onCmdCancel(speakText: String?) { + } + + override fun onSpeakEnd(speakText: String?) { + } + + override fun onSpeakSelectTimeOut(speakText: String?) { + } + override fun onInitNaviFailure() { } @@ -54,14 +102,19 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener { override fun onoCalculateFailed() { } - override fun onUpdateTraffic(traffic: MogoTraffic?) { -} + override fun onUpdateTraffic(traffic: MogoTraffic?) { + } - private lateinit var mAdapter: CalculatePathAdapter + private lateinit var mAdapter: CalculatePathAdapter override fun getLayoutId(): Int { return R.layout.fragment_search_category } + val firstPath: String = "第一个" + val secondPath: String = "第二个" + val thirdPath: String = "第三个" + val startNavi: String = "开始导航" + var mogoTip: MogoLatLng? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -69,6 +122,16 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener { SearchServiceHolder.statusManager.setSearchUIShow( MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT, true ) + + AIAssist.getInstance(context) + .registerUnWakeupCommand("firstPath", arrayOf(firstPath), this) + AIAssist.getInstance(context) + .registerUnWakeupCommand("secondPath", arrayOf(secondPath), this) + AIAssist.getInstance(context) + .registerUnWakeupCommand("thirdPath", arrayOf(thirdPath), this) + AIAssist.getInstance(context) + .registerUnWakeupCommand("startNavi", arrayOf(startNavi), this) + } // 是否开启导航 @@ -101,11 +164,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener { rv_search_result.adapter = mAdapter tv_navi_navi.setOnClickListener { - SearchServiceHolder.getNavi() - .startNavi(false) - SearchServiceHolder.getMapUIController().recoverLockMode() - isStartedNavi = true - SearchServiceHolder.fragmentManager.clearAll() + startNavi() } SearchServiceHolder.getNavi() @@ -115,28 +174,55 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener { mAdapter.setOnClickListener { var item = it.getTag(R.id.tag_item) as MogoCalculatePath + selectPath(item) + } + + SearchServiceHolder.getMarkerManger() + .removeMarkers() + } + + private fun startNavi() { + SearchServiceHolder.getNavi() + .startNavi(false) + SearchServiceHolder.getMapUIController() + .recoverLockMode() + isStartedNavi = true + SearchServiceHolder.fragmentManager.clearAll() + } + + private fun selectPath(item: MogoCalculatePath?) { + item?.let { mAdapter.setSelectTag(item.tagId) SearchServiceHolder.getNavi() .itemClickInteraction.onItemClicked(item.tagId) } - - SearchServiceHolder.getMarkerManger().removeMarkers() } override fun onDestroyView() { super.onDestroyView() SearchServiceHolder.listenerCenter.unregisterMogoNaviListener( - MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT + MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT ) SearchServiceHolder.statusManager.setSearchUIShow( - MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT, false + MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT, false ) if (!isStartedNavi) { - SearchServiceHolder.getNavi().clearCalculatePaths() + SearchServiceHolder.getNavi() + .clearCalculatePaths() } - } + AIAssist.getInstance(context) + .unregisterUnWakeupCommand("firstPath") + AIAssist.getInstance(context) + .unregisterUnWakeupCommand("secondPath") + AIAssist.getInstance(context) + .unregisterUnWakeupCommand("thirdPath") + AIAssist.getInstance(context) + .unregisterUnWakeupCommand("startNavi") + + } + companion object { fun newInstance(searchPoi: MogoLatLng): Fragment { var bundle = Bundle() diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_search.xml b/modules/mogo-module-search/src/main/res/layout/fragment_search.xml index 7967fdd99c..9a9f1b6b1e 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_search.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_search.xml @@ -22,6 +22,7 @@ android:layout_marginRight="@dimen/module_search_btn_right_margin" android:gravity="center" android:id="@+id/tv_navi_search" + android:visibility="gone" android:textColor="@color/white" android:textSize="@dimen/module_search_txt_big" android:background="@drawable/shape_round_blue_grident" From 5c7c7d729018b7771c438c3da8d63a400b655a07 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 13 Feb 2020 10:51:48 +0800 Subject: [PATCH 6/7] opt share upload --- .../share/dialog/LaucherShareDialog.java | 2 +- .../tanlu/fragment/TanluCardViewFragment.java | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 8bdd89ac6a..defdf2e8be 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -104,7 +104,7 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { * 发送广播 1拥堵，2交通检查，3封路 */ private void sendShareReceiver(String type) { - Logger.d("liyz", "LaucherShareDialog sendShareReceiver ---->"); + Logger.d("LaucherShareDialog", "LaucherShareDialog sendShareReceiver ---->"); Intent intent = new Intent(); intent.setAction("com.zhidao.roadcondition.share"); intent.putExtra("type", type); diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index c0f1ba3e59..40eac4df92 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -114,7 +114,7 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; * @description 探路卡片 * @since 2020-01-02 */ -public class TanluCardViewFragment extends MvpFragment> + public class TanluCardViewFragment extends MvpFragment> implements IView, IMogoMarkerClickListener, IMogoModuleLifecycle, @@ -966,12 +966,18 @@ public class TanluCardViewFragment extends MvpFragment> double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude(); double lon = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLongitude(); Log.d(TAG, "onMarkerInfo share onCompleted ---poiType =" + poiType); - MogoMarkerOptions options = new MogoMarkerOptions() - .icon(mMarkerIcon) - .latitude(lat) //event.lat - .owner("share_tag") - .longitude(lon); //event.lon - mMarkerManager.addMarker("share_tag", options); //随便传tag，不可点击 share_tag TanluConstants.MODEL_NAME + if (!poiType.equals("-1")) { + Log.d(TAG, "onMarkerInfo share onCompleted ---!poiType------->"); + MogoMarkerOptions options = new MogoMarkerOptions() + .icon(mMarkerIcon) + .latitude(lat) //event.lat + .owner("share_tag") + .longitude(lon); //event.lon + mMarkerManager.addMarker("share_tag", options); //随便传tag，不可点击 share_tag TanluConstants.MODEL_NAME + AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_success), null); + } else { + Log.d(TAG, "onMarkerInfo share onCompleted ---!poiType--- else ---->"); + } //请求分享接口 if (markerExploreWayList != null && markerExploreWayList.size() > 0) { @@ -1000,17 +1006,11 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onSuccess(BaseData data) { Log.d(TAG, "uploadShareInfo onSuccess -----> poiType = " + poiType); - if (!poiType.equals("-1")) { - AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_success), null); - } } @Override public void onFail(String message, int code) { Log.e(TAG, "uploadShareInfo onFail -----> poiType = " + poiType); - if (!poiType.equals("-1")) { - AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_share_failed), null); - } } }); } From 95322d930cd5e68ea264a9f6eefac41f92de767b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 Feb 2020 12:06:34 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=20=E3=80=90=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E8=BD=A6=E8=BE=86=E3=80=91=E5=88=86=E4=BD=93=E6=9C=BA?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=20=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=B8=8A=E6=98=BE=E7=A4=BA=E6=B7=B7=E4=B9=B1=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20http://jira.zhidaohulian.com/proj?= =?UTF-8?q?ects/UI/issues/UI-256=3Ffilter=3Dmyopenissues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/marker/MapMarkerManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 10a74a29a8..9229488497 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -492,7 +492,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag Logger.e(TAG, "MarkerResponse======" + response); if (!MarkerServiceHandler.getMogoStatusManager().isSearchUIShow() && !MarkerServiceHandler.getMogoStatusManager().isV2XShow()) { - isFirstMarker = true; Handler handler = new Handler(Looper.getMainLooper()); handler.post(new Runnable() { @Override