Merge branch 'master' of http://192.168.1.20:10010/r/U3DRepository

hch

2021-01-12 7531daf8259596711fdeba749c1b1d41d72c62c4

 SdkProject/app/src/main/res/layout/activity_main.xml

@@ -25,6 +25,19 @@
            android:layout_marginTop="24dp"
            android:text="pay" />

        <Button
            android:id="@+id/btnA"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="24dp"
            android:text="A" />
        <Button
            android:id="@+id/btnB"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="24dp"
            android:text="B" />

    </LinearLayout>

    <RelativeLayout