From ef1798bff3f7d6631c499e20f258739689804f33 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 11 Jan 2018 09:44:53 +0800
Subject: [PATCH] no message

---
 .../com/qhclh/ytzh/home/SetUrlActivity.java   | 10 +++++-
 app/src/main/res/drawable/bg_bt_selector.xml  |  5 +++
 app/src/main/res/drawable/bg_btn_normal.xml   | 10 ++++++
 app/src/main/res/drawable/bg_btn_pressed.xml  | 10 ++++++
 app/src/main/res/layout/act_seturl.xml        | 35 ++++++++++++++++---
 app/src/main/res/values/colors.xml            |  1 +
 6 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_bt_selector.xml
 create mode 100644 app/src/main/res/drawable/bg_btn_normal.xml
 create mode 100644 app/src/main/res/drawable/bg_btn_pressed.xml

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/bg_btn_pressed"/>
+    <item android:state_pressed="false" android:drawable="@drawable/bg_btn_normal"/>
+</selector>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/greene60b9343"/>
+    <corners android:radius="@dimen/px_8"/>
+    <stroke
+        android:width="@dimen/dp_1"
+        android:color="@color/greene60b9343"/>
+
+</shape>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/colorAccent"/>
+    <corners android:radius="@dimen/px_8"/>
+    <stroke
+        android:width="@dimen/dp_1"
+        android:color="@color/colorAccent"/>
+
+</shape>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_tool_bar" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/dp_10"
+        android:text="按照格式输入服务器地址" />
 
     <EditText
         android:id="@+id/et_url"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_10" />
+
     <Button
         android:id="@+id/btn_url"
-        android:text="确认"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_10"
+        android:background="@drawable/bg_bt_selector"
+        android:padding="@dimen/dp_10"
+        android:text="确认"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_size_18" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="0dp"
+        android:layout_weight="2" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6c6b6bf..cad1819 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@
     <!-- 各种控件默认选中颜色-->
     <color name="colorAccent">#0b9343</color>
 
+    <color name="greene60b9343">#e60b9343</color>
     <color name="ui_green">#FF16BB8E</color>
     <color name="ui_deep_green">#FF108D6C</color>
     <color name="grey999">#999999</color>