Merge remote-tracking branch 'origin/dev' into dev

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt

@@ -7,9 +7,9 @@ class HttpConstants {
 
     companion object {
 
-        const val DEV_BASE_URL_OWNER = "http://dzt-test.zhidaohulian.com/"
+        const val DEV_BASE_URL_OWNER = "http://dzt-test.zhidaozhixing.com/"
         const val RELEASE_BASE_URL_OWNER = "http://dzt.zhidaohulian.com/"
-        const val SHOW_BASE_URL_OWNER = "http://dzt-show.zhidaohulian.com/"
+        const val SHOW_BASE_URL_OWNER = "http://dzt-show.zhidaozhixing.com/"
 
         fun getBaseUrl(): String {
             return when (DebugConfig.getNetMode()) {

modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt

@@ -5,10 +5,10 @@ import com.mogo.commons.debug.DebugConfig
 class HttpConstant {
 
     companion object {
-        const val HOST_DEV = "http://dzt-test.zhidaohulian.com"
-        const val HOST_TEST = "http://dzt-test.zhidaohulian.com"
-        const val HOST_DEMO = "http://dzt-show.zhidaohulian.com"
-        const val HOST_PRODUCT = "https://dzt.zhidaohulian.com"
+        const val HOST_DEV = "http://dzt-test.zhidaozhixing.com"
+        const val HOST_TEST = "http://dzt-test.zhidaozhixing.com"
+        const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com"
+        const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com"
 
         fun getNetHost(): String {
             return when (DebugConfig.getNetMode()) {

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java

@@ -8,10 +8,10 @@ import com.mogo.commons.debug.DebugConfig;
  * @author tongchenfei
  */
 public class DztHttpConstant {
-    public static final String HOST_DEV = "http://dzt-test.zhidaohulian.com";
-    public static final String HOST_TEST = "http://dzt-test.zhidaohulian.com";
-    public static final String HOST_DEMO = "http://dzt-show.zhidaohulian.com";
-    public static final String HOST_PRODUCT = "https://dzt.zhidaohulian.com";
+    public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com";
+    public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com";
+    public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com";
+    public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com";
 
     public static String getBaseUrl(){
         switch ( DebugConfig.getNetMode() ) {

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml

@@ -40,7 +40,7 @@
             android:id="@+id/module_entrance_id_button1"
             android:layout_width="@dimen/module_ext_operation_panel_width"
             android:layout_height="@dimen/module_ext_operation_panel_width"
-            android:background="@drawable/v2x_cancel_help"
+            android:background="@drawable/module_ext_shadow_bkg"
             android:gravity="center"
             android:padding="0dp"
             android:text="前方\n实况"
@@ -55,7 +55,7 @@
             android:layout_width="@dimen/module_ext_operation_panel_width"
             android:layout_height="@dimen/module_ext_operation_panel_width"
             android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
-            android:background="@drawable/v2x_cancel_help"
+            android:background="@drawable/module_ext_shadow_bkg"
             android:gravity="center"
             android:padding="0dp"
             android:text="取消\n求助"

modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java

@@ -2,8 +2,8 @@ package com.mogo.module.media.constants;
 
 public interface BaseUrlConstants {
     String DEV_BASE_URL = "http://dzt-dev.zhidaohulian.com";
-    String QA_BASE_URL = "http://dzt-test.zhidaohulian.com";
-    String SHOW_BASE_URL = "http://dzt-show.zhidaohulian.com";
+    String QA_BASE_URL = "http://dzt-test.zhidaozhixing.com";
+    String SHOW_BASE_URL = "http://dzt-show.zhidaozhixing.com";
     String RELEASE_BASE_URL = "http://dzt.zhidaohulian.com";
 
 

modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java

@@ -34,10 +34,10 @@ public class RefreshModel {
 
     private static final String TAG = "RefreshModel";
 
-    public static final String HOST_DEV = "http://dzt-test.zhidaohulian.com";
-    public static final String HOST_TEST = "http://dzt-test.zhidaohulian.com";
-    public static final String HOST_DEMO = "http://dzt-show.zhidaohulian.com";
-    public static final String HOST_PRODUCT = "https://dzt.zhidaohulian.com";
+    public static final String HOST_DEV = "http://dzt-test.zhidaozhixing.com";
+    public static final String HOST_TEST = "http://dzt-test.zhidaozhixing.com";
+    public static final String HOST_DEMO = "http://dzt-show.zhidaozhixing.com";
+    public static final String HOST_PRODUCT = "http://dzt.zhidaozhixing.com";
 
     private final Context mContext;
     private RefreshApiService mRefreshApiService;

modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt

@@ -5,14 +5,11 @@ import com.mogo.commons.debug.DebugConfig
 class HttpConstant {
 
     companion object {
-        const val HOST_DEV = "http://dzt-test.zhidaohulian.com"
-        const val HOST_TEST = "http://dzt-test.zhidaohulian.com"
-        const val HOST_DEMO = "http://dzt-show.zhidaohulian.com"
-        const val HOST_PRODUCT = "https://dzt.zhidaohulian.com"
+        const val HOST_DEV = "http://dzt-test.zhidaozhixing.com"
+        const val HOST_TEST = "http://dzt-test.zhidaozhixing.com"
+        const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com"
+        const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com"
 
-        const val TMC_HOST_TEST="http://dzt-test.zhidaozhixing.com"
-        const val TMC_HOST_DEMO="http://dzt-show.zhidaozhixing.com"
-        const val TMC_HOST_PRODUCT="http://dzt.zhidaozhixing.com"
 
         @JvmStatic
         fun getNetHost(): String {
@@ -23,16 +20,6 @@ class HttpConstant {
                 else -> HOST_PRODUCT
             }
         }
-
-        @JvmStatic
-        fun getTMCHost(): String {
-            return when (DebugConfig.getNetMode()) {
-                DebugConfig.NET_MODE_DEV -> TMC_HOST_TEST
-                DebugConfig.NET_MODE_QA -> TMC_HOST_TEST
-                DebugConfig.NET_MODE_DEMO -> TMC_HOST_DEMO
-                else -> TMC_HOST_PRODUCT
-            }
-        }
     }
 
 }

modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java

@@ -29,7 +29,7 @@ public class TrafficModelData {
 
     public TrafficModelData() {
         IMogoNetwork network = (IMogoNetwork) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_NETWORK).navigation(getApp().getApplicationContext());
-        mTrafficApiService = network.create(TrafficApiService.class, HttpConstant.getTMCHost());
+        mTrafficApiService = network.create(TrafficApiService.class, HttpConstant.getNetHost());
     }
 
     /**

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt

@@ -5,10 +5,10 @@ import com.mogo.commons.debug.DebugConfig
 class HttpConstant {
 
     companion object {
-        const val HOST_DEV = "http://dzt-test.zhidaohulian.com"
-        const val HOST_TEST = "http://dzt-test.zhidaohulian.com"
-        const val HOST_DEMO = "http://dzt-show.zhidaohulian.com"
-        const val HOST_PRODUCT = "https://dzt.zhidaohulian.com"
+        const val HOST_DEV = "http://dzt-test.zhidaozhixing.com"
+        const val HOST_TEST = "http://dzt-test.zhidaozhixing.com"
+        const val HOST_DEMO = "http://dzt-show.zhidaozhixing.com"
+        const val HOST_PRODUCT = "http://dzt.zhidaozhixing.com"
 
         fun getNetHost(): String {
             return when (DebugConfig.getNetMode()) {

modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml

@@ -5,7 +5,7 @@
     android:id="@+id/clPanelContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/v2x_shadow_bg"
+    android:background="@drawable/module_services_online_car_panel_background"
     android:clickable="true"
     android:visibility="gone"
     tools:visibility="visible">