From d628c2bd539b600617d9f11e2f196c2e1bea5db7 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 19 四月 2017 14:38:20 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 7 +++
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml | 4 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 7 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 4 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java | 17 ++++++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 4 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 6 +++
VisitFace/DemoForBsk/app/src/main/res/drawable/u252.png | 0
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml | 10 ++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 4 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 22 +++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java | 6 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 9 ++++
13 files changed, 90 insertions(+), 10 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java
index 534a709..4a6dafd 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java
@@ -72,7 +72,11 @@
}
fragment_visit_left_person_row_name.setText(item.getUsername());
fragment_visit_left_person_row_status.setText("");
- fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath());
+ if (item.getImagePath() != null && !"".equals(item.getImagePath())) {
+ fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath());
+ } else {
+ fragment_visit_left_person_row_photo.setImageResource(R.drawable.u68);
+ }
View fragment_visit_left_line = viewHolder.findViewById(R.id.fragment_visit_left_line);
fragment_visit_left_line.setVisibility(View.VISIBLE);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
index cc3f78c..297e1bf 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -23,8 +23,14 @@
private Device device;
+ public static boolean deviceAvailable = false;
+
public void setDevice(Device device) {
this.device = device;
+ if (device != null && device.getDeviceId() != null && !"".equals(device.getDeviceId())) {
+ deviceAvailable = true;
+ DictionaryMng.getInstance().loadAllDictionaryData();
+ }
}
public Device getDevice() {
@@ -42,7 +48,6 @@
initOkHttpUtils();
application = this;
DeviceMng.getInstance().findDevice();
- DictionaryMng.getInstance().loadAllDictionaryData();
}
private void initOkHttpUtils() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
index 22556c9..8270043 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
@@ -1,5 +1,7 @@
package cn.com.basic.face.fragment;
+import android.graphics.drawable.Animatable;
+import android.net.Uri;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
@@ -7,6 +9,17 @@
import android.widget.TextView;
import com.bsk.zhangbo.demoforbsk.R;
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.controller.ControllerListener;
+import com.facebook.drawee.drawable.ScalingUtils;
+import com.facebook.drawee.generic.GenericDraweeHierarchy;
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.facebook.imagepipeline.image.ImageInfo;
+import com.facebook.imagepipeline.request.ImageRequest;
+import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.lidroid.xutils.view.annotation.event.OnClick;
import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.base.MainActivity;
@@ -15,10 +28,6 @@
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.widget.attendance.AttendanceLeftListView;
import cn.com.basic.face.widget.attendance.AttendanceRightListView;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.lidroid.xutils.view.annotation.event.OnClick;
public class AttendanceFragment extends LeftRightBaseFragment {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
index b4a6e44..da281a6 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.condition.AttendanceDetailQueryCondition;
@@ -24,6 +25,9 @@
}
public void reloadLeftList(String searchText, final int pageNum, final boolean append) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_QUERY);
params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
@@ -67,6 +71,9 @@
}
public void reloadAttendanceDetail(String registerId) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY);
params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, registerId);
x.http().post(params, new BaseCommonCallBack() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 45f8c07..aabc67f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -31,6 +31,9 @@
}
public void add(RequestParams params, final String visitReasonId) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
params.setUri(AppApi.BASE_URL +AppApi.VISIT_ADD);
x.http().post(params, new BaseCommonCallBack() {
@Override
@@ -45,6 +48,9 @@
}
public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText, final int pageNum, final boolean append) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
if (isVisitorList) {
params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
@@ -100,6 +106,9 @@
}
private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
Collections.sort(list, new Comparator<CheckInQueryItem>() {
@Override
public int compare(CheckInQueryItem t1, CheckInQueryItem t2) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
index 4e5da2d..06b5789 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
@@ -1,5 +1,6 @@
package cn.com.basic.face.service;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.dialog.CountryDialog;
import cn.com.basic.face.dialog.SelectDialog;
import cn.com.basic.face.discern.query.condition.DictionaryQueryCondition;
@@ -36,6 +37,9 @@
}
public void loadAllDictionaryData() {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
loadCountries();
loadIdTypeList();
loadGenderList();
@@ -44,6 +48,9 @@
}
public void loadCountries() {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.COUNTRY);
x.http().get(params, new BaseCommonCallBack() {
@@ -75,6 +82,9 @@
}
private void sortCountries(List<Dictionary> countries) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
Collections.sort(countries, new Comparator<Dictionary>() {
@Override
public int compare(Dictionary t1, Dictionary t2) {
@@ -92,6 +102,9 @@
}
public void loadIdTypeList() {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE);
x.http().get(params, new BaseCommonCallBack() {
@@ -102,6 +115,9 @@
}
private void loadGenderList() {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.GENDER);
x.http().get(params, new BaseCommonCallBack() {
@@ -112,6 +128,9 @@
}
public void loadVisitReasonList() {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON);
x.http().get(params, new BaseCommonCallBack() {
@@ -131,6 +150,9 @@
}
private void loadVisitorTypeList() {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISIT_TYPE);
x.http().get(params, new BaseCommonCallBack() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
index 33284a3..d2cfda2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -8,6 +8,7 @@
import java.util.Comparator;
import java.util.List;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.condition.PhoneCallQueryCondition;
@@ -24,6 +25,9 @@
}
public void findPhoneCallLeftList(final boolean isSortByDept, String searchText, final int pageNum, final boolean append) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.PHONE_CALL_QUERY);
params.addBodyParameter(PhoneCallQueryCondition.FieldNames.username, searchText);
x.http().post(params, new BaseCommonCallBack() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index 9318ffd..b86315a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -23,7 +23,9 @@
}
public void add(RequestParams params) {
-
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
try {
File path = BaseApplication.getInstance().getFilesDir();
File f1 = new File(path, "1.txt");
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 3f19cd0..a33156f 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,6 +28,9 @@
}
public void findSurveillanceBottomList(final boolean isVisit) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, "1");
params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "10");
@@ -57,6 +60,9 @@
}
public void addBitmap(final List<Bitmap> bitmapList, byte[] byteArray, int len) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.SURVEILLANCE_UPLOAD);
params.addBodyParameter("base64Photo", Base64.encodeToString(byteArray, 0, len, Base64.DEFAULT));
params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getDevice().getDeviceCompanyId());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
index b129634..ed6a8fb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.condition.VisitQueryCondition;
@@ -21,6 +22,9 @@
}
public void findLeftVisitorList(String searchText, int pageNum, final boolean append) {
+ if (!BaseApplication.deviceAvailable) {
+ return;
+ }
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.VISIT_QUERY);
params.addBodyParameter(VisitQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "7");
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/u252.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/u252.png
new file mode 100644
index 0000000..92e9e50
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/u252.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
index 551d026..2e92375 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
@@ -53,13 +53,19 @@
android:layout_height="350dp"
android:background="@drawable/card_bcg"
android:orientation="vertical"/>
-
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u252"
+ android:layout_marginLeft="45dp"
+ android:layout_gravity="center_vertical"
+ />
<cn.com.basic.face.widget.checkin.CheckInRightIntervieweeCell
android:id="@+id/fragment_check_in_right_interviewee_cell"
android:layout_width="254dp"
android:layout_height="350dp"
android:background="@drawable/card_bcg"
- android:layout_marginLeft="103dp"
+ android:layout_marginLeft="45dp"
android:orientation="vertical"/>
</LinearLayout>
<LinearLayout
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml
index 3884fb8..09cae76 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml
@@ -36,7 +36,9 @@
android:layout_height="36dp"
fresco:roundAsCircle = "true"
android:layout_centerVertical="true"
- android:layout_alignParentRight="true"/>
+ android:layout_alignParentRight="true"
+
+ />
<TextView
android:id="@+id/fragment_visit_left_person_row_status"
android:layout_width="wrap_content"
--
Gitblit v1.8.0