Merge tag '2.4.0' into develop

app/src/aio-CD-510100/res/values/application.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_id">AIO</string>
+  <string name="app_name">中医健康辨识仪(区域版.CD)</string>
+  <string name="app_screen">browser/kiosk?url=https://xingxinsaas.com/aio/</string>
+</resources>

app/src/aio-CD-510100/res/values/browser_proxy.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="browser_http_proxy_enabled">true</bool>
+  <string-array name="browser_proxy_pool" />
+</resources>

app/src/aio-CD-510100/res/values/pulse.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="taiyi_skip_report">true</bool>
+  <integer name="taiyi_delay_disconnect">300</integer>
+</resources>

app/src/aio-ZJ-330681/res/values/application.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_id">AIO</string>
+  <string name="app_name">中医健康辨识仪(区域版.330681)</string>
+  <string name="app_screen">browser/kiosk?url=http://10.175.77.35:9048/aio/screen</string>
+</resources>

app/src/aio-ZJ-330681/res/values/browser_proxy.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="browser_http_proxy_enabled">true</bool>
+  <string-array name="browser_proxy_pool">
+    <item>https://hybrid.reborn-tech.com -> http://10.175.77.35:9048/mz/hybrid</item>
+    <item>https://api.reborn-tech.com -> http://10.175.77.35:9048/mz/api</item>
+    <item>https://taiyi.oss-accelerate.aliyuncs.com -> http://10.175.77.35:9048/mz/oss</item>
+    <item>https://taiyi.oss-cn-beijing.aliyuncs.com -> http://10.175.77.35:9048/mz/oss</item>
+    <item>https://oss-accelerate.aliyuncs.com/taiyi -> http://10.175.77.35:9048/mz/oss</item>
+    <item>https://oss-cn-beijing.aliyuncs.com/taiyi -> http://10.175.77.35:9048/mz/oss</item>
+  </string-array>
+</resources>

app/src/aio-ZJ-330681/res/values/pulse.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="taiyi_skip_report">true</bool>
+  <integer name="taiyi_delay_disconnect">300</integer>
+  <string name="taiyi_oss_agency_url">http://10.175.77.35:9048/liuzhi/manager2/fdhb-tablet/analysisManage/upload</string>
+  <string name="taiyi_oss_agency_method">POST</string>
+  <!-- <bool name="taiyi_oss_agency_header2query">true</bool> -->
+</resources>

gradle.properties

@@ -26,6 +26,8 @@ android.nonTransitiveRClass=true
 project.aio=debug
 project.aio-test=aio
 project.aio-prod=aio-test
+project.aio-CD-510100=aio-prod
+project.aio-ZJ-330681=aio-prod
 project.aio-CQ=aio-test
 
 project.pda=debug