From d47d76dc4c2ccd440514a6837ed04d95ba3bdc63 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 28 三月 2017 16:15:12 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java | 68 ++++++++++++++--------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java | 75 +++++++++++++++++++++++-
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java | 2
3 files changed, 114 insertions(+), 31 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java
index 202fc92..7c907c3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VisitorQueryItem.java
@@ -4,7 +4,7 @@
public class VisitorQueryItem {
// 浜哄憳涓婚敭
- private Integer id;
+ private String id;
// 浜哄憳鍚嶅瓧
private String name;
// 鍥剧墖鍦板潃
@@ -15,18 +15,26 @@
private String phone;
// 璇佷欢缂栧彿
private String identify;
+ // 閮ㄩ棬鍚嶇О
+ private String deptName;
+ // 鍏徃涓婚敭
+ private String companyId;
+ // 鑱屼綅涓婚敭
+ private String postName;
+ // 绉诲姩鐢佃瘽
+ private String mobilePhone;
/**
* Get 浜哄憳涓婚敭
*/
- public Integer getId() {
+ public String getId() {
return id;
}
/**
* Set 浜哄憳涓婚敭
*/
- public void setId(Integer id) {
+ public void setId(String id) {
this.id = id;
}
@@ -100,10 +108,67 @@
this.identify = identify;
}
+ /**
+ * Get 閮ㄩ棬鍚嶇О
+ */
+ public String getDeptName() {
+ return deptName;
+ }
+
+ /**
+ * Set 閮ㄩ棬鍚嶇О
+ */
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ /**
+ * Get 鍏徃涓婚敭
+ */
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ /**
+ * Set 鍏徃涓婚敭
+ */
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ /**
+ * Get 鑱屼綅涓婚敭
+ */
+ public String getPostName() {
+ return postName;
+ }
+
+ /**
+ * Set 鑱屼綅涓婚敭
+ */
+ public void setPostName(String postName) {
+ this.postName = postName;
+ }
+
+ /**
+ * Get 绉诲姩鐢佃瘽
+ */
+ public String getMobilePhone() {
+ return mobilePhone;
+ }
+
+ /**
+ * Set 绉诲姩鐢佃瘽
+ */
+ public void setMobilePhone(String mobilePhone) {
+ this.mobilePhone = mobilePhone;
+ }
+
public String toString() {
return
",浜哄憳涓婚敭 =" + id + ",浜哄憳鍚嶅瓧 =" + name + ",鍥剧墖鍦板潃 =" + imagePath +
- ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + phone + ",璇佷欢缂栧彿 =" + identify
- ;
+ ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + phone + ",璇佷欢缂栧彿 =" + identify +
+ ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅涓婚敭 =" + postName +
+ ",绉诲姩鐢佃瘽 =" + mobilePhone;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
index 9088476..d49af11 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
@@ -104,7 +104,7 @@
public void success() {
List<Dictionary> items = getList(Dictionary.class);
for (Dictionary item : items) {
- idMap.put(item.getName(), item.getId()+"");
+ idMap.put(CommonVariables.DictionaryType.VISIT_PURPOSE+item.getName(), item.getId()+"");
visitPurposeList.add(item.getName());
}
VisitorRegisterFragment.getInstance().setVisitPurposeList(visitPurposeList);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
index 3d7cbd6..18d3c53 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
@@ -5,6 +5,7 @@
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RadioGroup;
@@ -15,6 +16,7 @@
import com.bsk.zhangbo.demoforbsk.adapter.VisitorRecyclerViewAdapter;
import com.bsk.zhangbo.demoforbsk.base.MainUIBaseFragment;
import com.bsk.zhangbo.demoforbsk.listeners.OkButtonClickedListener;
+import com.bsk.zhangbo.demoforbsk.service.DictionaryMng;
import com.bsk.zhangbo.demoforbsk.service.VisitorCheckInMng;
import com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity;
import com.bsk.zhangbo.demoforbsk.util.Constant;
@@ -23,6 +25,7 @@
import com.bsk.zhangbo.demoforbsk.widget.VisitorView;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
import org.xutils.http.RequestParams;
@@ -30,6 +33,7 @@
import java.util.ArrayList;
import java.util.List;
+import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Visit;
import cn.com.basic.face.discern.query.item.FacePhotoItem;
import cn.com.basic.face.discern.query.item.IntervieweeQueryItem;
@@ -57,8 +61,15 @@
private TextView mDutyTv;
private TextView mPhoneTv;
private TextView mTelTv;
- private TextView visitorReasonTv;
+ //private TextView visitorReasonTv;
private List<String> visitPurposeList = new ArrayList<String>();
+ private VisitorQueryItem selectedVisitor;
+ private VisitorQueryItem selectedInterviewee;
+
+ @ViewInject(R.id.visitor_remark_et)
+ private EditText visitorRemarkEt;
+ @ViewInject(R.id.visitor_reason_tv)
+ private TextView visitorReasonTv;
public static VisitorRegisterFragment getInstance() {
return instance;
@@ -123,6 +134,9 @@
item.setIdentify("1001"+i);
item.setImagePath("test.png");
item.setPhone("136913486"+i);
+ item.setMobilePhone("1369134876"+i);
+ item.setPostName("鑱屽姟"+i);
+ item.setDeptName("閮ㄩ棬"+i);
mList.add(item);
}
mAdapter.setList(mList);
@@ -155,20 +169,6 @@
visitorPhoto = (ImageView)mVisitorFrom.findViewById(R.id.visitor_view_from_photo);
mVisitorTo = (VisitorView) mViewRight.findViewById(R.id.visitor_to);
- visitorReasonTv = (TextView) mViewRight.findViewById(R.id.visitor_reason_tv);
- visitorReasonTv.setOnClickListener(new View.OnClickListener(){
- @Override
- public void onClick(View view) {
- VisitPurposePopup popup1 = new VisitPurposePopup(getActivity(),visitPurposeList,"鎷滆浜嬬敱");
- popup1.showAtLocation(getView(), Gravity.CENTER,0,0);
- popup1.addOkButtonClickedListener(new OkButtonClickedListener() {
- @Override
- public void onItemSelected(int position, Object o, String item) {
- visitorReasonTv.setText(item);
- }
- });
- }
- });
mDepartmentTv = (TextView)mVisitorTo.findViewById(R.id.view_visitor_to_deptartment);
mDutyTv = (TextView)mVisitorTo.findViewById(R.id.view_visitor_to_duty);
@@ -204,13 +204,30 @@
@OnClick(R.id.visitor_register_save)
public void save(View view) {
+ if (selectedVisitor == null || selectedInterviewee == null) {
+ return;
+ }
RequestParams params = new RequestParams();
- params.addBodyParameter(Visit.FieldNames.matterId, "");
- params.addBodyParameter(Visit.FieldNames.remark, "");
- params.addBodyParameter(Visit.FieldNames.visitorPersonId, "");
- params.addBodyParameter(Visit.FieldNames.visiteePersonId, "");
+ params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_PURPOSE+visitorReasonTv.getText().toString()));
+ params.addBodyParameter(Visit.FieldNames.remark, visitorRemarkEt.getText().toString());
+ params.addBodyParameter(Visit.FieldNames.visitorPersonId, selectedVisitor.getId());
+ params.addBodyParameter(Visit.FieldNames.visiteePersonId, selectedInterviewee.getId());
+ params.addBodyParameter(Visit.FieldNames.visitorCompanyId, selectedVisitor.getCompanyId());
+ params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, selectedInterviewee.getCompanyId());
VisitorCheckInMng.getInstance().add(params);
+ }
+
+ @OnClick(R.id.visitor_reason_tv)
+ public void visitorReason() {
+ VisitPurposePopup popup1 = new VisitPurposePopup(getActivity(),visitPurposeList,"鎷滆浜嬬敱");
+ popup1.showAtLocation(getView(), Gravity.CENTER,0,0);
+ popup1.addOkButtonClickedListener(new OkButtonClickedListener() {
+ @Override
+ public void onItemSelected(int position, Object o, String item) {
+ visitorReasonTv.setText(item);
+ }
+ });
}
public void visitorCheckIn(FacePhotoItem item) {
@@ -230,25 +247,26 @@
companyNameTv.setText(item.getCompanyName());
identity.setText(item.getIdentify());
fromPhone.setText(item.getPhone());
+ selectedVisitor = item;
}
- public void setIntervieweeInfo(VisitorQueryItem item) {
+ public void setIntervieweeInfo(final VisitorQueryItem item) {
mVisitorTo.setTitle(item.getName());
- mDepartmentTv.setText("閮ㄩ棬");
- mDutyTv.setText("璐㈠姟");
+ mDepartmentTv.setText(item.getDeptName());
+ mDutyTv.setText(item.getPostName());
mPhoneTv.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View view) {
- Toast.makeText(MainActivity.getInstance(), "姝ｅ湪鍛煎彨鎵嬫満", Toast.LENGTH_SHORT).show();
+ Toast.makeText(MainActivity.getInstance(), "姝ｅ湪鍛煎彨鎵嬫満"+item.getMobilePhone(), Toast.LENGTH_SHORT).show();
}
});
mTelTv.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View view) {
- Toast.makeText(MainActivity.getInstance(), "姝ｅ湪鍛煎彨搴ф満", Toast.LENGTH_SHORT).show();
+ Toast.makeText(MainActivity.getInstance(), "姝ｅ湪鍛煎彨搴ф満"+item.getPhone(), Toast.LENGTH_SHORT).show();
}
});
-
+ selectedInterviewee = item;
}
public void setVisitPurposeList(List<String> visitPurposeList) {
--
Gitblit v1.8.0