Skip to content

Commit 91cf9d7

Browse files
w2016561536w2016561536
committed
修复4.1的BUG
fix bugs in 4.1
1 parent 30e3a0c commit 91cf9d7

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "com.example.vcam"
1010
minSdk 21
1111
targetSdk 27
12-
versionCode 25
13-
versionName "4.1-1"
12+
versionCode 26
13+
versionName "4.2"
1414

1515
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1616
}

‎app/release/app-release.apk‎

1 Byte
Binary file not shown.

‎app/release/output-metadata.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 25,
15-
"versionName": "4.1-1",
14+
"versionCode": 26,
15+
"versionName": "4.2",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

‎app/src/main/java/com/example/vcam/HookMain.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void handleLoadPackage(final XC_LoadPackage.LoadPackageParam lpparam) thr
9999
protected void beforeHookedMethod(MethodHookParam param) {
100100
File file = new File(video_path + "virtual.mp4");
101101
if (file.exists()) {
102-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
102+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
103103
if (control_file.exists()){
104104
return;
105105
}
@@ -131,7 +131,7 @@ protected void beforeHookedMethod(MethodHookParam param) {
131131
}
132132
param.args[0] = fake_SurfaceTexture;
133133
} else {
134-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
134+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
135135
need_to_show_toast = !toast_control.exists();
136136
if (toast_content != null && need_to_show_toast) {
137137
try {
@@ -156,12 +156,12 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
156156
}
157157
c2_state_cb = (CameraDevice.StateCallback) param.args[1];
158158
c2_state_callback = param.args[1].getClass();
159-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
159+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
160160
if (control_file.exists()) {
161161
return;
162162
}
163163
File file = new File(video_path + "virtual.mp4");
164-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
164+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
165165
need_to_show_toast = !toast_control.exists();
166166
if (!file.exists()) {
167167
if (toast_content != null && need_to_show_toast) {
@@ -191,12 +191,12 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
191191
return;
192192
}
193193
c2_state_cb = (CameraDevice.StateCallback) param.args[2];
194-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
194+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
195195
if (control_file.exists()) {
196196
return;
197197
}
198198
File file = new File(video_path + "virtual.mp4");
199-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
199+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
200200
need_to_show_toast = !toast_control.exists();
201201
if (!file.exists()) {
202202
if (toast_content != null && need_to_show_toast) {
@@ -271,7 +271,7 @@ protected void afterHookedMethod(MethodHookParam param) {
271271
@Override
272272
protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
273273
super.beforeHookedMethod(param);
274-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
274+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
275275
need_to_show_toast = !toast_control.exists();
276276
XposedBridge.log("【VCAM】[record]" + lpparam.packageName);
277277
if (toast_content != null && need_to_show_toast) {
@@ -341,7 +341,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
341341
video_path = toast_content.getExternalFilesDir(null).getAbsolutePath() + "/Camera1/";
342342
}
343343
} else {
344-
File uni_DCIM_path = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/");
344+
File uni_DCIM_path = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/");
345345
if (uni_DCIM_path.canWrite()) {
346346
File uni_Camera1_path = new File(video_path);
347347
if (!uni_Camera1_path.exists()) {
@@ -357,7 +357,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
357357
@Override
358358
protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
359359
File file = new File(video_path + "virtual.mp4");
360-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
360+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
361361
need_to_show_toast = !toast_control.exists();
362362
if (!file.exists()) {
363363
if (toast_content != null && need_to_show_toast) {
@@ -369,7 +369,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
369369
return;
370370
}
371371
}
372-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
372+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
373373
if (control_file.exists()) {
374374
return;
375375
}
@@ -389,7 +389,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
389389
return;
390390
}
391391
mplayer1.setSurface(ori_holder.getSurface());
392-
File sfile = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no-silent.jpg");
392+
File sfile = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no-silent.jpg");
393393
if (!(sfile.exists() && (!is_someone_playing))) {
394394
mplayer1.setVolume(0, 0);
395395
is_someone_playing = false;
@@ -431,7 +431,7 @@ public void onPrepared(MediaPlayer mp) {
431431

432432
mMediaPlayer.setSurface(mSurface);
433433

434-
File sfile = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no-silent.jpg");
434+
File sfile = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no-silent.jpg");
435435
if (!(sfile.exists() && (!is_someone_playing))) {
436436
mMediaPlayer.setVolume(0, 0);
437437
is_someone_playing = false;
@@ -462,7 +462,7 @@ public void onPrepared(MediaPlayer mp) {
462462
protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
463463
XposedBridge.log("【VCAM】添加Surfaceview预览");
464464
File file = new File(video_path + "virtual.mp4");
465-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
465+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
466466
need_to_show_toast = !toast_control.exists();
467467
if (!file.exists()) {
468468
if (toast_content != null && need_to_show_toast) {
@@ -474,7 +474,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
474474
return;
475475
}
476476
}
477-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
477+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
478478
if (control_file.exists()) {
479479
return;
480480
}
@@ -512,7 +512,7 @@ protected void beforeHookedMethod(MethodHookParam param) {
512512
return;
513513
}
514514
File file = new File(video_path + "virtual.mp4");
515-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
515+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
516516
need_to_show_toast = !toast_control.exists();
517517
if (!file.exists()) {
518518
if (toast_content != null && need_to_show_toast) {
@@ -527,7 +527,7 @@ protected void beforeHookedMethod(MethodHookParam param) {
527527
if (param.args[0].equals(c2_virtual_surface)) {
528528
return;
529529
}
530-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
530+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
531531
if (control_file.exists()) {
532532
return;
533533
}
@@ -566,7 +566,7 @@ protected void beforeHookedMethod(MethodHookParam param) {
566566
return;
567567
}
568568
File file = new File(video_path + "virtual.mp4");
569-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
569+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
570570
need_to_show_toast = !toast_control.exists();
571571
if (!file.exists()) {
572572
if (toast_content != null && need_to_show_toast) {
@@ -578,7 +578,7 @@ protected void beforeHookedMethod(MethodHookParam param) {
578578
return;
579579
}
580580
}
581-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
581+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
582582
if (control_file.exists()) {
583583
return;
584584
}
@@ -611,7 +611,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
611611
}
612612
c2_builder = (CaptureRequest.Builder) param.thisObject;
613613
File file = new File(video_path + "virtual.mp4");
614-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
614+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
615615
need_to_show_toast = !toast_control.exists();
616616
if (!file.exists() && need_to_show_toast) {
617617
if (toast_content != null) {
@@ -624,7 +624,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
624624
}
625625
}
626626

627-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
627+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
628628
if (control_file.exists()) {
629629
return;
630630
}
@@ -662,7 +662,7 @@ protected void beforeHookedMethod(MethodHookParam param) {
662662
c2_ori_width = (int) param.args[0];
663663
c2_ori_height = (int) param.args[1];
664664
imageReaderFormat = (int) param.args[2];
665-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
665+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
666666
need_to_show_toast = !toast_control.exists();
667667
if (toast_content != null && need_to_show_toast) {
668668
try {
@@ -736,7 +736,7 @@ private void process_camera2_play() {
736736
c2_player = new MediaPlayer();
737737
}
738738
c2_player.setSurface(c2_preview_Surfcae);
739-
File sfile = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no-silent.jpg");
739+
File sfile = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no-silent.jpg");
740740
if (!sfile.exists()) {
741741
c2_player.setVolume(0, 0);
742742
}
@@ -763,7 +763,7 @@ public void onPrepared(MediaPlayer mp) {
763763
c2_player_1 = new MediaPlayer();
764764
}
765765
c2_player_1.setSurface(c2_preview_Surfcae_1);
766-
File sfile = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no-silent.jpg");
766+
File sfile = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no-silent.jpg");
767767
if (!sfile.exists()) {
768768
c2_player_1.setVolume(0, 0);
769769
}
@@ -1009,7 +1009,7 @@ protected void beforeHookedMethod(MethodHookParam paramd) throws Throwable {
10091009
onemwidth = loaclcam.getParameters().getPreviewSize().width;
10101010
onemhight = loaclcam.getParameters().getPreviewSize().height;
10111011
XposedBridge.log("【VCAM】JPEG拍照回调初始化：宽：" + onemwidth + "高：" + onemhight + "对应的类：" + loaclcam.toString());
1012-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
1012+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
10131013
need_to_show_toast = !toast_control.exists();
10141014
if (toast_content != null && need_to_show_toast) {
10151015
try {
@@ -1018,7 +1018,7 @@ protected void beforeHookedMethod(MethodHookParam paramd) throws Throwable {
10181018
XposedBridge.log("【VCAM】[toast]" + e.toString());
10191019
}
10201020
}
1021-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
1021+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
10221022
if (control_file.exists()) {
10231023
return;
10241024
}
@@ -1050,7 +1050,7 @@ protected void beforeHookedMethod(MethodHookParam paramd) throws Throwable {
10501050
onemwidth = loaclcam.getParameters().getPreviewSize().width;
10511051
onemhight = loaclcam.getParameters().getPreviewSize().height;
10521052
XposedBridge.log("【VCAM】YUV拍照回调初始化：宽：" + onemwidth + "高：" + onemhight + "对应的类：" + loaclcam.toString());
1053-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
1053+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
10541054
need_to_show_toast = !toast_control.exists();
10551055
if (toast_content != null && need_to_show_toast) {
10561056
try {
@@ -1059,7 +1059,7 @@ protected void beforeHookedMethod(MethodHookParam paramd) throws Throwable {
10591059
XposedBridge.log("【VCAM】[toast]" + ee.toString());
10601060
}
10611061
}
1062-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
1062+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
10631063
if (control_file.exists()) {
10641064
return;
10651065
}
@@ -1075,12 +1075,12 @@ protected void beforeHookedMethod(MethodHookParam paramd) throws Throwable {
10751075
private void process_callback(XC_MethodHook.MethodHookParam param) {
10761076
Class preview_cb_class = param.args[0].getClass();
10771077
int need_stop = 0;
1078-
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "disable.jpg");
1078+
File control_file = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "disable.jpg");
10791079
if (control_file.exists()) {
10801080
need_stop = 1;
10811081
}
10821082
File file = new File(video_path + "virtual.mp4");
1083-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
1083+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
10841084
need_to_show_toast = !toast_control.exists();
10851085
if (!file.exists()) {
10861086
if (toast_content != null && need_to_show_toast) {
@@ -1108,7 +1108,7 @@ protected void beforeHookedMethod(MethodHookParam paramd) throws Throwable {
11081108
mhight = camera_onPreviewFrame.getParameters().getPreviewSize().height;
11091109
int frame_Rate = camera_onPreviewFrame.getParameters().getPreviewFrameRate();
11101110
XposedBridge.log("【VCAM】帧预览回调初始化：宽：" + mwidth + " 高：" + mhight + " 帧率：" + frame_Rate);
1111-
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/" + "no_toast.jpg");
1111+
File toast_control = new File(Environment.getExternalStorageDirectory().getPath() + "/DCIM/Camera1/" + "no_toast.jpg");
11121112
need_to_show_toast = !toast_control.exists();
11131113
if (toast_content != null && need_to_show_toast) {
11141114
try {

0 commit comments

Comments
 (0)