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

doum

2025-10-15 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
<?xml version="1.0" encoding="utf-8"?>
<layout>
    <data>
        <import type="com.doumee.lib_coremodel.base.BaseViewModel"/>
        <import type="android.view.View"/>
        <variable
            name="model"
            type="com.doumee.keyCabinet.ui.guide.GuideViewModel" />
    </data>
    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        xmlns:tools="http://schemas.android.com/tools"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        tools:context=".ui.guide.GuideActivity"
        android:background="@mipmap/bg_home"
        >
 
        <TextView
            android:id="@+id/tv_dvcode"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textColor="@color/white"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintBottom_toBottomOf="parent"
            android:textSize="16sp"/>
 
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_jy"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:visibility="@{model.jyVisibility}">
 
            <View
                android:id="@+id/v_bg1"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:background="#ffc4c4c4"/>
 
            <View
                android:id="@+id/v_bg2"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:background="@drawable/shape_r30_white_bg"
                android:layout_marginTop="25dp"
                android:layout_marginBottom="25dp"
                android:layout_marginLeft="35dp"
                android:layout_marginRight="35dp"/>
 
            <TextView
                android:id="@+id/tv1"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="@string/sbyjy"
                android:textColor="#ff222222"
                android:textSize="43sp"
                app:layout_constraintBottom_toTopOf="@+id/cl_sim"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                android:layout_marginBottom="60dp"/>
 
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/cl_sim"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintBottom_toBottomOf="parent">
 
                <com.facebook.drawee.view.SimpleDraweeView
                    android:id="@+id/sim_bg"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    app:viewAspectRatio="1.59"
                    app:layout_constraintTop_toTopOf="parent"
                    android:layout_marginLeft="35dp"
                    android:layout_marginRight="35dp"
                    android:background="@mipmap/img_saoma_jinyong"/>
            </androidx.constraintlayout.widget.ConstraintLayout>
 
 
 
        </androidx.constraintlayout.widget.ConstraintLayout>
 
        <com.facebook.drawee.view.SimpleDraweeView
            android:id="@+id/sim"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:visibility="gone"/>
 
 
    </androidx.constraintlayout.widget.ConstraintLayout>
</layout>