Skip to content

Commit 632fa22

Browse files
committed
fix bug
1 parent 112e963 commit 632fa22

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

qrcodescanner/src/main/java/com/iqos/qrscanner/app/QRScannerActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public class QRScannerActivity extends AppCompatActivity implements SurfaceHolde
4444
private boolean hasSurface;
4545
private boolean playBeep;
4646
private boolean vibrate;
47-
4847
@Override
4948
protected void onCreate(Bundle savedInstanceState) {
5049
super.onCreate(savedInstanceState);

qrcodescanner/src/main/java/com/iqos/qrscanner/widget/ViewfinderView.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020

2121
/**
22-
* 二维码自定义扫描界面
22+
* Created by 水银灯、 on 2018/04/11.
23+
* 自定义二维码扫描界面
2324
*/
2425
public final class ViewfinderView extends View {
2526
private static final long ANIMATION_DELAY = 1L;//刷新界面的时间
@@ -165,6 +166,4 @@ public void onDraw(Canvas canvas) {
165166
public void drawViewfinder() {
166167
invalidate();
167168
}
168-
169-
170169
}

qrcodescanner/src/main/res/layout/activity_qrscanner.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:keepScreenOn="true">
7-
87
<!--SurfaceView-->
98
<SurfaceView
109
android:id="@+id/preview_view"
1110
android:layout_width="match_parent"
1211
android:layout_height="match_parent" />
13-
1412
<!--自定义扫码界面-->
1513
<com.iqos.qrscanner.widget.ViewfinderView
1614
android:id="@+id/viewfinder_view"
@@ -24,7 +22,6 @@
2422
app:scan_text_above_rect="false"
2523
app:scan_tip_text="@string/scan_tip"
2624
app:scan_tip_text_size="14sp" />
27-
2825
<!--标题栏-->
2926
<include layout="@layout/app_layout_title" />
3027
</FrameLayout>

qrcodescanner/src/main/res/values/colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
<color name="colorPrimary">#3D3840</color>
44
<color name="colorPrimaryDark">#303F9F</color>
55
<color name="colorAccent">#F5A623</color>
6-
</resources>
6+
</resources>

0 commit comments

Comments
 (0)