Commit Graph

  • 3e29f41d67 Merge remote-tracking branch 'origin/dev2' into dev2 tongchenfei 2021-01-15 10:35:34 +08:00
  • f6dc3a117d 增加TopView粘性展示 tongchenfei 2021-01-15 10:35:26 +08:00
  • e4719cee47 Merge branch 'qa_1.1.9' into dev2 wangcongtao 2021-01-14 17:59:09 +08:00
  • 3e05bbe27c ui opt:分体机部分按钮背景图替换 wangcongtao 2021-01-14 17:53:15 +08:00
  • b00985eb82 ui opt wangcongtao 2021-01-14 15:59:56 +08:00
  • a1cfe98b65 Merge remote-tracking branch 'origin/dev2' into dev2 tongchenfei 2021-01-14 14:47:45 +08:00
  • f63579bd11 Merge dev_mogo_httpdns there are some conflicts: both modified: foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java both modified: gradle.properties both modified: modules/mogo-module-share/consumer-rules.pro both modified: modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt tongchenfei 2021-01-14 14:45:53 +08:00
  • 03d0aeef4f Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into dev2 wangcongtao 2021-01-14 14:26:52 +08:00
  • aa83ad8e8c new dev branch wangcongtao 2021-01-14 14:20:30 +08:00
  • a3a22b6bf1 Merge branch 'qa_merge_shunyi_vr_map' into dev2 wangcongtao 2021-01-14 14:17:59 +08:00
  • 64aad292a5 fix#防止重复调用 wujifei 2021-01-14 11:19:39 +08:00
  • 081ccff243 同步顶部弹窗容器准备状态 wangcongtao 2021-01-14 10:36:24 +08:00
  • 1b6acc5266 fix#防止重复调用 wujifei 2021-01-13 21:55:57 +08:00
  • f77b462f3f Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 wujifei 2021-01-13 21:40:41 +08:00
  • dd8ea0bf19 fix#防止重复调用 wujifei 2021-01-13 21:40:16 +08:00
  • 87b4ccfc6b no message liujing 2021-01-13 21:01:24 +08:00
  • 16ada5d440 Merge branch 'bn' into qa_1.1.9 liujing 2021-01-13 20:32:52 +08:00
  • 763eef1327 目的地停车场推荐,取消唤醒词增加 liujing 2021-01-13 20:32:35 +08:00
  • 2c1f6979b1 Merge branch 'bn' into qa_1.1.9 liujing 2021-01-13 20:14:02 +08:00
  • 646dcb81a7 目的地违章停车,前往免唤醒词增加 liujing 2021-01-13 20:13:46 +08:00
  • 7d49c83e19 增加保底 董宏宇 2021-01-13 20:10:40 +08:00
  • 6c82fc9d06 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 董宏宇 2021-01-13 19:52:52 +08:00
  • 669dbe7436 调整了配置文件获取的时机是在ACC ON状态时候 董宏宇 2021-01-13 19:52:47 +08:00
  • 4429e41bee Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 wujifei 2021-01-13 18:51:51 +08:00
  • 6c1322b7e1 fix#修改格式转换异常 wujifei 2021-01-13 18:51:26 +08:00
  • 5cde4edadf 解决重启后语音无法免唤醒的问题 wangcongtao 2021-01-13 18:26:09 +08:00
  • 94df8aa860 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map tongchenfei 2021-01-13 17:19:13 +08:00
  • 7c1bfb62fb 应设计 要求,删除距离显示 liujing 2021-01-13 15:57:53 +08:00
  • d798accef1 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 wujifei 2021-01-13 11:18:24 +08:00
  • cf4989a6fa fix#修改格式转换异常 wujifei 2021-01-13 11:17:58 +08:00
  • c5152dedfa 解决内存泄漏问题2 wangcongtao 2021-01-13 11:02:44 +08:00
  • 83ada494e9 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 wangcongtao 2021-01-13 10:25:39 +08:00
  • a9741f0ff1 解决内存泄漏问题 wangcongtao 2021-01-13 10:25:31 +08:00
  • ba05ade028 将上报限制改回早高峰2次晚高峰3次,平时5次 tongchenfei 2021-01-12 19:48:29 +08:00
  • 2e6425ec0c Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 tongchenfei 2021-01-12 18:54:14 +08:00
  • 77a0331cc6 方便测试,修改上报限制次数为1 tongchenfei 2021-01-12 18:54:08 +08:00
  • 8a305a7c39 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 wujifei 2021-01-12 16:54:20 +08:00
  • ba888ee359 fix#缺陷#153 wujifei 2021-01-12 16:53:54 +08:00
  • 17b9291976 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 tongchenfei 2021-01-12 16:48:54 +08:00
  • 0d1d875fe2 bug fix: 获取不到前车距离 tongchenfei 2021-01-12 16:48:47 +08:00
  • ceacfc43d6 fix#缺陷#153 wujifei 2021-01-12 14:04:55 +08:00
  • 50adec00f5 fix#缺陷#151 wujifei 2021-01-12 13:29:15 +08:00
  • 0d80a9946d Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 wujifei 2021-01-12 13:22:32 +08:00
  • 12a6392131 fix#缺陷#163 wujifei 2021-01-12 13:22:12 +08:00
  • 11a8367a5e 调整小智形象切换时间 wangcongtao 2021-01-12 11:34:37 +08:00
  • 07f52757b1 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 wangcongtao 2021-01-12 11:08:34 +08:00
  • b35be5f7fb 更新小智形象动画 wangcongtao 2021-01-12 11:08:16 +08:00
  • e040bdfa22 fix#缺陷#163 wujifei 2021-01-12 10:28:07 +08:00
  • 7c38f180a8 fix#修改接口请求逻辑 jeff 2021-01-12 00:31:10 +08:00
  • 95773fad02 fix#修改接口调用逻辑 wujifei 2021-01-11 22:08:09 +08:00
  • cd729f7a63 fix#修改接口调用逻辑 wujifei 2021-01-11 20:16:25 +08:00
  • dc699423f7 new#优化代码 wujifei 2021-01-11 19:59:55 +08:00
  • 1b2f72092a 内存泄漏问题优化 wangcongtao 2021-01-11 18:55:38 +08:00
  • 45c0577c8d Merge branch 'qa_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.9 unknown 2021-01-11 17:55:45 +08:00
  • fa0933a33d fix bug of leak unknown 2021-01-11 17:55:09 +08:00
  • b8abf1050c opt BlockStrategy.kt tongchenfei 2021-01-11 14:18:18 +08:00
  • ec363ed420 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map tongchenfei 2021-01-11 14:23:09 +08:00
  • bc2d4f0d28 opt BlockStrategy.kt tongchenfei 2021-01-11 14:21:11 +08:00
  • 71b5e46bf1 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 tongchenfei 2021-01-11 14:18:25 +08:00
  • 07f8ccfcb6 opt BlockStrategy.kt tongchenfei 2021-01-11 14:18:18 +08:00
  • 9e9bbf6469 note the log in websocket msg handler and RTKLoc unknown 2021-01-11 13:57:38 +08:00
  • d97d791d23 内存泄漏问题优化 wangcongtao 2021-01-11 11:31:40 +08:00
  • 564c82be86 bugfix wangcongtao 2021-01-11 10:51:27 +08:00
  • eab0988d7e Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map wangcongtao 2021-01-11 11:32:04 +08:00
  • 49ab4e52de 内存泄漏问题优化 wangcongtao 2021-01-11 11:31:40 +08:00
  • 9273942a42 bugfix wangcongtao 2021-01-11 10:51:27 +08:00
  • 17545b09bb opt wangcongtao 2021-01-10 10:38:54 +08:00
  • fc801ae472 opt obu tongchenfei 2021-01-08 20:03:57 +08:00
  • cec1d63e5f fix bug unknown 2021-01-08 18:03:48 +08:00
  • 3ffec794c7 fix bug unknown 2021-01-08 17:59:45 +08:00
  • 8bcfa2c739 fix bug unknown 2021-01-08 17:07:09 +08:00
  • 74fb14c289 Merge branch 'qa_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.9 unknown 2021-01-08 17:03:40 +08:00
  • 52e5aaeb87 fix bug unknown 2021-01-08 16:59:11 +08:00
  • d8e8775c5e Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 wangcongtao 2021-01-08 15:51:40 +08:00
  • 9f693b62ad 解决内存泄漏3 wangcongtao 2021-01-08 15:51:32 +08:00
  • ff182d4d0a Merge branch 'qa_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_merge_shunyi_vr_map unknown 2021-01-08 15:45:51 +08:00
  • 96bdb4f450 è¦fix bug unknown 2021-01-08 15:45:40 +08:00
  • 3ffa127671 Merge branch 'qa_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.9 unknown 2021-01-08 15:38:29 +08:00
  • bcca60bb4c fix bug unknown 2021-01-08 15:36:55 +08:00
  • 917de5ca76 Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 wangcongtao 2021-01-08 15:10:29 +08:00
  • 96610e886e 解决内存泄漏2 wangcongtao 2021-01-08 14:57:25 +08:00
  • 59f095e295 解决内存泄漏2 wangcongtao 2021-01-08 14:57:25 +08:00
  • 953ee21b8c Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 wangcongtao 2021-01-08 11:28:53 +08:00
  • 14688750a6 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map wangcongtao 2021-01-08 11:28:04 +08:00
  • 5a13775ccd 添加xhdpi资源 wangcongtao 2021-01-08 11:27:57 +08:00
  • 3dbb6b5d50 bugfix: #138,内存泄漏问题 wangcongtao 2021-01-08 11:03:40 +08:00
  • dd6d7c6746 bugfix: #138,内存泄漏问题 wangcongtao 2021-01-08 11:03:40 +08:00
  • e9f8c4d695 Merge branch 'vrt' into qa_merge_shunyi_vr_map liujing 2021-01-07 20:00:01 +08:00
  • 686660e5e4 故障求助弹框提示VR模式下隐藏,返回2D显示 liujing 2021-01-07 19:59:11 +08:00
  • 8acdfbbe2e merge branch tongchenfei 2021-01-07 19:33:30 +08:00
  • a4b693062a 添加部分域名 tongchenfei 2021-01-07 19:27:44 +08:00
  • 8e5767fd6c Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 wangcongtao 2021-01-07 18:59:09 +08:00
  • 93afe6629b Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map wangcongtao 2021-01-07 18:14:02 +08:00
  • 610d599d43 优化已知问题 wangcongtao 2021-01-06 20:38:03 +08:00
  • 5a6ee1b824 Merge branch 'hi' into qa_merge_shunyi_vr_map liujing 2021-01-07 16:12:59 +08:00
  • e7c6c2d016 VR模式下唤醒词:发起故障求助 不处理 liujing 2021-01-07 16:09:33 +08:00
  • 241830b9b8 merge lixiaopeng 2021-01-07 15:03:50 +08:00
  • 3d6ec1592b Merge branch 'dns' into dev_mogo_httpdns liujing 2021-01-07 14:44:29 +08:00
  • 8d4048f7ff [del] V2X-DNS 删除无用类 liujing 2021-01-07 14:43:56 +08:00
  • 5580b03b3c Merge branch 'dns' into dev_mogo_httpdns liujing 2021-01-07 14:02:54 +08:00