From 40ecd4c1327c52631534df47e0864aa2cb500cdc Mon Sep 17 00:00:00 2001 From: lh <1209405678@qq.com> Date: Wed, 10 Jan 2018 11:28:23 +0800 Subject: [PATCH] no message --- app/src/main/AndroidManifest.xml | 3 + .../com/qhclh/ytzh/home/MyApplication.java | 8 +-- .../main/java/com/qhclh/ytzh/home/RpcUrl.java | 4 +- .../com/qhclh/ytzh/home/SetUrlActivity.java | 61 +++++++++++++++++++ .../com/qhclh/ytzh/login/LoginActivity.java | 10 ++- app/src/main/res/layout/act_login.xml | 6 ++ app/src/main/res/layout/act_seturl.xml | 17 ++++++ 7 files changed, 102 insertions(+), 7 deletions(-) create mode 100644 app/src/main/java/com/qhclh/ytzh/home/SetUrlActivity.java create mode 100644 app/src/main/res/layout/act_seturl.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a4573c1..875e2fd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -63,6 +63,9 @@ + 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 5a2596b..4d88e0e 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java +++ b/app/src/main/java/com/qhclh/ytzh/home/MyApplication.java @@ -43,10 +43,10 @@ public class MyApplication extends LitePalApplication { mLoginInfo = new LastLoginInfo(this); ConfigUtil.Fill(mLoginInfo); - ///< 先暂时必须设置URL - config = new ServerConfig(this); - config.setServerUri(url); - ConfigUtil.Save(config); +// ///< 先暂时必须设置URL +// config = new ServerConfig(this); +// config.setServerUri(url); +// ConfigUtil.Save(config); RpcFacade.init(this.getApplicationContext(),NAME); JPushInterface.setDebugMode(true); 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 5a35fc5..6134783 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java +++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java @@ -5,9 +5,9 @@ public class RpcUrl { ///< 域名开发 // public static String BaseAppUrl = ""; ///< 正式服务器地址 - public static String BaseAppUrl = "http://47.104.88.50/B3/"; +// 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 new file mode 100644 index 0000000..6522d3a --- /dev/null +++ b/app/src/main/java/com/qhclh/ytzh/home/SetUrlActivity.java @@ -0,0 +1,61 @@ +package com.qhclh.ytzh.home; + +import android.view.View; +import android.widget.Button; +import android.widget.EditText; + +import com.qhclh.ytzh.R; +import com.qhclh.ytzh.base.BaseActivity; +import com.qhclh.ytzh.configs.ConfigUtil; +import com.qhclh.ytzh.configs.ServerConfig; +import com.qhclh.ytzh.utils.DialogUtil; +import com.qhclh.ytzh.utils.StringUtil; + +import butterknife.BindView; + +/** + * Created by 青花瓷 on 2018/1/10. + */ + +public class SetUrlActivity extends BaseActivity { + @BindView(R.id.et_url) + EditText et_url; + @BindView(R.id.btn_url) + Button btn_url; + + private ServerConfig config; + @Override + protected int setLayoutId() { + return R.layout.act_seturl; + } + + @Override + protected void initView() { + config = new ServerConfig(this); + ConfigUtil.Fill(config); + et_url.setText(config.getServerUri()); + } + + @Override + protected void initData() { + + } + + @Override + protected void initOper() { + btn_url.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + String url = et_url.getText().toString(); + if (StringUtil.IsNullOrEmpty(url)) { + DialogUtil.AutoHiddenAlert(SetUrlActivity.this, "服务器地址不能为空"); + return; + } + config.setServerUri(url); + ConfigUtil.Save(config); + DialogUtil.AutoHiddenAlert(SetUrlActivity.this, "设置完成"); + finish(); + } + }); + } +} 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 7f8a432..38bc064 100644 --- a/app/src/main/java/com/qhclh/ytzh/login/LoginActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/login/LoginActivity.java @@ -1,5 +1,6 @@ package com.qhclh.ytzh.login; +import android.content.Intent; import android.view.KeyEvent; import android.view.View; import android.widget.Button; @@ -12,6 +13,7 @@ import com.qhclh.ytzh.configs.LoginUserConfig; import com.qhclh.ytzh.configs.ServerConfig; import com.qhclh.ytzh.home.MainActivity; import com.qhclh.ytzh.home.MyApplication; +import com.qhclh.ytzh.home.SetUrlActivity; import com.qhclh.ytzh.tasks.ViewOnClickTask; import com.qhclh.ytzh.utils.ActivityUtil; import com.qhclh.ytzh.utils.DialogUtil; @@ -38,6 +40,9 @@ public class LoginActivity extends BaseActivity { @BindView(R.id.login_sure) Button login_sure; + @BindView(R.id.shezhiurl) + Button shezhiurl; + private LoginUserConfig config = new LoginUserConfig(this); private ServerConfig sconfig = new ServerConfig(this); @@ -67,7 +72,7 @@ public class LoginActivity extends BaseActivity { } - @OnClick({R.id.login_sure}) + @OnClick({R.id.login_sure,R.id.shezhiurl}) public void onClick(View view) { switch (view.getId()) { case R.id.login_sure: @@ -77,6 +82,9 @@ public class LoginActivity extends BaseActivity { DialogUtil.AutoHiddenAlert(LoginActivity.this, "网络不可用"); } break; + case R.id.shezhiurl: + startActivity(new Intent(this, SetUrlActivity.class)); + break; } } diff --git a/app/src/main/res/layout/act_login.xml b/app/src/main/res/layout/act_login.xml index be8a932..4c47325 100644 --- a/app/src/main/res/layout/act_login.xml +++ b/app/src/main/res/layout/act_login.xml @@ -83,5 +83,11 @@ android:layout_marginTop="@dimen/dp_20" android:background="@drawable/denglu_3x" /> +