From 1d67388595f3e843c12ee0cd2f74ba7a2ccc6fda Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 21 七月 2017 14:22:26 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 13 ++----------- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 30 +++++++++++++++++++----------- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 10 ++++++++++ 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java index 3800a79..f3ea663 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java @@ -50,6 +50,9 @@ case Constant.Surveillance.VISIT_CHECK_IN_ITEM_TYPE: checkInCellViewFillData(viewHolder,position); break; + case CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE: + RegisterCellViewFillData(viewHolder,position); + break; } } } @@ -63,6 +66,8 @@ return Constant.Surveillance.CHECK_IN_CELL_VIEW_INDEX; case Constant.Surveillance.VISIT_BLANK_ITEM_TYPE: return Constant.Surveillance.VISIT_BLANK_CELL_VIEW_INDEX; + case CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE: + return Constant.Surveillance.REGISTER_CELL_VIEW_INDEX; } return Constant.Surveillance.VISIT_BLANK_CELL_VIEW_INDEX; } @@ -86,6 +91,11 @@ if (data instanceof SurveillanceQueryItem) { final SurveillanceQueryItem item = (SurveillanceQueryItem)data; + fragment_home_bottom_register_cell_to_register.setVisibility(View.VISIBLE); + if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE) { + fragment_home_bottom_register_cell_to_register.setVisibility(View.GONE); + } + if (item.getImagePath() != null && !item.getImagePath().equals("")) { fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath())); } else { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java index 23f8f25..4990cd4 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java @@ -83,20 +83,11 @@ public boolean networkNotAvailable() { - boolean connected = false; -// ConnectivityManager connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE); -// if(connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED || -// connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) { -// connected = true; -// } -// if (connected) { -// sendOfflineDataToServer(); -// } - return !connected; + return !networkAvailable(); } public boolean networkAvailable() { - boolean connected = false; + boolean connected = true; // ConnectivityManager connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE); // if(connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED || // connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) { 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 0ed7ded..3c5a531 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 @@ -149,6 +149,7 @@ } // outputStream.writeBytes("busybox ifconfig wlan0 hw ether 00:e0:2c:31:1a:ba\n"); RtspFaceNative.setLocalIP(ipAddress); + System.out.println("ipaddr="+ipAddress); } } @@ -181,11 +182,11 @@ } fragment_supervisory_enter_camera.getHolder().addCallback(new SurfaceHolder.Callback() { public void surfaceCreated(SurfaceHolder holder) { - if (useNative) { - RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface()); - RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address()); - RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack"); - } +// if (useNative) { +// RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface()); +// RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address()); +// RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack"); +// } } public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {} @@ -195,14 +196,21 @@ }); fragment_supervisory_exit_camera.getHolder().addCallback(new SurfaceHolder.Callback() { public void surfaceCreated(SurfaceHolder holder) { - if (useNative) { - RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.OUT), fragment_supervisory_exit_camera.getHolder().getSurface()); - RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.OUT), DeviceMng.getInstance().getCamera2Address()); - RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.OUT), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack"); - } +// if (useNative) { +// RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.OUT), fragment_supervisory_exit_camera.getHolder().getSurface()); +// RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.OUT), DeviceMng.getInstance().getCamera2Address()); +// RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.OUT), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack"); +// } } - public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {} + public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { + System.out.print("width="+width+",height="+height); + if (useNative) { + RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface()); + RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address()); + RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack"); + } + } public void surfaceDestroyed(SurfaceHolder holder) { System.out.println("surfaceDestroyed"); } -- Gitblit v1.8.0