From 1253adf41438d647ba092cce42499faa035d310c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 15 五月 2017 13:14:03 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 73 ++++--------------------------------
1 files changed, 8 insertions(+), 65 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 29a8f55..b907669 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -4,6 +4,7 @@
import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Bundle;
+import android.os.SystemClock;
import android.text.format.Formatter;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
@@ -80,6 +81,7 @@
} else {
useNative = true;
}
+ useNative = false;
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
@@ -129,7 +131,9 @@
}
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
- public void surfaceDestroyed(SurfaceHolder holder) {}
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ System.out.println("surfaceDestroyed");
+ }
});
fragment_supervisory_exit_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
public void surfaceCreated(SurfaceHolder holder) {
@@ -141,71 +145,10 @@
}
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
- public void surfaceDestroyed(SurfaceHolder holder) {}
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ System.out.println("surfaceDestroyed");
+ }
});
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// if (useNative) {
-// MainActivity.getInstance().runOnUiThread(new Runnable() {
-// public void run() {
-// try {
-//// File file2 = MainActivity.getInstance().getExternalFilesDir(null);
-//// File[] files = file2.listFiles();
-//// for (File file : files) {
-//// System.out.println(file.getAbsolutePath());
-//// }
-//// String s1 = getStringFromFile("/sdcard/license.lic");
-//// String str = convertStreamToString(MainActivity.getInstance().getAssets().open("license.lic"));
-//// RtspFaceNative.dbgSetStfaceLicense(str);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-//
-// }
-// public String convertStreamToString(InputStream is) throws Exception {
-// BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-// StringBuilder sb = new StringBuilder();
-// String line = null;
-// while ((line = reader.readLine()) != null) {
-// sb.append(line).append("\n");
-// }
-// reader.close();
-// return sb.toString();
-// }
-// public String getStringFromFile (String filePath) throws Exception {
-// File fl = new File(filePath);
-// FileInputStream fin = new FileInputStream(fl);
-// String ret = convertStreamToString(fin);
-// //Make sure you close all streams.
-// fin.close();
-// return ret;
-// }
-// });
-//
-// } else {
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// try {
-// final SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH锛歮m锛歴s鍒�");
-//// while (true) {
-//// Thread.sleep(1000);
-//// MainActivity.getInstance().runOnUiThread(new Runnable() {
-//// @Override
-//// public void run() {
-//// fragment_surveillance_enter_timer.setText(sdf.format(new Date()));
-//// fragment_surveillance_exit_timer.setText(sdf.format(new Date()));
-//// }
-//// });
-//// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-// }).start();
new SurveillanceMng.SurveillanceListThread().start();
}
--
Gitblit v1.8.0