Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

6 天以前 2b287056e2f59518888d05a1bbc7e5a55fbd84d5

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/rl_root"
    android:layout_width="match_parent"
    android:layout_height="wrap_content">
 
    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        app:layout_constraintTop_toTopOf="parent"
        android:layout_marginTop="20dp"
        android:padding="30dp"
        android:background="@drawable/shape_update_version_bg">
 
        <TextView
            android:id="@+id/tv1"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="新版本更新"
            android:textColor="#ff111111"
            android:textSize="33sp"
            android:textStyle="bold"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            android:layout_marginTop="6dp"/>
 
        <TextView
            android:id="@+id/tv_version"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="更新版本V1.1.1"
            android:textColor="#ff999999"
            android:textSize="21sp"
            app:layout_constraintTop_toBottomOf="@+id/tv1"
            android:layout_marginTop="15dp"
            app:layout_constraintStart_toStartOf="parent"/>
 
        <TextView
            android:id="@+id/update_text"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:lineSpacingExtra="6dp"
            android:text="1、更新了钥匙领取功能；\n
2、更新了钥匙归还功能；\n
3、更新了告警功能。"
            android:textColor="#333333"
            android:textSize="22sp"
            app:layout_constraintTop_toBottomOf="@+id/tv_version"
            android:layout_marginTop="30dp"/>
 
        <TextView
            android:id="@+id/layout_not_update"
            android:layout_width="0dp"
            android:layout_height="75dp"
            android:text="暂不更新"
            android:textStyle="bold"
            android:gravity="center"
            android:textColor="#555555"
            android:textSize="24sp"
            android:paddingLeft="30dp"
            android:paddingRight="30dp"
            android:background="@drawable/shape_mb_bt_faile"
            app:layout_constraintLeft_toLeftOf="parent"
            app:layout_constraintRight_toLeftOf="@+id/layout_update"
            android:layout_marginLeft="15dp"
            app:layout_constraintTop_toBottomOf="@+id/update_text"
            android:layout_marginTop="135dp"/>
 
        <TextView
            android:id="@+id/layout_update"
            android:layout_width="0dp"
            android:layout_height="75dp"
            android:text="立即更新"
            android:textStyle="bold"
            android:gravity="center"
            android:textColor="@color/white"
            android:textSize="24sp"
            android:paddingLeft="30dp"
            android:paddingRight="30dp"
            android:background="@drawable/shape_mb_bt_ok"
            app:layout_constraintTop_toTopOf="@+id/layout_not_update"
            app:layout_constraintLeft_toRightOf="@+id/layout_not_update"
            app:layout_constraintRight_toRightOf="parent"
            android:layout_marginLeft="15dp"
            app:commandType="@{4}"
            app:onClickCommand="@{model.myTypeCommand}"
            android:layout_marginRight="30dp"/>
 
 
    </androidx.constraintlayout.widget.ConstraintLayout>
 
    <ImageView
        android:layout_width="162dp"
        android:layout_height="232dp"
        android:src="@mipmap/ic_rocket"
        android:scaleType="fitXY"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintEnd_toEndOf="parent"/>
 
</androidx.constraintlayout.widget.ConstraintLayout>