From 48d61aafa2551ae2ee0a9484b590d64e10baeae3 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 07 四月 2017 16:04:43 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 4 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 5 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java | 11 --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java | 11 --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 16 +---- 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 | 5 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 8 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java | 3 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 28 +++++---- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 4 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java | 3 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 6 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 10 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitFragment.java | 4 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 5 - 21 files changed, 50 insertions(+), 100 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java index 9511671..f1a211d 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java @@ -1,7 +1,6 @@ package cn.com.basic.face.adapter; import android.view.View; -import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.RelativeLayout; import android.widget.TextView; @@ -78,7 +77,7 @@ fragment_visit_left_person_row_name.setText(item.getName()); //fragment_visit_left_person_row_status.setText(item.getStatus()); - fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGEURL_BASE+item.getImagePath()); + fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); View fragment_visit_left_line = viewHolder.findViewById(R.id.fragment_attendance_left_line); fragment_visit_left_line.setVisibility(View.VISIBLE); diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java index 5c059b5..4281f83 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInFragment.java @@ -1,6 +1,5 @@ package cn.com.basic.face.adapter; -import android.content.Context; import android.net.Uri; import android.view.View; import android.widget.LinearLayout; @@ -12,14 +11,8 @@ import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder; import com.facebook.drawee.view.SimpleDraweeView; -import java.util.List; - -import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.query.item.CheckInQueryItem; -import cn.com.basic.face.service.vo.*; -import cn.com.basic.face.service.vo.PhoneCallFragment; import cn.com.basic.face.util.AppApi; -import cn.com.basic.face.util.Constant; public class CheckInFragment { @@ -62,7 +55,7 @@ if (data instanceof CheckInQueryItem) { CheckInQueryItem item = (CheckInQueryItem) data; fragment_check_in_left_visitor_row_name.setText(item.getName()); - fragment_check_in_left_visitor_row_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); + fragment_check_in_left_visitor_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); } } @@ -99,7 +92,7 @@ CheckInQueryItem item = (CheckInQueryItem) data; fragment_check_in_left_interviewee_row_name.setText(item.getName()); fragment_check_in_left_interviewee_row_dept.setText(item.getDeptName()); - fragment_check_in_left_interviewee_row_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); + fragment_check_in_left_interviewee_row_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); } viewHolder.findViewById(R.id.fragment_check_in_left_interviewee_row_relativeLayout).setOnClickListener(new View.OnClickListener(){ diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java index 698df79..a520dac 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java @@ -1,22 +1,13 @@ package cn.com.basic.face.adapter; -import android.content.Context; import android.view.View; -import android.widget.ArrayAdapter; import android.widget.RelativeLayout; -import android.widget.SectionIndexer; import android.widget.TextView; import com.bsk.zhangbo.demoforbsk.R; import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter; import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder; import com.facebook.drawee.view.SimpleDraweeView; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Set; import cn.com.basic.face.base.MainActivity; @@ -54,7 +45,7 @@ fragment_phone_call_left_row_name.setText(item.getName()); fragment_phone_call_left_row_dept.setText(item.getDeptName()); SimpleDraweeView fragment_phone_call_left_row_photo = viewHolder.findViewById(R.id.fragment_phone_call_left_row_photo); - fragment_phone_call_left_row_photo.setImageURI(AppApi.IMAGEURL_BASE+item.getImagePath()); + fragment_phone_call_left_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); RelativeLayout fragment_phone_call_left_row_relativeLayout = viewHolder.findViewById(R.id.fragment_phone_call_left_row_relativeLayout); fragment_phone_call_left_row_relativeLayout.setOnClickListener(new View.OnClickListener(){ @Override 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 8edf4d2..eb9f265 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 @@ -78,7 +78,7 @@ if (data instanceof SurveillanceQueryItem) { final SurveillanceQueryItem item = (SurveillanceQueryItem)data; - fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE +item.getImagePath())); + fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath())); fragment_home_bottom_register_cell_to_register.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View view) { @@ -141,7 +141,7 @@ if (data instanceof SurveillanceQueryItem) { final SurveillanceQueryItem item = (SurveillanceQueryItem)data; fragment_home_bottom_visitor_cell_name.setText(item.getName()); - fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE +item.getImagePath())); + fragment_home_bottom_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath())); if (1==1) { fragment_home_bottom_visitor_cell_status.setBackground(context.getDrawable(R.drawable.rectangle_textview)); 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 8fbd8ce..5fe59c5 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 @@ -1,8 +1,6 @@ package cn.com.basic.face.adapter; import android.view.View; -import android.widget.CheckBox; -import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.RelativeLayout; import android.widget.TextView; @@ -56,7 +54,7 @@ } fragment_visit_left_person_row_name.setText(item.getName()); fragment_visit_left_person_row_status.setText(item.getStatus()); - fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGEURL_BASE+item.getImagePath()); + fragment_visit_left_person_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); 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/fragment/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java index bc17012..cf43420 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,37 +1,24 @@ package cn.com.basic.face.fragment; -import android.support.v7.widget.LinearLayoutManager; import android.text.Editable; import android.text.TextWatcher; -import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; import android.widget.TextView; -import android.widget.Toast; import com.bsk.zhangbo.demoforbsk.R; -import cn.com.basic.face.adapter.AttendanceFragment.AttendanceRightAdapter; -import cn.com.basic.face.adapter.VisitFragment.VisitLeftAdapter; + import cn.com.basic.face.base.LeftRightBaseFragment; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.query.item.AttendanceQueryItem; import cn.com.basic.face.service.AttendanceMng; -import cn.com.basic.face.service.vo.*; -import cn.com.basic.face.service.vo.CheckInFragment; -import cn.com.basic.face.service.vo.VisitFragment; 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.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder; -import com.camnter.easyrecyclerview.widget.EasyRecyclerView; import com.facebook.drawee.view.SimpleDraweeView; -import com.lidroid.xutils.ViewUtils; import com.lidroid.xutils.view.annotation.ViewInject; import com.lidroid.xutils.view.annotation.event.OnClick; - -import java.util.ArrayList; -import java.util.List; public class AttendanceFragment extends LeftRightBaseFragment { @@ -110,7 +97,7 @@ fragment_attendance_right_gender.setText(item.getGender()); fragment_attendance_right_post.setText(item.getPostName()); fragment_attendance_right_dept.setText(item.getDeptName()); - fragment_attendance_right_photo.setImageURI(AppApi.IMAGEURL_BASE+item.getImagePath()); + fragment_attendance_right_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java index b8a298c..567f1d0 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java @@ -195,7 +195,7 @@ public void onClick(View v) {} public void setRegisterInfo(CheckInQueryItem item) { - fragment_register_choose_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); + fragment_register_choose_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); } } 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 969ebae..01b05da 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 @@ -12,7 +12,7 @@ import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative; -import cn.com.basic.face.service.SurvalanceMng; +import cn.com.basic.face.service.SurveillanceMng; import cn.com.basic.face.widget.surveilance.SurveillanceBottomListView; import com.lidroid.xutils.view.annotation.ViewInject; @@ -109,7 +109,7 @@ } private void reloadBottomList() { - SurvalanceMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked()); + SurveillanceMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked()); } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java index 511fb97..099fc09 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java @@ -1,17 +1,13 @@ package cn.com.basic.face.fragment; -import android.support.v7.widget.LinearLayoutManager; import android.text.Editable; import android.text.TextWatcher; -import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; -import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; import com.bsk.zhangbo.demoforbsk.R; -import cn.com.basic.face.adapter.VisitFragment.VisitLeftAdapter; + import cn.com.basic.face.base.LeftRightBaseFragment; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.query.item.VisitQueryItem; @@ -19,15 +15,9 @@ import cn.com.basic.face.util.AppApi; import cn.com.basic.face.widget.visit.VisitLeftListView; -import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder; -import com.camnter.easyrecyclerview.widget.EasyRecyclerView; import com.facebook.drawee.view.SimpleDraweeView; -import com.lidroid.xutils.ViewUtils; import com.lidroid.xutils.view.annotation.ViewInject; import com.lidroid.xutils.view.annotation.event.OnClick; - -import java.util.ArrayList; -import java.util.List; public class VisitFragment extends LeftRightBaseFragment { private static VisitFragment instance = new VisitFragment(); @@ -121,7 +111,7 @@ fragment_visit_right_status.setText(item.getStatus()); fragment_visit_right_visit_time.setText(item.getStartTime()); fragment_visit_right_exit_time.setText(item.getLastTime()); - fragment_visit_right_head_photo.setImageURI(AppApi.IMAGEURL_BASE+item.getImagePath()); - fragment_visit_right_card_photo.setImageURI(AppApi.IMAGEURL_BASE+item.getImagePath()); + fragment_visit_right_head_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); + fragment_visit_right_card_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getImagePath()); } } 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 cc6b3ad..6a9fa0e 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 @@ -10,7 +10,6 @@ import cn.com.basic.face.discern.query.condition.VisitorQueryCondition; import cn.com.basic.face.discern.query.item.AttendanceQueryItem; import cn.com.basic.face.fragment.AttendanceFragment; -import cn.com.basic.face.service.vo.CheckInFragment; import cn.com.basic.face.service.vo.VisitFragment; import cn.com.basic.face.util.AppApi; @@ -23,7 +22,7 @@ public void reloadRightList() { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY); x.http().post(params, new BaseCommonCallBack() { public void success() { List<VisitFragment.VisitQueryItem> list = getList(VisitFragment.VisitQueryItem.class); @@ -43,7 +42,7 @@ } public void reloadLeftList(String searchText) { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.ATTENDANCE_QUERY); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_QUERY); params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText); x.http().post(params, new BaseCommonCallBack() { public void success() { 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 3a893c4..bc40c69 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 @@ -4,7 +4,6 @@ import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.fragment.CheckInFragment; -import cn.com.basic.face.service.vo.PhoneCallFragment; import cn.com.basic.face.util.AppApi; import org.xutils.http.RequestParams; @@ -29,7 +28,7 @@ } public void add(RequestParams params) { - params.setUri(AppApi.BASEURL+AppApi.CHECK_IN_ADD); + params.setUri(AppApi.BASE_URL +AppApi.CHECK_IN_ADD); x.http().post(params, new BaseCommonCallBack() { @Override public void success() { @@ -39,7 +38,7 @@ } public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText) { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY); if (isVisitorList) { params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); } else { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java index 54e9776..dba3afd 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java @@ -24,7 +24,7 @@ public void findPlace() { try { - RequestParams params = new RequestParams(AppApi.BASEURL + AppApi.PLACE_LIST); + RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY); params.addBodyParameter(Place.FieldNames.authorizationId, authorationId); x.http().post(params, new BaseCommonCallBack() { public void success() { 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 da2347a..1b3da89 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 @@ -40,7 +40,7 @@ } public void loadCountries() { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.DICTIONARY_TYPE_LIST); params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.COUNTRY); x.http().get(params, new BaseCommonCallBack() { public void success() { @@ -67,7 +67,7 @@ } public void loadIdTypeList() { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.DICTIONARY_TYPE_LIST); params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE); x.http().get(params, new BaseCommonCallBack() { public void success() { @@ -77,7 +77,7 @@ } private void loadGenderList() { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.DICTIONARY_TYPE_LIST); params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.GENDER); x.http().get(params, new BaseCommonCallBack() { public void success() { @@ -87,7 +87,7 @@ } private void loadVisitReasonList() { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.DICTIONARY_TYPE_LIST); params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON); x.http().get(params, new BaseCommonCallBack() { public void success() { @@ -106,7 +106,7 @@ } private void loadVisitorTypeList() { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_TYPE_LIST); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.VISITOR_TYPE_LIST); x.http().get(params, new BaseCommonCallBack() { public void success() { List<String> mVisitorTypeList = new ArrayList<String>(); 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 2fdb638..2381f5a 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,12 +8,9 @@ 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.query.condition.PhoneCallQueryCondition; -import cn.com.basic.face.discern.query.condition.VisitorQueryCondition; import cn.com.basic.face.discern.query.item.PhoneCallQueryItem; -import cn.com.basic.face.fragment.CheckInFragment; import cn.com.basic.face.fragment.PhoneCallFragment; import cn.com.basic.face.util.AppApi; import cn.com.basic.face.util.CharacterParser; @@ -26,7 +23,7 @@ } public void findPhoneCallLeftList(final boolean isSortByDept, String searchText) { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.PHONE_CALL_QUERY); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.PHONE_CALL_QUERY); params.addBodyParameter(PhoneCallQueryCondition.FieldNames.name, searchText); x.http().post(params, new BaseCommonCallBack() { public void success() { 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 85e79b9..f767280 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 @@ -39,7 +39,7 @@ FileWriter fw2 = new FileWriter(f2); fw2.write("test2"); fw2.close(); - params.setUri(AppApi.BASEURL+AppApi.REGISTER_ADD); + params.setUri(AppApi.BASE_URL +AppApi.REGISTER_ADD); params.addBodyParameter("file1", f1); params.addBodyParameter("file2", f2); x.http().post(params, new BaseCommonCallBack() { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurvalanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java similarity index 93% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurvalanceMng.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java index 4a16be0..1594897 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurvalanceMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java @@ -12,17 +12,17 @@ import cn.com.basic.face.util.AppApi; import cn.com.basic.face.util.Constant; -public class SurvalanceMng { +public class SurveillanceMng { - private static SurvalanceMng instance = new SurvalanceMng(); + private static SurveillanceMng instance = new SurveillanceMng(); - public static SurvalanceMng getInstance() { + public static SurveillanceMng getInstance() { return instance; } public void findSupervisoryBottomList(final boolean isVisit) { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.SupervisoryQuery); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY); // params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { public void success() { 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 73da2cc..8ad0134 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 @@ -8,12 +8,8 @@ import cn.com.basic.face.discern.common.BaseCommonCallBack; import cn.com.basic.face.discern.query.condition.VisitQueryCondition; -import cn.com.basic.face.discern.query.condition.VisitorQueryCondition; import cn.com.basic.face.discern.query.item.VisitQueryItem; -import cn.com.basic.face.service.vo.PhoneCallFragment; -import cn.com.basic.face.service.vo.VisitFragment; import cn.com.basic.face.util.AppApi; -import cn.com.basic.face.util.CharacterParser; public class VisitMng { @@ -23,7 +19,7 @@ } public void findLeftVisitorList(String searchText) { - RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISIT_QUERY); + RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.VISIT_QUERY); params.addBodyParameter(VisitQueryCondition.FieldNames.name, searchText); x.http().post(params, new BaseCommonCallBack() { public void success() { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java index 9ef703a..2cae37f 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java @@ -1,30 +1,32 @@ package cn.com.basic.face.util; public class AppApi { - public final static String IMAGEURL_BASE = "http://192.168.1.27:8080/ssm/img/"; - public final static String CHENXINGARGEEMRNT = "";// 鍗忚鍓嶇紑 - public final static String BASEURL = "http://192.168.1.27:8080/ssm/"; + public final static String IMAGE_URL_BASE = "http://192.168.1.27:8080/ssm/img/"; + public final static String BASE_URL = "http://192.168.1.27:8080/ssm/"; public final static String VISITOR_TYPE_LIST = "VisitorType/v_list.do"; - public final static String DICTIONARY_TYPE_LIST = "Dictionary/v_list.do"; //鏁版嵁瀛楀吀 + public final static String DICTIONARY_TYPE_LIST = "Dictionary/v_list.do"; - public static final String REGISTER_ADD = "Person/o_add.do"; //璁垮娉ㄥ唽 + public static final String REGISTER_ADD = "Register/o_add.do"; - public static final String QUERY_INTERVIEWEE = "queryInterviewee/v_read.do";//琚浜哄垪琛� + public static final String CHECK_IN_ADD = "Visit/o_add.do"; - public final static String PLACE_LIST = "Place/v_list.do"; //璁惧鍒楄〃 + public static class Query { - public final static String CheckInQuery = "queryCheckIn/v_list.do"; // + public final static String SURVEILLANCE_QUERY = "querySurveillance/v_list.do"; - public final static String SupervisoryQuery = "queryCheckIn/v_list.do"; // + public final static String CHECK_IN_QUERY = "queryCheckIn/v_list.do"; - public static final String CHECK_IN_ADD = "Visit/o_add.do"; //娣诲姞璁块棶璁板綍 + public static final String VISIT_QUERY = "queryVisit/v_list.do"; - public static final String VISIT_QUERY = "queryVisit/v_list.do"; + public static final String ATTENDANCE_QUERY = "queryAttendance/v_list.do"; - public static final String ATTENDANCE_QUERY = "queryAttendance/v_list.do"; + public static final String PHONE_CALL_QUERY = "queryPhoneCall/v_list.do"; - public static final String PHONE_CALL_QUERY = "queryPhoneCall/v_list.do"; + public final static String DEVICE_QUERY = "queryDevice/v_list.do"; + + } + } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java index f0424ad..dd7d5c7 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java @@ -49,7 +49,7 @@ fragment_check_in_right_interviewee_cell_name.setText(item.getName()); fragment_check_in_right_interviewee_cell_dept.setText(item.getDeptName()); fragment_check_in_right_interviewee_cell_post.setText(item.getPostName()); - fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); + fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); } public CheckInQueryItem getInterviewee() { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java index 5c0d50f..416eeb0 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java @@ -48,7 +48,7 @@ fragment_check_in_right_visitor_cell_company_name.setText(item.getCompanyName()); fragment_check_in_right_visitor_cell_identity_number.setText(item.getIdentify()); fragment_check_in_right_visitor_cell_mobile_phone.setText(item.getPhone()); - fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); + fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); } public CheckInQueryItem getVisitor() { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java index efd4e91..9c1f5ff 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallRightIntervieweeCell.java @@ -17,7 +17,6 @@ import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.discern.query.item.PhoneCallQueryItem; -import cn.com.basic.face.service.vo.PhoneCallFragment; import cn.com.basic.face.util.AppApi; public class PhoneCallRightIntervieweeCell extends LinearLayout { @@ -50,7 +49,7 @@ fragment_check_in_right_interviewee_cell_name.setText(item.getName()); fragment_check_in_right_interviewee_cell_dept.setText(item.getDeptName()); fragment_check_in_right_interviewee_cell_post.setText(item.getPostName()); - fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath())); + fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getImagePath())); } @OnClick(R.id.fragment_check_in_right_interviewee_cell_call_tel) -- Gitblit v1.8.0