Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDeb...

wjc

2024-12-09 c870de9e4207c7af37229cb24b9ca0e2d1e1215f

 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"
            >