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

This commit is contained in:
tongchenfei
2020-11-17 11:45:10 +08:00
23 changed files with 28 additions and 41 deletions

View File

@@ -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() ) {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

View File

@@ -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求助"