From 3faa0f1156937cc0f19e3893bb04df2b882ea41d Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 七月 2017 11:33:56 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 facef40..3800a79 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
@@ -16,6 +16,7 @@
import java.util.List;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
@@ -282,7 +283,9 @@
layoutParams.height = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h127dp);
layoutParams.width = (int)MainActivity.getInstance().getResources().getDimension(R.dimen.h122dp);
mLayout.setLayoutParams(layoutParams);
- if (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+ SurveillanceQueryItem item1 = ((SurveillanceQueryItem)getList().get(position));
+ if (!(item1.getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE
+ || item1.getRegisterOrCheckIn() == CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE)) {
return;
}
@@ -305,7 +308,8 @@
VisitorRegisterFragment.getInstance().set_fragment_visitor_register_surveillance_photo(item);
VisitorRegisterFragment.selectedSurveillancePhotoId = item.getIdForSelect();
} else {
- //鑰冨嫟
+ AttenderRegisterFragment.getInstance().set_fragment_attender_register_surveillance_photo(item);
+ AttenderRegisterFragment.getInstance().selectedSurveillancePhotoId = item.getIdForSelect();
}
}
if (selectPhotoOrUploadPhoto == CommonVariables.SelectPhotoType.UPLOAD_PHOTO) {
@@ -313,7 +317,8 @@
VisitorRegisterFragment.getInstance().set_fragment_visitor_register_upload_custom_photo(item);
VisitorRegisterFragment.selectedCustomPhotoId = item.getIdForSelect();
} else {
- //鑰冨嫟
+ AttenderRegisterFragment.getInstance().set_fragment_attender_register_upload_custom_photo(item);
+ AttenderRegisterFragment.selectedCustomPhotoId = item.getIdForSelect();
}
}
for (SurveillanceQueryItem queryItem : (List<SurveillanceQueryItem>)getList()) {
@@ -324,7 +329,7 @@
}
});
- if (item.getImagePath() != null && !item.getImagePath().equals("")) {
+ if (item.getImagePath() != null && !item.getImagePath().equals("") && BaseApplication.getInstance().networkAvailable()) {
fragment_surveillance_photo_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
} else {
if (item.getBitmap() != null) {
@@ -339,7 +344,9 @@
@Override
public int getRecycleViewItemType(int position) {
- if (((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() != Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
+ if (!(((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() == Constant.Surveillance.VISIT_REGISTER_ITEM_TYPE
+ || ((SurveillanceQueryItem)getList().get(position)).getRegisterOrCheckIn() == CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE
+ )) {
return 1;
}
return 0;
--
Gitblit v1.8.0