diff --git a/app/src/main/java/com/rehome/dywoa/Contans.java b/app/src/main/java/com/rehome/dywoa/Contans.java index 95cd107..e55d47d 100644 --- a/app/src/main/java/com/rehome/dywoa/Contans.java +++ b/app/src/main/java/com/rehome/dywoa/Contans.java @@ -3,25 +3,25 @@ package com.rehome.dywoa; public class Contans { - public static String IP = "http://192.168.2.115:8601/"; - public static String IP_INTRANET = "http://192.168.2.115:8601/"; - public static String IP_EXTRANET = "http://192.168.2.115:8601/"; - public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; - public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; +// public static String IP = "http://192.168.2.115:8601/"; +// public static String IP_INTRANET = "http://192.168.2.115:8601/"; +// public static String IP_EXTRANET = "http://192.168.2.115:8601/"; +// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; +// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; //APP登录接口厂内服务器IP -// public static String IP = "https://app.dywzhny.com.cn/"; -// //app内网 -// public static String IP_INTRANET = "https://app.dywzhny.com.cn/"; -// //app外网 -// public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; -// //SIS系统厂内IP -// public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; -// //BI -// public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; + public static String IP = "https://app.dywzhny.com.cn/"; + //app内网 + public static String IP_INTRANET = "https://app.dywzhny.com.cn/"; + //app外网 + public static String IP_EXTRANET = "https://app.dywzhny.com.cn/"; + //SIS系统厂内IP + public static String SIS_TOKEN_IP = "https://sis.dywzhny.com.cn/"; + //BI + public static String BI_TOKEN_IP = "https://bi.dywzhny.com.cn/"; diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt index 08ef7e4..109ab44 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt @@ -202,8 +202,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { binding.etPassword.setText("A000000a.") //ceshi1 - binding.etUsername.setText("ceshi1") - binding.etPassword.setText("A000000a.") +// binding.etUsername.setText("ceshi1") +// binding.etPassword.setText("A000000a.") // binding.etUsername.setText("CY00011") // binding.etPassword.setText("A000000a") diff --git a/tkrefreshlayout/src/main/java/com/lcodecore/tkrefreshlayout/header/progresslayout/MaterialProgressDrawable.java b/tkrefreshlayout/src/main/java/com/lcodecore/tkrefreshlayout/header/progresslayout/MaterialProgressDrawable.java index bb11564..3f00ee2 100644 --- a/tkrefreshlayout/src/main/java/com/lcodecore/tkrefreshlayout/header/progresslayout/MaterialProgressDrawable.java +++ b/tkrefreshlayout/src/main/java/com/lcodecore/tkrefreshlayout/header/progresslayout/MaterialProgressDrawable.java @@ -38,8 +38,9 @@ public class MaterialProgressDrawable extends Drawable implements Animatable { private static final Interpolator MATERIAL_INTERPOLATOR = new FastOutSlowInInterpolator(); private static final float FULL_ROTATION = 1080.0f; - @Retention(RetentionPolicy.CLASS) + //@Retention(RetentionPolicy.CLASS) @IntDef({LARGE, DEFAULT}) + @Retention(RetentionPolicy.SOURCE) public @interface ProgressDrawableSize {} // Maps to ProgressBar.Large style static final int LARGE = 0;