From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析  并在RTSPServer判断

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java |   58 +++++++++++++++++-----------------------------------------
 1 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
index aa3eb52..90ad6ea 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
@@ -2,13 +2,11 @@
 
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.EditText;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -21,15 +19,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.com.basic.face.base.BaseApplication;
 import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.dialog.wheelview.adapter.BaseWheelAdapter;
 import cn.com.basic.face.dialog.wheelview.widget.WheelView;
 import cn.com.basic.face.discern.common.CommonVariables;
-import cn.com.basic.face.discern.query.item.SurveillancePhotoQueryItem;
-import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
-import cn.com.basic.face.fragment.SurveillanceFragment;
 import cn.com.basic.face.util.Constant;
 import cn.com.basic.face.util.OkClickedListener;
+import cn.com.basic.face.util.SurveillanceQueryItemUtil;
+import cn.com.basic.face.util.UnknownSurveillanceQueryItemUtil;
 import cn.com.basic.face.widget.surveilance.SurveillancePhotoSelectListView;
 
 public class SurveillancePhotoDialog extends PopupWindow {
@@ -38,46 +36,24 @@
     @ViewInject(R.id.dialog_surveillance_photo_select_list_view)
     private SurveillancePhotoSelectListView dialog_surveillance_photo_select_list_view;
 
-    private List list = new ArrayList();
-
-    public static List visitorTypeList = new ArrayList();
-    public static List genderList = new ArrayList();
-    public static List idTypeList = new ArrayList();
-    public static List visitReasonList = new ArrayList();
-
-    public static void setVisitorTypeList(List visitorTypeList) {
-        AddDialog.visitorTypeList = visitorTypeList;
-    }
-
-    public static void setGenderList(List genderList) {
-        AddDialog.genderList = genderList;
-    }
-
-    public static void setIdTypeList(List idTypeList) {
-        AddDialog.idTypeList = idTypeList;
-    }
-
-    public SurveillancePhotoDialog(View parentView, int type, OkClickedListener okButtonClickedListener) {
+    public SurveillancePhotoDialog(View parentView, int type, OkClickedListener okButtonClickedListener, long selectedId) {
         this.parentView = parentView;
         View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_surveillance_photo_select,null);
         ViewUtils.inject(this, view);
 
-
-        List<SurveillanceQueryItem> prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList();
-        List<SurveillanceQueryItem> registerList = new ArrayList();
-        for (SurveillanceQueryItem surveillanceQueryItem : prevVisitorList) {
-            if (surveillanceQueryItem.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
-                registerList.add(surveillanceQueryItem);
+        if (BaseApplication.getInstance().networkAvailable()) {
+            if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+                dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+            } else {
+                dialog_surveillance_photo_select_list_view.show(SurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
+            }
+        } else {
+            if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+                dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterVisitorTwoRowsForSelect(selectedId));
+            } else {
+                dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
             }
         }
-
-        for (int i = 0; i < 2; i++) {
-            SurveillanceQueryItem item = new SurveillanceQueryItem();
-            registerList.add(item);
-        }
-        dialog_surveillance_photo_select_list_view.show(registerList);
-
-
         setTitleAndList(type);
         WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
         style.selectedTextColor = Color.parseColor("#11c3e3");
@@ -114,8 +90,8 @@
         this.setHeight(RelativeLayout.LayoutParams.MATCH_PARENT);
         this.setWidth(RelativeLayout.LayoutParams.MATCH_PARENT);
         this.setFocusable(true);
-        this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
-        this.setAnimationStyle(R.style.PopupAnimation);
+        //this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
+        this.setAnimationStyle(R.style.PopupSlideAnimation);
         okButtonClickedListeners.add(okButtonClickedListener);
         this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
     }

--
Gitblit v1.8.0