From 34c342a8401a76636a3434d3df2d345cae6e88a7 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 15:16:29 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java | 36 ++++++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java | 36 ++++++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 12 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java | 15 +--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java | 16 +--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java | 35 +++++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java | 35 +++++++-
7 files changed, 150 insertions(+), 35 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
index 4360998..39a597c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
@@ -53,6 +53,10 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import cn.com.basic.face.dialog.AttenderRegisterSelectPhotoDialog;
+import cn.com.basic.face.dialog.AttenderRegisterUploadPhotoDialog;
+import cn.com.basic.face.dialog.VisitorRegisterSelectPhotoDialog;
+import cn.com.basic.face.dialog.VisitorRegisterUploadPhotoDialog;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.fragment.AttendanceFragment;
@@ -449,6 +453,10 @@
String templatePath = this.getApplicationInfo().dataDir + "/" + database;
FSDK.SaveTrackerMemoryToFile(mDraw.mTracker, templatePath);
}
+ VisitorRegisterUploadPhotoDialog.getInstance().hide();
+ VisitorRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterUploadPhotoDialog.getInstance().hide();
}
@Override
@@ -511,6 +519,10 @@
@Override
protected void onStop() {
super.onStop();
+ VisitorRegisterUploadPhotoDialog.getInstance().hide();
+ VisitorRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterSelectPhotoDialog.getInstance().hide();
+ AttenderRegisterUploadPhotoDialog.getInstance().hide();
//Config.sqlMap.getDb().close();
// db.close();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java
index 04a23ac..7633ce9 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterSelectPhotoDialog.java
@@ -24,6 +24,7 @@
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.fragment.AttenderRegisterFragment;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.util.SurveillanceQueryItemUtil;
@@ -39,8 +40,13 @@
public static long selectedId = -1;
- public AttenderRegisterSelectPhotoDialog(View parentView, int type, OkClickedListener okButtonClickedListener, long selectedId) {
- this.parentView = parentView;
+ private static AttenderRegisterSelectPhotoDialog instance = new AttenderRegisterSelectPhotoDialog();
+ public static AttenderRegisterSelectPhotoDialog getInstance() {
+ return instance;
+ }
+
+ public AttenderRegisterSelectPhotoDialog() {
+ this.parentView = AttenderRegisterFragment.getInstance().get_fragment_attender_register_linear_layout();
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_attender_register_select_photo_select,null);
ViewUtils.inject(this, view);
@@ -57,7 +63,7 @@
dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
}
}
- setTitleAndList(type);
+ setTitleAndList(Constant.DialogSelectType.ID_TYPE);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
style.textColor = Color.parseColor("#bcc6cf");
@@ -95,7 +101,12 @@
this.setFocusable(true);
//this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
this.setAnimationStyle(R.style.PopupSlideAnimation);
- okButtonClickedListeners.add(okButtonClickedListener);
+ okButtonClickedListeners.add(new OkClickedListener() {
+ @Override
+ public void onSelected(String value) {
+
+ }
+ });
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
@@ -133,6 +144,22 @@
AddDialog.visitReasonList = visitReasonList;
}
+ public void show() {
+ if (this.isShowing()) {
+
+ } else {
+ //this.showAsDropDown();
+ this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
+ }
+ }
+
+ public void hide() {
+ if (this.isShowing()) {
+ dismiss();
+ } else {
+ }
+ }
+
public static class WheelAdapter extends BaseWheelAdapter<String> {
private Context mContext;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java
index 655b6a2..b3764c4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/AttenderRegisterUploadPhotoDialog.java
@@ -24,6 +24,7 @@
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.fragment.AttenderRegisterFragment;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.util.SurveillanceQueryItemUtil;
@@ -39,8 +40,13 @@
public static long selectedId = -1;
- public AttenderRegisterUploadPhotoDialog(View parentView, int type, OkClickedListener okButtonClickedListener, long selectedId) {
- this.parentView = parentView;
+ public static AttenderRegisterUploadPhotoDialog instance = new AttenderRegisterUploadPhotoDialog();
+ public static AttenderRegisterUploadPhotoDialog getInstance() {
+ return instance;
+ }
+
+ public AttenderRegisterUploadPhotoDialog() {
+ this.parentView = AttenderRegisterFragment.getInstance().get_fragment_attender_register_linear_layout();
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_attender_register_upload_photo_select,null);
ViewUtils.inject(this, view);
@@ -57,7 +63,7 @@
dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
}
}
- setTitleAndList(type);
+ setTitleAndList(Constant.DialogSelectType.ID_TYPE);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
style.textColor = Color.parseColor("#bcc6cf");
@@ -95,7 +101,12 @@
this.setFocusable(true);
//this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
this.setAnimationStyle(R.style.PopupSlideAnimation);
- okButtonClickedListeners.add(okButtonClickedListener);
+ okButtonClickedListeners.add(new OkClickedListener() {
+ @Override
+ public void onSelected(String value) {
+
+ }
+ });
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
@@ -133,6 +144,13 @@
AddDialog.visitReasonList = visitReasonList;
}
+ public void hide() {
+ if (this.isShowing()) {
+ dismiss();
+ } else {
+ }
+ }
+
public static class WheelAdapter extends BaseWheelAdapter<String> {
private Context mContext;
@@ -161,4 +179,14 @@
}
}
+
+ public void show() {
+ if (this.isShowing()) {
+
+ } else {
+ //this.showAsDropDown();
+ this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
+ }
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java
index ce6cfcc..aaf129c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterSelectPhotoDialog.java
@@ -24,6 +24,7 @@
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.fragment.VisitorRegisterFragment;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.util.SurveillanceQueryItemUtil;
@@ -39,8 +40,13 @@
public static long selectedId = -1;
- public VisitorRegisterSelectPhotoDialog(View parentView, int type, OkClickedListener okButtonClickedListener, long selectedId) {
- this.parentView = parentView;
+ public static VisitorRegisterSelectPhotoDialog instance = new VisitorRegisterSelectPhotoDialog();
+ public static VisitorRegisterSelectPhotoDialog getInstance() {
+ return instance;
+ }
+
+ public VisitorRegisterSelectPhotoDialog() {
+ this.parentView = VisitorRegisterFragment.getInstance().get_fragment_visitor_register_linear_layout();
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_visitor_register_select_photo_select,null);
ViewUtils.inject(this, view);
@@ -57,7 +63,7 @@
dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
}
}
- setTitleAndList(type);
+ setTitleAndList(Constant.DialogSelectType.ID_TYPE);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
style.textColor = Color.parseColor("#bcc6cf");
@@ -95,7 +101,12 @@
this.setFocusable(true);
//this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
this.setAnimationStyle(R.style.PopupSlideAnimation);
- okButtonClickedListeners.add(okButtonClickedListener);
+ okButtonClickedListeners.add(new OkClickedListener() {
+ @Override
+ public void onSelected(String value) {
+
+ }
+ });
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
@@ -133,6 +144,22 @@
AddDialog.visitReasonList = visitReasonList;
}
+ public void show() {
+ if (this.isShowing()) {
+
+ } else {
+ //this.showAsDropDown();
+ this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
+ }
+ }
+
+ public void hide() {
+ if (this.isShowing()) {
+ dismiss();
+ } else {
+ }
+ }
+
public static class WheelAdapter extends BaseWheelAdapter<String> {
private Context mContext;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java
index c79064f..de13cc5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitorRegisterUploadPhotoDialog.java
@@ -24,6 +24,7 @@
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.fragment.VisitorRegisterFragment;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.util.SurveillanceQueryItemUtil;
@@ -39,8 +40,13 @@
public static long selectedId = -1;
- public VisitorRegisterUploadPhotoDialog(View parentView, int type, OkClickedListener okButtonClickedListener, long selectedId) {
- this.parentView = parentView;
+ private static VisitorRegisterUploadPhotoDialog instance = new VisitorRegisterUploadPhotoDialog();
+ public static VisitorRegisterUploadPhotoDialog getInstance() {
+ return instance;
+ }
+
+ public VisitorRegisterUploadPhotoDialog() {
+ this.parentView = VisitorRegisterFragment.getInstance().get_fragment_visitor_register_linear_layout();
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_visitor_register_upload_photo_select,null);
ViewUtils.inject(this, view);
@@ -57,7 +63,7 @@
dialog_surveillance_photo_select_list_view.show(UnknownSurveillanceQueryItemUtil.getInstance().getAllUnregisterAttenderTwoRowsForSelect(selectedId));
}
}
- setTitleAndList(type);
+ setTitleAndList(Constant.DialogSelectType.ID_TYPE);
WheelView.WheelViewStyle style = new WheelView.WheelViewStyle();
style.selectedTextColor = Color.parseColor("#11c3e3");
style.textColor = Color.parseColor("#bcc6cf");
@@ -95,7 +101,12 @@
this.setFocusable(true);
//this.setBackgroundDrawable(new ColorDrawable(0x7f000000));
this.setAnimationStyle(R.style.PopupSlideAnimation);
- okButtonClickedListeners.add(okButtonClickedListener);
+ okButtonClickedListeners.add(new OkClickedListener() {
+ @Override
+ public void onSelected(String value) {
+
+ }
+ });
this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
}
@@ -133,6 +144,13 @@
AddDialog.visitReasonList = visitReasonList;
}
+ public void hide() {
+ if (this.isShowing()) {
+ dismiss();
+ } else {
+ }
+ }
+
public static class WheelAdapter extends BaseWheelAdapter<String> {
private Context mContext;
@@ -161,4 +179,14 @@
}
}
+
+ public void show() {
+ if (this.isShowing()) {
+
+ } else {
+ //this.showAsDropDown();
+ this.showAtLocation(parentView, Gravity.BOTTOM,0,330);
+ }
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
index f219467..f57d577 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
@@ -397,20 +397,17 @@
@OnClick(R.id.fragment_attender_register_surveillance_photo)
public void fragment_attender_register_surveillance_photo_click(View view) {
- SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.SELECT_PHOTO;
- new AttenderRegisterSelectPhotoDialog(fragment_attender_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
- public void onSelected(String value) {
- }
- }, selectedSurveillancePhotoId);
+ AttenderRegisterSelectPhotoDialog.getInstance().show();
+ }
+
+ public FrameLayout get_fragment_attender_register_linear_layout() {
+ return fragment_attender_register_linear_layout;
}
@OnClick(R.id.fragment_attender_register_upload_custom_photo)
public void fragment_attender_register_upload_custom_photo_click(View view) {
SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.UPLOAD_PHOTO;
- new AttenderRegisterUploadPhotoDialog(fragment_attender_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
- public void onSelected(String value) {
- }
- }, selectedCustomPhotoId);
+ AttenderRegisterUploadPhotoDialog.getInstance().show();
}
@OnClick(R.id.fragment_attender_register_id_card_photo)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
index 1c34b58..3180abd 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
@@ -506,20 +506,16 @@
@OnClick(R.id.fragment_visitor_register_surveillance_photo)
public void fragment_visitor_register_surveillance_photo_click(View view) {
- SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.SELECT_PHOTO;
- new VisitorRegisterSelectPhotoDialog(fragment_visitor_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
- public void onSelected(String value) {
- }
- }, selectedSurveillancePhotoId);
+ VisitorRegisterSelectPhotoDialog.getInstance().show();
+ }
+
+ public FrameLayout get_fragment_visitor_register_linear_layout() {
+ return fragment_visitor_register_linear_layout;
}
@OnClick(R.id.fragment_visitor_register_upload_custom_photo)
public void fragment_visitor_register_upload_custom_photo_click(View view) {
- SurveillanceFragment.SurveillancePhotoSelectListViewAdapter.selectPhotoOrUploadPhoto = CommonVariables.SelectPhotoType.UPLOAD_PHOTO;
- new VisitorRegisterUploadPhotoDialog(fragment_visitor_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() {
- public void onSelected(String value) {
- }
- }, selectedCustomPhotoId);
+ VisitorRegisterUploadPhotoDialog.getInstance().show();
}
@OnClick(R.id.fragment_visitor_register_id_card_photo)
--
Gitblit v1.8.0