diff --git a/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java b/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java index 4d88e0e..1816ad0 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java +++ b/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java @@ -25,7 +25,7 @@ public class MyApplication extends LitePalApplication { private final String NAME ="ytzh"; static LastLoginInfo mLoginInfo; private static MyApplication instance; - String url= RpcUrl.BaseAppUrl; +// String url= RpcUrl.BaseAppUrl; ServerConfig config; private List activityList = new LinkedList(); diff --git a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java index 6134783..f52e92a 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java +++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java @@ -7,7 +7,7 @@ public class RpcUrl { ///< 正式服务器地址 // public static String BaseAppUrl = "http://47.104.88.50/B3/"; ///< 外网测试 - public static String BaseAppUrl = "http://221.1.97.114:86/B3/"; +// public static String BaseAppUrl = "http://221.1.97.114:86/B3/"; public static String DayProductRpc_Query = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Query"; public static String DayProductRpc_Query_canshu = "/MainSystem/B3UnitedInfos/Rpcs/RpcQueryObj"; diff --git a/app/src/main/java/com/qhclh/ytzh/home/SetUrlActivity.java b/app/src/main/java/com/qhclh/ytzh/home/SetUrlActivity.java index 6522d3a..0e689cf 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/SetUrlActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/home/SetUrlActivity.java @@ -33,7 +33,12 @@ public class SetUrlActivity extends BaseActivity { protected void initView() { config = new ServerConfig(this); ConfigUtil.Fill(config); - et_url.setText(config.getServerUri()); + if (config.getServerUri()!=null && !"".equals(config.getServerUri())) { + et_url.setText(config.getServerUri()); + }else { + et_url.setText("http://47.104.88.50/B3/"); + } + System.out.println("aaa+++++++++++"+config.getServerUri()); } @Override diff --git a/app/src/main/java/com/qhclh/ytzh/login/LoginActivity.java b/app/src/main/java/com/qhclh/ytzh/login/LoginActivity.java index 38bc064..07d0bdc 100644 --- a/app/src/main/java/com/qhclh/ytzh/login/LoginActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/login/LoginActivity.java @@ -5,6 +5,7 @@ import android.view.KeyEvent; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.TextView; import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; @@ -41,7 +42,7 @@ public class LoginActivity extends BaseActivity { Button login_sure; @BindView(R.id.shezhiurl) - Button shezhiurl; + TextView shezhiurl; private LoginUserConfig config = new LoginUserConfig(this); private ServerConfig sconfig = new ServerConfig(this); diff --git a/app/src/main/res/layout/act_login.xml b/app/src/main/res/layout/act_login.xml index 4c47325..069a2a6 100644 --- a/app/src/main/res/layout/act_login.xml +++ b/app/src/main/res/layout/act_login.xml @@ -19,8 +19,8 @@ android:layout_width="100dp" android:layout_height="100dp" android:layout_below="@id/login_bg" - android:layout_marginTop="-50dp" android:layout_centerHorizontal="true" + android:layout_marginTop="-50dp" android:src="@mipmap/ic_launcher_round" /> @@ -83,11 +83,23 @@ android:layout_marginTop="@dimen/dp_20" android:background="@drawable/denglu_3x" /> -