Merge branch 'dev_robobus-d_230506_3.1.6' into dev_robotaxi-d_230612_3.3.0

# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
#	gradle.properties
This commit is contained in:
yangyakun
2023-06-15 14:36:49 +08:00

View File

@@ -115,25 +115,25 @@
},
"saas": {
"qa": {
"och_url": "https://och-a.zhidaozhixing.com",
"shuttle_url": "https://och-a.zhidaozhixing.com",
"passport_url": "https://och-a.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
"eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
"eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s",
"och_url": "https://mogogo-driver-qa.zhidaozhixing.com",
"shuttle_url": "https://mogogo-driver-qa.zhidaozhixing.com",
"passport_url": "https://mogogo-driver-qa.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://mogogo-driver-qa.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://mogogo-driver-qa.zhidaozhixing.com/arch/",
"eagle_mis_url": "https://mogogo-qa.zhidaozhixing.com/",
"eagle_dns_url": "https://mogogo-qa.zhidaozhixing.com/",
"bind_driver_qr_url": "https://och-mini-mogogo.zhidaozhixing.com?pipe=mogogosafety&sn=%1$s",
"chart_socket_url":""
},
"online": {
"och_url": "https://tech.zhidaohulian.com",
"och_url": "https://mogogo-driver.zhidaozhixing.com",
"shuttle_url": "https://mogogo-driver.zhidaozhixing.com",
"passport_url": "https://mogogo-driver.zhidaozhixing.com/arch/passport/",
"socket_base_url": "https://mogogo-driver.zhidaozhixing.com/arch/push/",
"socket_tech_url": "https://mogogo-driver.zhidaozhixing.com/arch/",
"eagle_mis_url": "https://mogogo.zhidaozhixing.com/",
"eagle_dns_url": "https://mogogo.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s",
"bind_driver_qr_url": "https://och-mini-mogogo.zhidaozhixing.com?pipe=mogogosafety&sn=%1$s",
"chart_socket_url":""
},
"demo": {