qr scan UI
chengzhenyu
3 geänderte Dateien mit 6 neuen Zeilen und 3 gelöschten Zeilen
+ 2
- 2
app/src/main/java/ai/pai/lensman/qrcode/QRCaptureActivity.java
@@ -241,8 +241,8 @@ public class QRCaptureActivity extends FragmentActivity implements SurfaceHolder |
||
| 241 | 241 |
// camera error |
| 242 | 242 |
AlertDialog.Builder builder = new AlertDialog.Builder(this); |
| 243 | 243 |
builder.setTitle(getString(R.string.app_name)); |
| 244 |
- builder.setMessage("相机打开出错，请稍后重试");
|
|
| 245 |
- builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
|
| 244 |
+ builder.setMessage(R.string.check_permission_when_open_camera_error); |
|
| 245 |
+ builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
|
|
| 246 | 246 |
|
| 247 | 247 |
@Override |
| 248 | 248 |
public void onClick(DialogInterface dialog, int which) {
|
+ 1
- 0
app/src/main/res/layout/activity_qrcapture.xml
@@ -138,6 +138,7 @@ |
||
| 138 | 138 |
android:layout_height="120dp" |
| 139 | 139 |
android:layout_alignParentBottom="true" |
| 140 | 140 |
android:alpha="0.6" |
| 141 |
+ android:visibility="invisible" |
|
| 141 | 142 |
android:background="@color/black" |
| 142 | 143 |
android:orientation="horizontal"> |
| 143 | 144 |
|
+ 3
- 1
app/src/main/res/values/strings.xml
@@ -15,6 +15,8 @@ |
||
| 15 | 15 |
<string name="qr_scan_flash_on">开灯</string> |
| 16 | 16 |
<string name="qr_scan_flash_off">关灯</string> |
| 17 | 17 |
|
| 18 |
- <string name="scan_qr_join_group">扫描二维码加入群</string> |
|
| 18 |
+ <string name="scan_qr_join_group">扫描二维码获取照片</string> |
|
| 19 |
+ <string name="check_permission_when_open_camera_error">相机打开出错，请检查是否已打开应用的相机权限</string> |
|
| 19 | 20 |
|
| 21 |
+ <string name="ok">确定</string> |
|
| 20 | 22 |
</resources> |