diff --git a/app/build.gradle b/app/build.gradle index 5cdf09452f..e851978795 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -263,7 +263,11 @@ android { buildConfigField 'String', 'URLs', "\"${readFileToJson("dali").replace("\"", "\\\"")}\"" buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("dali").replace("\"", "\\\"")}\"" } - + fuzhou { + dimension "project" + buildConfigField 'String', 'URLs', "\"${readFileToJson("fuzhou").replace("\"", "\\\"")}\"" + buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("fuzhou").replace("\"", "\\\"")}\"" + } // 配置网络环境,QA、线上、演示 qa { dimension "env" @@ -489,7 +493,7 @@ def variantName() { if (taskName.contains("Yantai")) { project.dependencies.add('implementation', project.project(':tts:tts-iflytek')) - }else if (taskName.contains("Mogo")) { + }else if (taskName.contains("Mogo") || taskName.contains("Fuzhou")) { project.dependencies.add('implementation', project.project(':tts:tts-pad')) }else if (taskName.contains("Dali")) { project.dependencies.add('implementation', project.project(':tts:tts-pad')) diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json index b4482bbd28..44007f1d89 100644 --- a/app/config/tempConfig.json +++ b/app/config/tempConfig.json @@ -196,5 +196,87 @@ } ] } + }, + "fuzhou": { + "shuttlepassenger": { + "ads": [ + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "type": 0, + "cacheImgPath": "", + "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "type": 0, + "cacheImgPath": "", + "title": "2" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "type": 0, + "cacheImgPath": "", + "title": "4" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "type": 0, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "type": 0, + "cacheImgPath": "", + "title": "7" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "type": 0, + "cacheImgPath": "", + "title": "8" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "type": 0, + "cacheImgPath": "", + "title": "9" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, + "shuttlepassengerm2": { + "ads": [ + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "type": 1, + "cacheImgPath": "", + "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "type": 1, + "cacheImgPath": "", + "title": "2" + } + ] + } } } diff --git a/app/config/urlConfig.json b/app/config/urlConfig.json index 1179ea5438..5bba240f8e 100644 --- a/app/config/urlConfig.json +++ b/app/config/urlConfig.json @@ -103,5 +103,40 @@ "bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=ytsafety&sn=%1$s", "chart_socket_url":"" } + }, + "fuzhou": { + "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", + "chart_socket_url":"" + }, + "online": { + "och_url": "https://tech.zhidaohulian.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", + "chart_socket_url":"" + }, + "demo": { + "och_url": "http://tech-dev.zhidaohulian.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": "", + "chart_socket_url":"" + } } } diff --git a/app/productFlavors/flavorsFilterConfig.gradle b/app/productFlavors/flavorsFilterConfig.gradle new file mode 100644 index 0000000000..e69de29bb2