yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v1.0.4' into feature/v1.0.4

Browse Source
This commit is contained in:
ihoudf
2020-04-23 17:05:43 +08:00
parent 87a05f0ec8 bbd0cda4aa
commit feeb493bf9
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
</project> </project>

4
gradle.properties
View File

@@ -66,9 +66,9 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
# 在线车辆F # 在线车辆F
MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1
# v2x # v2x
MOGO_MODULE_V2X_VERSION=1.0.3.3-SNAPSHOT MOGO_MODULE_V2X_VERSION=1.0.3.6-SNAPSHOT
# 媒体卡片 # 媒体卡片
MOGO_MODULE_MEDIA_VERSION=1.0.4.2 MOGO_MODULE_MEDIA_VERSION=1.0.4.3
# 推送 # 推送
MOGO_MODULE_PUSH_VERSION=1.0.1 MOGO_MODULE_PUSH_VERSION=1.0.1
# 广告资源位 # 广告资源位

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt
View File

@@ -16,6 +16,7 @@ import com.mogo.module.share.net.ShareApiService
import com.mogo.utils.TipToast import com.mogo.utils.TipToast
import com.mogo.utils.logger.Logger import com.mogo.utils.logger.Logger
import com.mogo.utils.network.RequestOptions import com.mogo.utils.network.RequestOptions
import com.mogo.utils.storage.SharedPrefsMgr
import com.zhidao.auto.platform.util.DeviceUtil import com.zhidao.auto.platform.util.DeviceUtil
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
@@ -155,6 +156,7 @@ object SeekHelpManager {
super.onSuccess(o) super.onSuccess(o)
// 接口请求成功，内部同步v2x状态，通知adas，改变自车图标 // 接口请求成功，内部同步v2x状态，通知adas，改变自车图标
ShareControl.getInstance(context).mogoServiceApis.statusManagerApi.setSeekHelping("ShareDialog", true) ShareControl.getInstance(context).mogoServiceApis.statusManagerApi.setSeekHelping("ShareDialog", true)
SharedPrefsMgr.getInstance(context!!).putLong("seek_help_time", System.currentTimeMillis())
isSeekHelp = true isSeekHelp = true
aiAssist?.speakTTSVoice("已发布求助信息，将为你通知其他车主") aiAssist?.speakTTSVoice("已发布求助信息，将为你通知其他车主")
toast("已发布求助信息，将为你通知其他车主") toast("已发布求助信息，将为你通知其他车主")