Merge branch '1.4.4'

wjc

8 天以前 5b06b2b9917fbe0c35d21d1b2b54a7de1ec3da29

 app/src/main/res/layout/activity_scan.xml

@@ -21,7 +21,7 @@
        >

        <RelativeLayout
            android:layout_marginTop="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_30"
            android:layout_width="match_parent"
            android:layout_height="50dp"
            >