diff --git a/app/build.gradle b/app/build.gradle index fbbe37c378..f32e42f284 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -165,7 +165,7 @@ android { } saas { dimension "project" - buildConfigField 'boolean', 'secure', "false" + buildConfigField 'boolean', 'secure', "true" buildConfigField 'String', 'URLs', "\"${readFileToJson("saas").replace("\"", "\\\"")}\"" buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("saas").replace("\"", "\\\"")}\"" } diff --git a/app/config/urlConfig.json b/app/config/urlConfig.json index b0d35fa87d..0bb379c048 100644 --- a/app/config/urlConfig.json +++ b/app/config/urlConfig.json @@ -57,7 +57,10 @@ "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/", "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/", "bind_driver_qr_url": "https://och-mini-eh.zhidaozhixing.com?pipe=ehsafety&sn=%1$s", - "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws" + "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws", + "secure_active_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/active", + "secure_refresh_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth" }, "online": { "och_url": "https://och-driver-eh.zhidaozhixing.com", @@ -69,7 +72,10 @@ "eagle_mis_url": "https://och-hailing-eh.zhidaozhixing.com/", "eagle_dns_url": "https://och-hailing-eh.zhidaozhixing.com/", "bind_driver_qr_url": "https://och-mini-eh.zhidaozhixing.com?pipe=ehsafety&sn=%1$s", - "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws" + "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws", + "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", + "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" }, "demo": { "och_url": "https://och-a.zhidaozhixing.com", @@ -81,7 +87,10 @@ "eagle_mis_url": "http://och-hailing-eh.zhidaozhixing.com/", "eagle_dns_url": "http://och-hailing-eh.zhidaozhixing.com/", "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=ehsafety&sn=%1$s", - "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws" + "chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws", + "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", + "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" } }, "yantai": { @@ -95,7 +104,10 @@ "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/", "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/", "bind_driver_qr_url": "https://och-mini-yt.zhidaozhixing.com?pipe=ytsafety&sn=%1$s", - "chart_socket_url":"" + "chart_socket_url":"", + "secure_active_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/active", + "secure_refresh_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth" }, "online": { "och_url": "https://och-driver-yt.zhidaozhixing.com", @@ -107,7 +119,10 @@ "eagle_mis_url": "https://och-hailing-yt.zhidaozhixing.com/", "eagle_dns_url": "https://och-hailing-yt.zhidaozhixing.com/", "bind_driver_qr_url": "https://och-mini-yt.zhidaozhixing.com?pipe=ytsafety&sn=%1$s", - "chart_socket_url":"" + "chart_socket_url":"", + "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", + "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" }, "demo": { "och_url": "https://och-a.zhidaozhixing.com", @@ -119,7 +134,10 @@ "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=ytsafety&sn=%1$s", - "chart_socket_url":"" + "chart_socket_url":"", + "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", + "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" } }, "saas": { @@ -132,7 +150,10 @@ "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":"" + "chart_socket_url":"", + "secure_active_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/active", + "secure_refresh_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"http://gateway.ee-private-dev1.myghost.zhidaoauto.com/openapi/security/deviceCert/auth" }, "online": { "och_url": "https://mogogo-driver.zhidaozhixing.com", @@ -143,7 +164,10 @@ "eagle_mis_url": "https://mogogo.zhidaozhixing.com/", "eagle_dns_url": "https://mogogo.zhidaozhixing.com/", "bind_driver_qr_url": "https://och-mini-mogogo.zhidaozhixing.com?pipe=mogogosafety&sn=%1$s", - "chart_socket_url":"" + "chart_socket_url":"", + "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", + "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" }, "demo": { "och_url": "http://tech-dev.zhidaohulian.com", @@ -154,7 +178,10 @@ "eagle_mis_url": "https://mogogo.zhidaozhixing.com/", "eagle_dns_url": "https://mogogo.zhidaozhixing.com/", "bind_driver_qr_url": "", - "chart_socket_url":"" + "chart_socket_url":"", + "secure_active_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/active", + "secure_refresh_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/refresh", + "secure_auth_url":"https://mygateway.zhidaozhixing.com/openapi/security/deviceCert/auth" } } }