diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt index 4cbd8ca7e4..eac374183f 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/constant/HttpConstants.kt +++ b/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()) { diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt index cbd611b68e..9a61c94ec7 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt +++ b/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()) { diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java index 8e67ea9450..b79998817e 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DztHttpConstant.java +++ b/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() ) { diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png deleted file mode 100644 index afdc5519bf..0000000000 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png and /dev/null differ diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index c69b57da35..22d9faac57 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/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求助" diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java index b93b485722..42f21c56a1 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java +++ b/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"; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java index a5e0c91888..0d5ef1a795 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java +++ b/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; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt index 14604e5d95..497a1dd160 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt +++ b/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 - } - } } } \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java index 538648e22f..aab4efa8d0 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java +++ b/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()); } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt index dcc0b492d6..ae8d8350b1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/HttpConstant.kt +++ b/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()) { diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png deleted file mode 100644 index 11049bacf3..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_cancel_help.9.png rename to modules/mogo-module-v2x/src/main/res/drawable-mdpi/module_v2x_shadow_bkg.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png deleted file mode 100644 index 3dab9ec629..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png deleted file mode 100644 index 1923804913..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png b/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png deleted file mode 100644 index e73d76936f..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 03bb4325ce..a5723f4c4c 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/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"> diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png deleted file mode 100644 index a4979dd265..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png deleted file mode 100644 index f68dcac5f8..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png deleted file mode 100644 index 9947fa9c1a..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png deleted file mode 100644 index 5ff5526ff8..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png deleted file mode 100644 index 9954c018db..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png deleted file mode 100644 index 61d0b6c1d5..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png and /dev/null differ