VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
@@ -6,8 +6,10 @@ <uses-feature android:glEsVersion="0x00020000" /> <!-- INTERNET is needed to use a URI-based media player, depending on the URI --> <uses-permission android:name="android.permission.INTERNET"></uses-permission> <uses-permission android:name="android.permission.CAMERA"></uses-permission> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <application android:name="cn.com.basic.face.base.BaseApplication" @@ -29,6 +31,6 @@ <activity android:name="cn.com.basic.face.base.PictureTaker" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:screenOrientation="landscape"></activity> android:screenOrientation="landscape"/> </application> </manifest> VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -16,6 +16,7 @@ import java.util.List; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.dialog.SurveillancePhotoDialog; import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.query.item.CheckInQueryItem; import cn.com.basic.face.discern.query.item.SurveillanceQueryItem; @@ -98,6 +99,7 @@ if(item.getBitmap() != null) { RegisterFragment.getInstance().setChoosePhoto(item.getBitmap()); RegisterFragment.getInstance().setSurveillanceQueryItem_selectPhoto(item); RegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect(); } } }); @@ -294,9 +296,11 @@ public void onClick(View v) { if (selectPhotoOrUploadPhoto == CommonVariables.SelectPhotoType.SELECT_PHOTO) { RegisterFragment.getInstance().set_fragment_register_surveillance_photo(item); RegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect(); } if (selectPhotoOrUploadPhoto == CommonVariables.SelectPhotoType.UPLOAD_PHOTO) { RegisterFragment.getInstance().set_fragment_register_upload_custom_photo(item); RegisterFragment.selectedCustomPhotoId = item.getIdForSelect(); } for (SurveillanceQueryItem queryItem : (List<SurveillanceQueryItem>)getList()) { queryItem.setSurveillancePhotoSelected(false); VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SurveillancePhotoDialog.java
@@ -58,12 +58,12 @@ 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); dialog_surveillance_photo_select_list_view.show(SurveillanceMng.getInstance().getSurveillancePhotoList()); dialog_surveillance_photo_select_list_view.show(SurveillanceMng.getInstance().getSurveillancePhotoList(selectedId)); setTitleAndList(type); WheelView.WheelViewStyle style = new WheelView.WheelViewStyle(); VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SurveillanceQueryItem.java
@@ -49,6 +49,18 @@ private Date createTime; public static long initialSelectId = 1; private long idForSelect; public SurveillanceQueryItem() { if (initialSelectId > 10000) { initialSelectId = 1; } idForSelect = initialSelectId; initialSelectId++; } /** * Get 人员主键 */ @@ -240,4 +252,12 @@ this.createTime = createTime; } public long getIdForSelect() { return idForSelect; } public void setIdForSelect(long idForSelect) { this.idForSelect = idForSelect; } } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -106,6 +106,9 @@ private SurveillanceQueryItem surveillanceQueryItem_selectPhoto; private SurveillanceQueryItem surveillanceQueryItem_uploadPhoto; public static long selectedSurveillancePhotoId = -1; public static long selectedCustomPhotoId = -1; private static RegisterFragment instance = new RegisterFragment(); public static RegisterFragment getInstance() { @@ -337,6 +340,8 @@ } public void resetForm() { selectedCustomPhotoId = -1; selectedSurveillancePhotoId = -1; fragment_register_name.setValue("徐修溪"+Math.random()); fragment_register_phone.setValue("13691348767"); fragment_register_gender.setValue("男"); @@ -431,7 +436,7 @@ new SurveillancePhotoDialog(fragment_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() { public void onSelected(String value) { } }); }, selectedSurveillancePhotoId); } @OnClick(R.id.fragment_register_upload_custom_photo) @@ -440,7 +445,7 @@ new SurveillancePhotoDialog(fragment_register_linear_layout, Constant.DialogSelectType.ID_TYPE, new OkClickedListener() { public void onSelected(String value) { } }); }, selectedCustomPhotoId); } @OnClick(R.id.fragment_register_id_card_photo) VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -1,9 +1,10 @@ package cn.com.basic.face.fragment; import android.graphics.ImageFormat; import android.media.ImageReader; import android.content.Context; import android.net.wifi.WifiManager; import android.os.Build; import android.os.Bundle; import android.text.format.Formatter; import android.view.SurfaceView; import android.view.View; import android.widget.RadioButton; @@ -26,7 +27,6 @@ import com.lidroid.xutils.view.annotation.event.OnClick; import java.text.SimpleDateFormat; import java.util.Date; public class SurveillanceFragment extends BaseFragment { @@ -79,8 +79,12 @@ System.loadLibrary("rtspface"); RtspFaceNative.init(); // RtspFaceNative.setLocalIP("192.168.1.10"); RtspFaceNative.setLocalIP("192.168.1.106");//自己手机ip // RtspFaceNative.setLocalIP("192.168.1.106");//自己手机ip // RtspFaceNative.setLocalIP("192.168.1.203"); // RtspFaceNative.setLocalIP("192.168.1.205"); WifiManager wm = (WifiManager) MainActivity.getInstance().getSystemService(Context.WIFI_SERVICE); String ip = Formatter.formatIpAddress(wm.getConnectionInfo().getIpAddress()); RtspFaceNative.setLocalIP(ip); } }
@@ -141,23 +141,27 @@ }); } public List getSurveillancePhotoList() { public List getSurveillancePhotoList(long selectedId) { List<SurveillanceQueryItem> prevVisitorList = SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().getPrevList(); List<SurveillanceQueryItem> registerList = new ArrayList(); int n = 9; int countPerRow = 9; for (SurveillanceQueryItem surveillanceQueryItem : prevVisitorList) { if (surveillanceQueryItem.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) { if (registerList.size() > n*2) { if (registerList.size() > countPerRow*2) { break; } if (surveillanceQueryItem.getIdForSelect() == selectedId) { surveillanceQueryItem.setSurveillancePhotoSelected(true); } else { surveillanceQueryItem.setSurveillancePhotoSelected(false); } registerList.add(surveillanceQueryItem); } } SurveillanceQueryItem item; List items = new ArrayList(); int m = 0; for (int i = 0; i < n*2; i++) { int m = 0, n = 0; for (int i = 0; i < countPerRow*2; i++) { if (i % 2 == 0) { if (m < registerList.size()) { item = registerList.get(m); @@ -166,8 +170,8 @@ item = getBlankItem(); } } else { if (n < registerList.size()) { item = registerList.get(n); if (n < registerList.size() - countPerRow) { item = registerList.get(countPerRow+n); n++; } else { item = getBlankItem(); VisitFace/DemoForBsk/app/src/main/res/drawable/rounded_corners.xml
New file @@ -0,0 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <corners android:radius="4dp" /> <padding android:top="2dp" android:left="2dp" android:bottom="2dp" android:right="2dp" /> </shape> VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_photo_cell.xml
@@ -18,7 +18,7 @@ fresco:placeholderImageScaleType="fitXY" android:paddingTop="@dimen/h5dp" android:paddingBottom="@dimen/h5dp" android:background="@drawable/normal_choose_bcg" android:background="@drawable/rounded_corners" /> <ImageView android:id="@+id/fragment_surveillance_photo_cell_select" @@ -31,6 +31,4 @@ android:layout_marginStart="@dimen/w50dp" /> </RelativeLayout> </RelativeLayout>
