60 
-            <View
61 
-                android:layout_width="match_parent"
62 
-                android:layout_height="1px"
63 
-                android:background="@color/line_bg" />
64 
-
65 
-            <RelativeLayout
66 
-                android:layout_width="match_parent"
67 
-                android:layout_height="0dp"
68 
-                android:layout_weight="1">
69 
-
70 
-                <ImageView
71 
-                    android:id="@+id/iv_login_pwd"
72 
-                    android:layout_width="28dp"
73 
-                    android:layout_height="28dp"
74 
-                    android:layout_centerVertical="true"
75 
-                    android:src="@drawable/password" />
76 
-
77 
-                <EditText
78 
-                    android:id="@+id/et_login_pwd"
79 
-                    android:layout_width="match_parent"
80 
-                    android:layout_height="match_parent"
81 
-                    android:layout_marginLeft="12dp"
82 
-                    android:layout_toRightOf="@+id/iv_login_pwd"
83 
-                    android:background="@color/white"
84 
-                    android:gravity="center_vertical"
85 
-                    android:hint="@string/password"
86 
-                    android:inputType="textPassword"
87 
-                    android:textColor="@color/dark_grey"
88 
-                    android:textColorHint="@color/text_hint_grey_color"
89 
-                    android:textSize="16sp" />
90 
-
91 
-            </RelativeLayout>
92 
-        </LinearLayout>
35 
+            android:layout_alignParentBottom="true"
36 
+            android:text="@string/agree_protocol"
37 
+            android:layout_marginBottom="16dp"
38 
+            android:textSize="14sp"
39 
+            android:textColor="@color/agree_protocol_text_gray_color"/>
93 40
94 41 
         <Button
95 42 
             android:id="@+id/btn_login"
96 43 
             android:layout_width="290dp"
97 
-            android:layout_height="48dp"
98 
-            android:layout_below="@id/layout_login_edit"
44 
+            android:layout_height="40dp"
99 45 
             android:layout_centerHorizontal="true"
100 
-            android:layout_marginTop="15dp"
46 
+            android:layout_above="@id/tv_agree_protocol"
47 
+            android:layout_marginBottom="50dp"
101 48 
             android:background="@drawable/login_btn_rounded_rect_bg"
102 49 
             android:gravity="center"
103 
-            android:text="@string/login"
104 
-            android:textColor="@color/white"
50 
+            android:text="@string/wx_login"
51 
+            android:textColor="@color/wx_login_btn_stroke"
105 52 
             android:textSize="18sp" />
53 
+
54 
+
106 55 
     </RelativeLayout>
107 56
108 57 
     <com.android.views.progressbar.ProgressWheel

+ 3 - 1
app/src/main/res/values/colors.xml
ファイルの表示 

@@ -16,5 +16,7 @@
16 16 
     <color name="dark_grey">#333333</color>
17 17
18 18 
     <color name="text_hint_grey_color">#CCCCCC</color>
19 
-    <color name="login_bg_blue">#2F4159</color>
19 
+    <color name="wx_login_btn_stroke">#25CA47</color>
20 
+    <color name="agree_protocol_text_gray_color">#B3B3B3</color>
21 
+
20 22 
 </resources>

+ 3 - 4
app/src/main/res/values/strings.xml
ファイルの表示 

@@ -1,15 +1,14 @@
1 1 
 <resources>
2 2 
     <string name="app_name">拍爱</string>
3 
-    <string name="bar_app_name">拍爱摄影师端</string>
3 
+    <string name="bar_app_name">拍爱摄影师版</string>
4 4 
     <string name="bt_connected">已连接</string>
5 5 
     <string name="bt_disconnected">已断开</string>
6 6 
     <string name="briefs">简报</string>
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>
10 
+    <string name="wx_login">微信登录</string>
11 
+    <string name="agree_protocol">已阅读并同意拍爱用户协议</string>
13 12
14 13 
     <string name="login_success">登录成功</string>
15 14 
     <string name="login_fail">登录失败</string>

kodo - Gogs: Go Git Service
Página Inicial Explorar Ajuda
Registrar Entrar
Kodo
/
kodo
Observar 2
Favorito 0
Fork 0
Problemas 0 Pull Requests 0 Commits 1713 Versões 0

Nenhuma Descrição

ZIP TAR.GZ

0005_mchinfodecryptloginfo.py 1.9KB
Histórico Cru 

    # -*- coding: utf-8 -*-
# Generated by Django 1.11.15 on 2018-09-17 04:14
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

    dependencies = [
        ('logs', '0004_mchinfoencryptloginfo_distributor_pk'),
    ]

    operations = [
        migrations.CreateModel(
            name='MchInfoDecryptLogInfo',
            fields=[
                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                ('status', models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status')),
                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
                ('ciphertext', models.CharField(blank=True, db_index=True, help_text='\u5f85\u89e3\u5bc6\u5b57\u7b26\u4e32', max_length=64, null=True, verbose_name='ciphertext')),
                ('brand_pk', models.IntegerField(db_index=True, default=0, help_text='\u54c1\u724cPK', verbose_name='brand_pk')),
                ('model_pk', models.IntegerField(db_index=True, default=0, help_text='\u578b\u53f7PK', verbose_name='model_pk')),
                ('distributor_pk', models.IntegerField(db_index=True, default=0, help_text='\u7ecf\u9500\u5546PK', verbose_name='distributor_pk')),
                ('sn', models.CharField(blank=True, db_index=True, help_text='\u5e8f\u5217\u53f7', max_length=32, null=True, verbose_name='sn')),
                ('decrypt_count', models.IntegerField(default=1, help_text='\u89e3\u5bc6\u6b21\u6570', verbose_name='decrypt_count')),
            ],
            options={
                'verbose_name': 'mchinfodecryptloginfo',
                'verbose_name_plural': 'mchinfodecryptloginfo',
            },
        ),
    ]