|
11
|
|
- android:layout_gravity="center"
|
|
|
90
|
+ android:layout_width="290dp"
|
|
|
91
|
+ android:layout_height="48dp"
|
|
|
92
|
+ android:layout_below="@id/layout_login_edit"
|
|
|
93
|
+ android:layout_centerHorizontal="true"
|
|
|
94
|
+ android:layout_marginTop="15dp"
|
|
|
95
|
+ android:background="@drawable/login_btn_rounded_rect_bg"
|
|
12
|
96
|
android:gravity="center"
|
|
13
|
|
- android:textSize="20sp"
|
|
14
|
|
- android:textColor="@color/black"
|
|
15
|
|
- android:text="登录"/>
|
|
16
|
|
-</LinearLayout>
|
|
|
97
|
+ android:text="@string/login"
|
|
|
98
|
+ android:textColor="@color/white"
|
|
|
99
|
+ android:textSize="18sp" />
|
|
|
100
|
+
|
|
|
101
|
+</RelativeLayout>
|
|
|
|
@@ -3,7 +3,7 @@
|
|
3
|
3
|
android:layout_width="wrap_content"
|
|
4
|
4
|
android:layout_height="wrap_content"
|
|
5
|
5
|
android:layout_margin="3dp"
|
|
6
|
|
- android:background="@drawable/rounded_rect">
|
|
|
6
|
+ android:background="@drawable/login_rounded_rect_bg">
|
|
7
|
7
|
|
|
8
|
8
|
<ImageView
|
|
9
|
9
|
android:id="@+id/iv_session_item"
|
|
|
|
@@ -14,4 +14,7 @@
|
|
14
|
14
|
|
|
15
|
15
|
<color name="pop_bg_color">#F7F7F7</color>
|
|
16
|
16
|
<color name="dark_grey">#333333</color>
|
|
|
17
|
+
|
|
|
18
|
+ <color name="text_hint_grey_color">#CCCCCC</color>
|
|
|
19
|
+ <color name="login_bg_blue">#2F4159</color>
|
|
17
|
20
|
</resources>
|
|
|
|
@@ -7,6 +7,10 @@
|
|
7
|
7
|
<string name="settings">设置</string>
|
|
8
|
8
|
<string name="scene">场景</string>
|
|
9
|
9
|
|
|
|
10
|
+ <string name="login">登录</string>
|
|
|
11
|
+ <string name="account_name">账号</string>
|
|
|
12
|
+ <string name="password">密码</string>
|
|
|
13
|
+
|
|
10
|
14
|
<string name="network_disconnect">当前无网络连接</string>
|
|
11
|
15
|
|
|
12
|
16
|
<string name="qr_scan_hint">将取景框对准二维码，\n即可自动扫码</string>
|