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 0e689cf..d424af1 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/SetUrlActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/home/SetUrlActivity.java @@ -1,5 +1,6 @@ package com.qhclh.ytzh.home; +import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -18,6 +19,8 @@ import butterknife.BindView; */ public class SetUrlActivity extends BaseActivity { + @BindView(R.id.toolbar) + Toolbar mToolbar; @BindView(R.id.et_url) EditText et_url; @BindView(R.id.btn_url) @@ -31,6 +34,12 @@ public class SetUrlActivity extends BaseActivity { @Override protected void initView() { + initToolbar(mToolbar, "设置服务器地址", new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }); config = new ServerConfig(this); ConfigUtil.Fill(config); if (config.getServerUri()!=null && !"".equals(config.getServerUri())) { @@ -38,7 +47,6 @@ public class SetUrlActivity extends BaseActivity { }else { et_url.setText("http://47.104.88.50/B3/"); } - System.out.println("aaa+++++++++++"+config.getServerUri()); } @Override diff --git a/app/src/main/res/drawable/bg_bt_selector.xml b/app/src/main/res/drawable/bg_bt_selector.xml new file mode 100644 index 0000000..98a15e5 --- /dev/null +++ b/app/src/main/res/drawable/bg_bt_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_btn_normal.xml b/app/src/main/res/drawable/bg_btn_normal.xml new file mode 100644 index 0000000..62a52c2 --- /dev/null +++ b/app/src/main/res/drawable/bg_btn_normal.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/bg_btn_pressed.xml b/app/src/main/res/drawable/bg_btn_pressed.xml new file mode 100644 index 0000000..6087218 --- /dev/null +++ b/app/src/main/res/drawable/bg_btn_pressed.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/app/src/main/res/layout/act_seturl.xml b/app/src/main/res/layout/act_seturl.xml index ceaa293..e72b5e8 100644 --- a/app/src/main/res/layout/act_seturl.xml +++ b/app/src/main/res/layout/act_seturl.xml @@ -1,17 +1,42 @@ + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + android:layout_height="wrap_content" + android:layout_margin="@dimen/dp_10" /> +