From 219d105362ec7782d1cacd5b80cf8f3ab609d985 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 16:54:01 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 9 +++------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml | 6 +++++-
VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml | 5 +++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 18 ++++++++----------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java | 2 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 8 ++++++--
VisitFace/DemoForBsk/app/src/main/jniLibs/armeabi-v7a/librtspface.so | 0
8 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
index 09fca88..1f45137 100644
--- a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
+++ b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
@@ -2,16 +2,17 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.bsk.zhangbo.demoforbsk">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<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.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<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" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
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 1c633ef..de6f27f 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
@@ -164,7 +164,8 @@
fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
if (item.getBitmap() != null) {
- fragment_home_bottom_visitor_cell_photo.setImageBitmap(item.getBitmap());
+ fragment_home_bottom_visitor_cell_photo.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
+ (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp)));
} else {
fragment_home_bottom_visitor_cell_photo.setImageResource(R.drawable.u45);
}
@@ -240,7 +241,10 @@
fragment_home_bottom_attendance_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
if (item.getBitmap() != null) {
- fragment_home_bottom_attendance_cell_photo.setImageBitmap(item.getBitmap());
+ fragment_home_bottom_attendance_cell_photo.setImageBitmap(
+ BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
+ (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp))
+ );
} else {
fragment_home_bottom_attendance_cell_photo.setImageResource(R.drawable.u45);
}
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 e42172e..8b8fa40 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
@@ -124,8 +124,14 @@
MainActivity.getInstance().runOnUiThread(new Runnable() {
public void run() {
try {
- String str = convertStreamToString(MainActivity.getInstance().getAssets().open("license.lic"));
- RtspFaceNative.dbgSetStfaceLicense(str);
+// File file2 = MainActivity.getInstance().getExternalFilesDir(null);
+// File[] files = file2.listFiles();
+// for (File file : files) {
+// System.out.println(file.getAbsolutePath());
+// }
+// String s1 = getStringFromFile("/sdcard/license.lic");
+// String str = convertStreamToString(MainActivity.getInstance().getAssets().open("license.lic"));
+// RtspFaceNative.dbgSetStfaceLicense(str);
} catch (Exception e) {
e.printStackTrace();
}
@@ -178,7 +184,6 @@
}
}
}).start();
- reloadBottomList();
new SurveillanceMng.SurveillanceListThread().start();
}
@@ -188,7 +193,6 @@
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();
}
@OnClick(R.id.fragment_supervisory_bottom_attendance_radio_button)
@@ -197,7 +201,6 @@
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();
}
@Override
@@ -218,12 +221,7 @@
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());
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index 139dd6c..d676d8c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -28,12 +28,6 @@
return instance;
}
- public void findSurveillanceBottomList(final boolean isVisit) {
- if (!BaseApplication.deviceAvailable) {
- return;
- }
- }
-
public static class SurveillanceListThread extends Thread {
@Override
public void run() {
@@ -99,6 +93,9 @@
if (type == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE
|| type == CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE
) {
+ if (prevVisitorList.size() > 3 ) {
+ item.setRegisterOrCheckIn(CommonVariables.Surveillance.VISIT_CHECK_IN_ITEM_TYPE);
+ }
item.setCreateTime(new Date());
newVisitorList.add(0, item);
if (i < bitmapList.size()) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java
index 81d61a6..ce5942a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java
@@ -32,7 +32,7 @@
outRect.left = WindowsUtil.dip2px(MainActivity.getInstance(), 14);
}
if (parent.getChildLayoutPosition(view) % 2 == 0) {
- outRect.bottom = WindowsUtil.dip2px(MainActivity.getInstance(), 7);
+ outRect.bottom = WindowsUtil.dip2px(MainActivity.getInstance(), 2);
}
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/jniLibs/armeabi-v7a/librtspface.so b/VisitFace/DemoForBsk/app/src/main/jniLibs/armeabi-v7a/librtspface.so
index ff1f3d5..59915f5 100644
--- a/VisitFace/DemoForBsk/app/src/main/jniLibs/armeabi-v7a/librtspface.so
+++ b/VisitFace/DemoForBsk/app/src/main/jniLibs/armeabi-v7a/librtspface.so
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
index 5417c2d..dc713ba 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
@@ -21,7 +21,11 @@
android:layout_width="match_parent"
android:layout_height="@dimen/h20dp"
android:background="#40000000"
- android:layout_alignParentBottom="true">
+ android:layout_alignParentBottom="true"
+ android:layout_marginLeft="@dimen/w2dp"
+ android:layout_marginRight="@dimen/w2dp"
+ android:layout_marginBottom="@dimen/w2dp"
+ >
<TextView
android:id="@+id/fragment_home_bottom_attendance_cell_name"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml
index 6511701..5c6339e 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml
@@ -10,7 +10,7 @@
android:layout_height="@dimen/h127dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
- android:paddingTop="@dimen/h15dp"
+ android:paddingTop="@dimen/h5dp"
android:paddingRight="@dimen/w5dp"
android:paddingLeft="@dimen/w5dp"
/>
--
Gitblit v1.8.0