From 252c803d51fa07a55adc46efa9467741801e66c4 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 04 八月 2017 15:16:55 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 213 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 172 insertions(+), 41 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 b635a36..01d36d3 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
@@ -1,25 +1,43 @@
package cn.com.basic.face.fragment;
-import android.graphics.Bitmap;
+import android.app.AlarmManager;
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.os.Build;
import android.os.Bundle;
-import android.view.Surface;
+import android.text.format.Formatter;
+import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
+import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
-import android.widget.VideoView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.base.BaseFragment;
import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.service.DeviceMng;
+import cn.com.basic.face.thread.StartCameraThread;
import cn.com.basic.face.util.RtspFaceNative;
import cn.com.basic.face.service.SurveillanceMng;
-import cn.com.basic.face.widget.surveilance.SurveillanceBottomListView;
+import cn.com.basic.face.thread.SurveillancePhotoEmulateThread;
+import cn.com.basic.face.widget.surveilance.SurveillanceBottomAttendanceListView;
+import cn.com.basic.face.widget.surveilance.SurveillanceBottomVisitorListView;
import com.lidroid.xutils.view.annotation.ViewInject;
+import com.lidroid.xutils.view.annotation.event.OnClick;
+
+import java.io.DataOutputStream;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.*;
public class SurveillanceFragment extends BaseFragment {
@@ -32,18 +50,82 @@
@ViewInject(R.id.fragment_supervisory_bottom_attendance_background)
private View fragment_supervisory_bottom_attendance_background;
@ViewInject(R.id.fragment_supervisory_bottom_visit_list_view)
- private SurveillanceBottomListView fragment_supervisory_bottom_visit_list_view;
+ private SurveillanceBottomVisitorListView fragment_supervisory_bottom_visit_list_view;
@ViewInject(R.id.fragment_supervisory_bottom_attendance_list_view)
- private SurveillanceBottomListView fragment_supervisory_bottom_attendance_list_view;
+ private SurveillanceBottomAttendanceListView fragment_supervisory_bottom_attendance_list_view;
@ViewInject(R.id.fragment_supervisory_enter_camera)
- SurfaceView fragment_supervisory_enter_camera;
+ private SurfaceView fragment_supervisory_enter_camera;
@ViewInject(R.id.fragment_supervisory_exit_camera)
- SurfaceView fragment_supervisory_exit_camera;
+ private SurfaceView fragment_supervisory_exit_camera;
+ @ViewInject(R.id.fragment_surveillance_enter_timer)
+ private TextView fragment_surveillance_enter_timer;
+ @ViewInject(R.id.fragment_surveillance_exit_timer)
+ private TextView fragment_surveillance_exit_timer;
+ @ViewInject(R.id.fragment_supervisory_exit_camera_relative_layout)
+ private RelativeLayout fragment_supervisory_exit_camera_relative_layout;
+ @ViewInject(R.id.fragment_supervisory_enter_camera_relative_layout)
+ private RelativeLayout fragment_supervisory_enter_camera_relative_layout;
+ @ViewInject(R.id.fragment_surveillance_bottom_linear_layout)
+ private LinearLayout fragment_surveillance_bottom_linear_layout;
+
+ StartCameraThread startEnterCameraThread = null;
+ StartCameraThread startExitCameraThread = null;
static boolean useNative = false;
+ public static boolean isEmulator() {
+ return Build.FINGERPRINT.startsWith("generic")
+ || Build.FINGERPRINT.startsWith("unknown")
+ || Build.MODEL.contains("google_sdk")
+ || Build.MODEL.contains("Emulator")
+ || Build.MODEL.contains("Android SDK built for x86")
+ || Build.MANUFACTURER.contains("Genymotion")
+ || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
+ || "google_sdk".equals(Build.PRODUCT);
+ }
+
static {
+ if (isEmulator()) {
+ useNative = false;
+ } else {
+ useNative = true;
+ }
+ if (CommonVariables.FACE_SERVER) {
+ useNative = false;
+ }
+ //useNative = false;
+ if (CommonVariables.EMULATOR) {
+ useNative = false;
+ }
if (useNative) {
+ try{
+
+// Process su = Runtime.getRuntime().exec("su");
+// Calendar c = Calendar.getInstance();
+// c.set(2017, 4, 1, 12, 34, 56);
+// AlarmManager am = (AlarmManager) MainActivity.getInstance().getSystemService(Context.ALARM_SERVICE);
+//
+//// am.setTime(c.getTimeInMillis());
+//
+// DataOutputStream outputStream = new DataOutputStream(su.getOutputStream());
+//
+//// outputStream.writeBytes("su 0 toolbox date -s 20170501.235959");
+//
+// outputStream.writeBytes("/system/mac.sh");
+// outputStream.flush();
+// //Thread.sleep(5000);
+//// outputStream.writeBytes("busybox ifconfig wlan0 hw ether f4:8b:32:62:4f:89\n");
+//// outputStream.flush();
+//
+// outputStream.writeBytes("exit\n");
+// outputStream.flush();
+// su.waitFor();
+ /*
+ busybox ifconfig wlan0 hw ether AC:83:F3:42:19:CE
+ */
+ }catch(Exception e){
+ e.printStackTrace();
+ }
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
System.loadLibrary("protobuf-lite");
@@ -51,7 +133,32 @@
System.loadLibrary("protoc");
System.loadLibrary("rtspface");
RtspFaceNative.init();
- RtspFaceNative.setLocalIP("192.168.1.10");
+ WifiManager wm = (WifiManager) MainActivity.getInstance().getSystemService(Context.WIFI_SERVICE);
+ String ip = Formatter.formatIpAddress(wm.getConnectionInfo().getIpAddress());
+ String ipAddress = null;
+ try {
+ for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
+ NetworkInterface intf = en.nextElement();
+ for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) {
+ InetAddress inetAddress = enumIpAddr.nextElement();
+ if (!inetAddress.isLoopbackAddress()) {
+ String ip1 = inetAddress.getHostAddress().toString();
+ if (ip1.contains("192.")) {
+ ipAddress = ip1;
+ }
+ }
+ }
+ }
+ } catch (SocketException ex) {}
+
+
+// outputStream.writeBytes("busybox ifconfig wlan0 hw ether 00:e0:2c:31:1a:ba\n");
+ /*
+sysctl kernel.sched_is_big_little=1
+sysctl net.core.rmem_max=40000000
+ */
+ RtspFaceNative.setLocalIP(ipAddress);
+ System.out.println("ipaddr="+ipAddress);
}
}
@@ -61,12 +168,12 @@
return instance;
}
- public SurveillanceBottomListView get_fragment_supervisory_bottom_visit_list_view() {
+ public SurveillanceBottomVisitorListView get_fragment_supervisory_bottom_visitor_list_view() {
return fragment_supervisory_bottom_visit_list_view;
}
- public SurveillanceBottomListView get_fragment_supervisory_bottom_attendance_list_view() {
- return fragment_supervisory_bottom_visit_list_view;
+ public SurveillanceBottomAttendanceListView get_fragment_supervisory_bottom_attendance_list_view() {
+ return fragment_supervisory_bottom_attendance_list_view;
}
@Override
@@ -76,28 +183,56 @@
@Override
protected void initViews(View view, Bundle savedInstanceState) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- if (useNative) {
- MainActivity.getInstance().runOnUiThread(new Runnable() {
- public void run() {
- RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
- //RtspFaceNative.setSurface(2, fragment_supervisory_exit_camera.getHolder().getSurface());
- RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
- //RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
- RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
- }
- });
- } else {
+ if (CommonVariables.FACE_SERVER) {
+ fragment_supervisory_enter_camera_relative_layout.addView(MainActivity.getInstance().mPreview);
+ fragment_supervisory_enter_camera_relative_layout.addView(MainActivity.getInstance().mDraw);
+ }
+ fragment_supervisory_enter_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
+ public void surfaceCreated(SurfaceHolder holder) {
+ if (CommonVariables.EMULATOR) {
+ new SurveillancePhotoEmulateThread().start();
+ }
+ if (useNative) {
+ synchronized (MainActivity.getInstance()) {
+ startEnterCameraThread = new StartCameraThread(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
+ startEnterCameraThread.start();
}
- } catch (Exception e) {
- e.printStackTrace();
}
}
- }).start();
- reloadBottomList();
+
+ public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
+ public void surfaceDestroyed(SurfaceHolder holder) { }
+ });
+ fragment_supervisory_exit_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
+ public void surfaceCreated(SurfaceHolder holder) {
+ if (useNative) {
+ synchronized (MainActivity.getInstance()) {
+ startEnterCameraThread = new StartCameraThread(Integer.parseInt(CommonVariables.Camera.OUT), fragment_supervisory_exit_camera.getHolder().getSurface());
+ startEnterCameraThread.start();
+ }
+ }
+ }
+
+ public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { }
+ public void surfaceDestroyed(SurfaceHolder holder) { }
+ });
+ new SurveillanceMng.SurveillanceListThread().start();
+ }
+
+ @OnClick(R.id.fragment_supervisory_bottom_visitor_radio_button)
+ public void fragment_supervisory_bottom_visitor_radio_button_click(View view) {
+ fragment_supervisory_bottom_visitor_background.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+ fragment_supervisory_bottom_visit_list_view.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+ fragment_supervisory_bottom_attendance_background.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+ fragment_supervisory_bottom_attendance_list_view.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+ }
+
+ @OnClick(R.id.fragment_supervisory_bottom_attendance_radio_button)
+ public void fragment_supervisory_bottom_attendance_radio_button_click(View view) {
+ fragment_supervisory_bottom_visitor_background.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+ fragment_supervisory_bottom_visit_list_view.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+ fragment_supervisory_bottom_attendance_background.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+ fragment_supervisory_bottom_attendance_list_view.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
}
@Override
@@ -105,25 +240,21 @@
fragment_supervisory_bottom_left_radio_group.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
- fragment_supervisory_bottom_visitor_background.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
- fragment_supervisory_bottom_visit_list_view.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
- fragment_supervisory_bottom_attendance_background.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
- fragment_supervisory_bottom_attendance_list_view.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
- reloadBottomList();
+// fragment_supervisory_bottom_visitor_background.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+// fragment_supervisory_bottom_visit_list_view.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+// fragment_supervisory_bottom_attendance_background.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+// fragment_supervisory_bottom_attendance_list_view.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+// reloadBottomList();
}
});
+ setupUI(getView());
}
@Override
public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible);
if (menuVisible && fragment_supervisory_bottom_visit_list_view != null) {
- //reloadBottomList();
}
- }
-
- private void reloadBottomList() {
- SurveillanceMng.getInstance().findSurveillanceBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
}
}
--
Gitblit v1.8.0