From 6132dc5d6374f3c02c0f82027dc9a823fce9f217 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 29 三月 2017 16:33:02 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java | 11
/dev/null | 58 ------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 3
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml | 86 --------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml | 42 +---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml | 4
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java | 69 +++++++
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml | 82 ---------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 85 +++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java | 62 ++++++
10 files changed, 191 insertions(+), 311 deletions(-)
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 8916775..9dbf51d 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
@@ -33,6 +33,9 @@
}
public Place getPlace() {
+ if (place == null) {
+ place = new Place();
+ }
return place;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 9ea07ae..3aaa80f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -14,7 +14,6 @@
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
-import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.adapter.VisitorRecyclerViewAdapter;
@@ -25,8 +24,9 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.Constant;
+import cn.com.basic.face.widget.CheckInIntervieweeCell;
+import cn.com.basic.face.widget.CheckInRightVisitorCell;
import cn.com.basic.face.widget.VisitPurposeDialog;
-import cn.com.basic.face.widget.VisitorView;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
import com.lidroid.xutils.ViewUtils;
import com.lidroid.xutils.view.annotation.ViewInject;
@@ -57,7 +57,8 @@
private RadioGroup fragment_check_in_left_sort_radio_group;
@ViewInject(R.id.fragment_check_in_left_sort_type_linear_layout)
private LinearLayout fragment_check_in_left_sort_type_linear_layout;
- private VisitorView right, left;
+ private CheckInIntervieweeCell fragment_check_in_right_interviewee_cell;
+ private CheckInRightVisitorCell fragment_check_in_right_visitor_cell;
private VisitorRecyclerViewAdapter mAdapter;
private EasyRecyclerView fragment_check_in_left_list_view;
private List mList = new ArrayList();;
@@ -67,18 +68,18 @@
private TextView leftIdentityNumber;
private ImageView leftPhoto;
private TextView leftMobilePhone;
- private TextView rightDepartment;
- private TextView rightPost;
- private TextView rightMobilePhone;
- private TextView rightTel;
+ private TextView fragment_check_in_right_interviewee_cell_dept;
+ private TextView fragment_check_in_right_interviewee_cell_post;
+ private TextView fragment_check_in_right_interviewee_cell_call_mobile;
+ private TextView fragment_check_in_right_interviewee_cell_call_tel;
//private TextView visitorReasonTv;
private List<String> visitPurposeList = new ArrayList<String>();
private VisitorQueryItem selectedVisitor;
private VisitorQueryItem selectedInterviewee;
- @ViewInject(R.id.visitor_remark_et)
+ @ViewInject(R.id.fragment_check_in_right_remark)
private EditText visitorRemarkEt;
- @ViewInject(R.id.visitor_reason_tv)
+ @ViewInject(R.id.fragment_check_in_right_visitor_reason)
private TextView visitorReasonTv;
@ViewInject(R.id.fragment_check_in_left_search_edit_text)
private EditText visitorRegisterSearchEt;
@@ -86,7 +87,7 @@
private RadioButton visitorRegisterRbLeft;
@ViewInject(R.id.fragment_check_in_left_sort_by_dept_radio_button)
private RadioButton visitorRegisterCheckDepartment;
- private ImageView rightPhoto;
+ private ImageView fragment_check_in_right_interviewee_cell_photo;
public static CheckInFragment getInstance() {
return instance;
@@ -211,22 +212,21 @@
@Override
public View addRightLayout() {
fragment_check_in_right = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_check_in_right,null);
- left = (VisitorView) fragment_check_in_right.findViewById(R.id.visitor_view_left);
- left.setType(Constant.VISITOR_FROM);
- left.setTitle("");
- leftCompanyName = (TextView) left.findViewById(R.id.visitor_view_left_company_name);
- leftIdentityNumber = (TextView) left.findViewById(R.id.visitor_view_left_identity_number);
- leftMobilePhone = (TextView) left.findViewById(R.id.visitor_view_left_phone);
- leftPhoto = (ImageView) left.findViewById(R.id.visitor_view_left_photo);
+ fragment_check_in_right_visitor_cell = (CheckInRightVisitorCell) fragment_check_in_right.findViewById(R.id.fragment_check_in_right_visitor_cell);
+ fragment_check_in_right_visitor_cell.setType(Constant.VISITOR_FROM);
+ fragment_check_in_right_visitor_cell.setTitle("");
+ leftCompanyName = (TextView) fragment_check_in_right_visitor_cell.findViewById(R.id.visitor_view_left_company_name);
+ leftIdentityNumber = (TextView) fragment_check_in_right_visitor_cell.findViewById(R.id.visitor_view_left_identity_number);
+ leftMobilePhone = (TextView) fragment_check_in_right_visitor_cell.findViewById(R.id.visitor_view_left_phone);
+ leftPhoto = (ImageView) fragment_check_in_right_visitor_cell.findViewById(R.id.visitor_view_left_photo);
- right = (VisitorView) fragment_check_in_right.findViewById(R.id.visitor_view_right);
- right.setType(Constant.VISITOR_TO);
- right.setTitle("");
- rightDepartment = (TextView) right.findViewById(R.id.view_visitor_right_deptartment);
- rightPost = (TextView) right.findViewById(R.id.view_visitor_right_post);
- rightMobilePhone = (TextView) right.findViewById(R.id.visitor_right_phone);
- rightTel = (TextView) right.findViewById(R.id.visitor_right_tel);
- rightPhoto = (ImageView) right.findViewById(R.id.visitor_view_right_photo);
+ fragment_check_in_right_interviewee_cell = (CheckInIntervieweeCell) fragment_check_in_right.findViewById(R.id.fragment_check_in_right_interviewee_cell);
+
+ fragment_check_in_right_interviewee_cell_dept = (TextView) fragment_check_in_right_interviewee_cell.findViewById(R.id.fragment_check_in_right_interviewee_cell_dept);
+ fragment_check_in_right_interviewee_cell_post = (TextView) fragment_check_in_right_interviewee_cell.findViewById(R.id.fragment_check_in_right_interviewee_cell_post);
+ fragment_check_in_right_interviewee_cell_call_mobile = (TextView) fragment_check_in_right_interviewee_cell.findViewById(R.id.fragment_check_in_right_interviewee_cell_call_mobile);
+ fragment_check_in_right_interviewee_cell_call_tel = (TextView) fragment_check_in_right_interviewee_cell.findViewById(R.id.fragment_check_in_right_interviewee_cell_call_tel);
+ fragment_check_in_right_interviewee_cell_photo = (ImageView) fragment_check_in_right_interviewee_cell.findViewById(R.id.fragment_check_in_right_interviewee_cell_photo);
ViewUtils.inject(this, fragment_check_in_right);
return fragment_check_in_right;
@@ -237,17 +237,17 @@
MainActivity.selectPage(0);
}
- @OnClick(R.id.visitor_register_print)
+ @OnClick(R.id.fragment_check_in_right_print)
public void print(View view) {
}
- @OnClick(R.id.visitor_register_add)
+ @OnClick(R.id.fragment_check_in_right_add)
public void add(View view) {
}
- @OnClick(R.id.visitor_register_save)
+ @OnClick(R.id.fragment_check_in_right_save)
public void save(View view) {
if (selectedVisitor == null || selectedInterviewee == null) {
return;
@@ -263,7 +263,7 @@
VisitorCheckInMng.getInstance().add(params);
}
- @OnClick(R.id.visitor_reason_tv)
+ @OnClick(R.id.fragment_check_in_right_visitor_reason)
public void visitorReason(View view) {
VisitPurposeDialog popup1 = new VisitPurposeDialog(getActivity(),visitPurposeList,"璇烽�夋嫨鎷滆浜嬬敱");
popup1.showAtLocation(getView(), Gravity.CENTER,0,0);
@@ -276,11 +276,11 @@
}
public void visitorCheckIn(FacePhotoItem item) {
- left.setTitle(item.getName());
+ fragment_check_in_right_visitor_cell.setTitle(item.getName());
}
public void visitorCheckIn(VisitorQueryItem item) {
- left.setTitle(item.getName());
+ fragment_check_in_right_visitor_cell.setTitle(item.getName());
leftMobilePhone.setText(item.getMobilePhone());
leftCompanyName.setText(item.getCompanyName());
leftIdentityNumber.setText(item.getIdentify());
@@ -302,31 +302,12 @@
}
public void setVisitorInfo(VisitorQueryItem item) {
- left.setTitle(item.getName());
- leftCompanyName.setText(item.getCompanyName());
- leftIdentityNumber.setText(item.getIdentify());
- leftMobilePhone.setText(item.getPhone());
- leftPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
+ fragment_check_in_right_visitor_cell.setVisitorInfo(item);
selectedVisitor = item;
}
public void setIntervieweeInfo(final VisitorQueryItem item) {
- right.setTitle(item.getName());
- rightDepartment.setText(item.getDeptName());
- rightPost.setText(item.getPostName());
- rightMobilePhone.setOnClickListener(new View.OnClickListener(){
- @Override
- public void onClick(View view) {
- Toast.makeText(MainActivity.getInstance(), "姝ｅ湪鍛煎彨鎵嬫満"+item.getMobilePhone(), Toast.LENGTH_SHORT).show();
- }
- });
- rightTel.setOnClickListener(new View.OnClickListener(){
- @Override
- public void onClick(View view) {
- Toast.makeText(MainActivity.getInstance(), "姝ｅ湪鍛煎彨搴ф満"+item.getPhone(), Toast.LENGTH_SHORT).show();
- }
- });
- rightPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
+ fragment_check_in_right_interviewee_cell.setIntervieweeInfo(item);
selectedInterviewee = item;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
index 720e15a..332aeb9 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
@@ -11,7 +11,7 @@
import cn.com.basic.face.base.MainUIBaseFragment;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.util.Constant;
-import cn.com.basic.face.widget.VisitorView;
+import cn.com.basic.face.widget.CheckInIntervieweeCell;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
import com.lidroid.xutils.ViewUtils;
import com.lidroid.xutils.view.annotation.event.OnClick;
@@ -29,12 +29,10 @@
private View mViewLeft,mViewRight;
private RadioGroup mRGTop,mRGClass;
private LinearLayout mLlRadioGroupClass;
- private VisitorView mVisitorTo;
+ private CheckInIntervieweeCell mVisitorTo;
private VisitorRecyclerViewAdapter mAdapter;
private EasyRecyclerView mRecyclerView;
private List mList;
-
-
public static PhoneCallFragment newInstance() {
return new PhoneCallFragment();
@@ -64,9 +62,8 @@
@Override
public View addRightLayout() {
mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_phone_call_right,null);
- mVisitorTo = (VisitorView) mViewRight.findViewById(R.id.tel_phone_to);
- mVisitorTo.setType(Constant.VISITOR_TO);
- mVisitorTo.setTitle("dasfasdfasdf");
+ mVisitorTo = (CheckInIntervieweeCell) mViewRight.findViewById(R.id.tel_phone_to);
+
return mViewRight;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java
new file mode 100644
index 0000000..0456659
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java
@@ -0,0 +1,69 @@
+package cn.com.basic.face.widget;
+
+import android.content.Context;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.bsk.zhangbo.demoforbsk.R;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+
+import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.discern.query.item.VisitorQueryItem;
+import cn.com.basic.face.util.AppApi;
+
+/**
+ * Created by Sinoe on 2017/2/22.
+ */
+
+public class CheckInIntervieweeCell extends LinearLayout{
+ public CheckInIntervieweeCell(Context context) {
+ super(context);
+ }
+
+ public CheckInIntervieweeCell(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ View view = inflater.inflate(R.layout.fragment_check_in_right_interviewee,this);
+ ViewUtils.inject(this, view);
+ }
+
+ @ViewInject(R.id.fragment_check_in_right_interviewee_cell_name)
+ private TextView fragment_check_in_right_interviewee_cell_name;
+ @ViewInject(R.id.fragment_check_in_right_interviewee_cell_dept)
+ private TextView fragment_check_in_right_interviewee_cell_dept;
+ @ViewInject(R.id.fragment_check_in_right_interviewee_cell_post)
+ private TextView fragment_check_in_right_interviewee_cell_post;
+ @ViewInject(R.id.fragment_check_in_right_interviewee_cell_call_mobile)
+ private TextView fragment_check_in_right_interviewee_cell_call_mobile;
+ @ViewInject(R.id.fragment_check_in_right_interviewee_cell_call_tel)
+ private TextView fragment_check_in_right_interviewee_cell_call_tel;
+ @ViewInject(R.id.fragment_check_in_right_interviewee_cell_photo)
+ private ImageView fragment_check_in_right_interviewee_cell_photo;
+
+ public void setIntervieweeInfo(final VisitorQueryItem item) {
+
+ 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_call_mobile.setOnClickListener(new View.OnClickListener(){
+ @Override
+ public void onClick(View view) {
+ Toast.makeText(MainActivity.getInstance(), "姝ｅ湪鍛煎彨鎵嬫満"+item.getMobilePhone(), Toast.LENGTH_SHORT).show();
+ }
+ });
+ fragment_check_in_right_interviewee_cell_call_tel.setOnClickListener(new View.OnClickListener(){
+ @Override
+ public void onClick(View view) {
+ Toast.makeText(MainActivity.getInstance(), "姝ｅ湪鍛煎彨搴ф満"+item.getPhone(), Toast.LENGTH_SHORT).show();
+ }
+ });
+ fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
+ }
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java
new file mode 100644
index 0000000..b226566
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java
@@ -0,0 +1,62 @@
+package cn.com.basic.face.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.bsk.zhangbo.demoforbsk.R;
+import com.lidroid.xutils.ViewUtils;
+
+import cn.com.basic.face.discern.query.item.VisitorQueryItem;
+
+/**
+ * Created by Sinoe on 2017/2/22.
+ */
+
+public class CheckInRightVisitorCell extends LinearLayout{
+ private Context mContext;
+ private TextView mTvTitle,mTvPhone,mTvCompany,mTvCardId,mTvDepartment,mTvWork,mBtnLandline,mBtnMobile;
+ private LinearLayout mLayoutTo,mLayoutFrom;
+ public CheckInRightVisitorCell(Context context) {
+ super(context);
+ }
+
+ public CheckInRightVisitorCell(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ this.mContext = context;
+ LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ View view = inflater.inflate(R.layout.fragment_check_in_right_visitor,this);
+
+ mTvTitle = (TextView) findViewById(R.id.fragment_check_in_right_interviewee_cell_name);
+ ViewUtils.inject(this, view);
+ }
+
+ /**
+ * 璁剧疆绫诲瀷
+ * @param type
+ */
+ public void setType(int type){
+
+ }
+
+ /**
+ * 璁剧疆鏍囬
+ * @param title
+ */
+ public void setTitle(String title){
+ mTvTitle.setText(title);
+ }
+
+
+
+ public void setVisitorInfo(VisitorQueryItem item) {
+// fragment_check_in_right_visitor_cell.setTitle(item.getName());
+// leftCompanyName.setText(item.getCompanyName());
+// leftIdentityNumber.setText(item.getIdentify());
+// leftMobilePhone.setText(item.getPhone());
+// leftPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
+ }
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitorView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitorView.java
deleted file mode 100644
index df556cd..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitorView.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.com.basic.face.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.bsk.zhangbo.demoforbsk.R;
-
-import static cn.com.basic.face.util.Constant.VISITOR_TO;
-
-/**
- * Created by Sinoe on 2017/2/22.
- */
-
-public class VisitorView extends LinearLayout{
- private Context mContext;
- private TextView mTvTitle,mTvPhone,mTvCompany,mTvCardId,mTvDepartment,mTvWork,mBtnLandline,mBtnMobile;
- private LinearLayout mLayoutTo,mLayoutFrom;
- public VisitorView(Context context) {
- super(context);
- }
-
- public VisitorView(Context context, AttributeSet attrs) {
- super(context, attrs);
- this.mContext = context;
- LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- inflater.inflate(R.layout.fragment_check_in_right_visitor,this);
- mLayoutTo = (LinearLayout) findViewById(R.id.visitor_to_ll);
- mLayoutFrom = (LinearLayout) findViewById(R.id.visitor_from_ll);
- mTvTitle = (TextView) findViewById(R.id.visitor_title);
- }
-
- /**
- * 璁剧疆绫诲瀷
- * @param type
- */
- public void setType(int type){
- if (type == VISITOR_TO){
- mLayoutTo.setVisibility(VISIBLE);
- mLayoutFrom.setVisibility(GONE);
- }else {
- mLayoutTo.setVisibility(GONE);
- mLayoutFrom.setVisibility(VISIBLE);
- }
- }
-
- /**
- * 璁剧疆鏍囬
- * @param title
- */
- public void setTitle(String title){
- mTvTitle.setText(title);
- }
-
-
-}
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 aecce9b..78317d4 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
@@ -15,28 +15,8 @@
android:layout_height="76dp"
android:gravity="right|center_vertical"
android:orientation="horizontal">
-<!--
- <ImageView
- android:id="@+id/visitor_register_print"
- android:layout_width="@dimen/view_size_50"
- android:layout_height="@dimen/view_size_50"
- android:src="@mipmap/visitor_register_print"/>
- <ImageView
- android:id="@+id/visitor_register_add"
- android:layout_width="@dimen/view_size_50"
- android:layout_height="@dimen/view_size_50"
- android:layout_marginLeft="20dp"
- android:src="@mipmap/visitor_register_add"/>
- <ImageView
- android:id="@+id/visitor_register_save"
- android:layout_width="@dimen/view_size_50"
- android:layout_height="@dimen/view_size_50"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="@dimen/view_size_50"
- android:src="@mipmap/visitor_register_save"/>
- -->
<TextView
- android:id="@+id/visitor_register_print"
+ android:id="@+id/fragment_check_in_right_print"
android:layout_width="40dp"
android:layout_height="36dp"
android:gravity="center"
@@ -44,7 +24,7 @@
android:background="@drawable/main_btn_bcg"
android:text="鎵撳嵃"/>
<TextView
- android:id="@+id/visitor_register_add"
+ android:id="@+id/fragment_check_in_right_add"
android:layout_width="40dp"
android:layout_height="36dp"
android:gravity="center"
@@ -53,7 +33,7 @@
android:background="@drawable/main_btn_bcg"
android:text="娣诲姞"/>
<TextView
- android:id="@+id/visitor_register_save"
+ android:id="@+id/fragment_check_in_right_save"
android:layout_width="40dp"
android:layout_height="36dp"
android:gravity="center"
@@ -67,20 +47,20 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
- <cn.com.basic.face.widget.VisitorView
- android:id="@+id/visitor_view_left"
+ <cn.com.basic.face.widget.CheckInRightVisitorCell
+ android:id="@+id/fragment_check_in_right_visitor_cell"
android:layout_width="254dp"
android:layout_height="350dp"
android:background="@drawable/card_bcg"
- android:orientation="vertical"></cn.com.basic.face.widget.VisitorView>
+ android:orientation="vertical"></cn.com.basic.face.widget.CheckInRightVisitorCell>
- <cn.com.basic.face.widget.VisitorView
- android:id="@+id/visitor_view_right"
+ <cn.com.basic.face.widget.CheckInIntervieweeCell
+ 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:orientation="vertical"></cn.com.basic.face.widget.VisitorView>
+ android:orientation="vertical"></cn.com.basic.face.widget.CheckInIntervieweeCell>
</LinearLayout>
<LinearLayout
android:layout_width="611dp"
@@ -95,7 +75,7 @@
android:textSize="@dimen/text_size_big"
android:text="@string/visitor_reason"/>
<TextView
- android:id="@+id/visitor_reason_tv"
+ android:id="@+id/fragment_check_in_right_visitor_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -117,7 +97,7 @@
android:textSize="@dimen/text_size_big"
android:text="@string/visitor_remark"/>
<EditText
- android:id="@+id/visitor_remark_et"
+ android:id="@+id/fragment_check_in_right_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml
index dbd239b..cb7b093 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml
@@ -9,7 +9,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/visitor_title"
+ android:id="@+id/fragment_check_in_right_interviewee_cell_name"
android:textColor="@color/colorText_5"
android:paddingTop="@dimen/view_size_5"
android:paddingBottom="@dimen/view_size_5"
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<com.facebook.drawee.view.SimpleDraweeView
- android:id="@+id/visitor_view_right_photo"
+ android:id="@+id/fragment_check_in_right_interviewee_cell_photo"
android:layout_width="100dp"
android:layout_height="100dp"
fresco:roundAsCircle = "true"
@@ -45,7 +45,7 @@
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
<TextView
- android:id="@+id/view_visitor_right_deptartment"
+ android:id="@+id/fragment_check_in_right_interviewee_cell_dept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
@@ -65,7 +65,7 @@
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
<TextView
- android:id="@+id/view_visitor_right_post"
+ android:id="@+id/fragment_check_in_right_interviewee_cell_post"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
@@ -79,7 +79,7 @@
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView
- android:id="@+id/visitor_right_phone"
+ android:id="@+id/fragment_check_in_right_interviewee_cell_call_mobile"
android:layout_width="90dp"
android:layout_height="36dp"
android:gravity="center"
@@ -87,7 +87,7 @@
android:background="@drawable/main_btn_bcg"
android:text="鍛煎彨鎵嬫満"/>
<TextView
- android:id="@+id/visitor_right_tel"
+ android:id="@+id/fragment_check_in_right_interviewee_cell_call_tel"
android:layout_width="90dp"
android:layout_height="36dp"
android:gravity="center"
@@ -96,80 +96,6 @@
android:background="@drawable/main_btn_bcg"
android:text="鍛煎彨搴ф満"/>
- </LinearLayout>
- </LinearLayout>
-
- <!--璁块棶-->
- <LinearLayout
- android:id="@+id/visitor_from_ll"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:orientation="vertical">
- <com.facebook.drawee.view.SimpleDraweeView
- android:id="@+id/visitor_view_left_photo"
- android:layout_width="100dp"
- android:layout_height="100dp"
- fresco:roundAsCircle = "true"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="@dimen/view_size_25"
- fresco:placeholderImage="@mipmap/timg"/>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="40dp"
- android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鑱旂郴鐢佃瘽锛�"
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_5"/>
- <TextView
- android:id="@+id/visitor_view_left_phone"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=""
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_b"/>
- </LinearLayout>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="25dp"
- android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍏徃鍚嶇О锛�"
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_5"/>
- <TextView
- android:id="@+id/visitor_view_left_company_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=""
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_b"/>
- </LinearLayout>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="25dp"
- android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="璇佷欢缂栧彿锛�"
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_5"/>
- <TextView
- android:id="@+id/visitor_view_left_identity_number"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=""
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_b"/>
</LinearLayout>
</LinearLayout>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
index dbd239b..6473016 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
@@ -9,7 +9,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/visitor_title"
+ android:id="@+id/fragment_check_in_right_interviewee_cell_name"
android:textColor="@color/colorText_5"
android:paddingTop="@dimen/view_size_5"
android:paddingBottom="@dimen/view_size_5"
@@ -19,86 +19,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"/>
- <LinearLayout
- android:id="@+id/visitor_to_ll"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical">
- <com.facebook.drawee.view.SimpleDraweeView
- android:id="@+id/visitor_view_right_photo"
- android:layout_width="100dp"
- android:layout_height="100dp"
- fresco:roundAsCircle = "true"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="@dimen/view_size_25"
- fresco:placeholderImage="@mipmap/timg"/>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="40dp"
- android:layout_gravity="center_horizontal"
- android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="閮ㄩ棬锛�"
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_5"/>
- <TextView
- android:id="@+id/view_visitor_right_deptartment"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=""
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_b"/>
- </LinearLayout>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="25dp"
- android:layout_gravity="center_horizontal"
- android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鑱屽姟锛�"
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_5"/>
- <TextView
- android:id="@+id/view_visitor_right_post"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=""
- android:textSize="@dimen/text_size_big"
- android:textColor="@color/colorText_b"/>
- </LinearLayout>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/view_size_25"
- android:gravity="center_horizontal"
- android:orientation="horizontal">
- <TextView
- android:id="@+id/visitor_right_phone"
- android:layout_width="90dp"
- android:layout_height="36dp"
- android:gravity="center"
- android:textColor="@android:color/white"
- android:background="@drawable/main_btn_bcg"
- android:text="鍛煎彨鎵嬫満"/>
- <TextView
- android:id="@+id/visitor_right_tel"
- android:layout_width="90dp"
- android:layout_height="36dp"
- android:gravity="center"
- android:layout_marginLeft="@dimen/view_size_10"
- android:textColor="@android:color/white"
- android:background="@drawable/main_btn_bcg"
- android:text="鍛煎彨搴ф満"/>
-
- </LinearLayout>
- </LinearLayout>
-
<!--璁块棶-->
<LinearLayout
android:id="@+id/visitor_from_ll"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml
index 12ee99c..925e692 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml
@@ -3,11 +3,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <cn.com.basic.face.widget.VisitorView
+ <cn.com.basic.face.widget.CheckInIntervieweeCell
android:id="@+id/tel_phone_to"
android:layout_width="254dp"
android:layout_height="350dp"
android:background="@drawable/card_bcg"
android:layout_centerInParent="true"
- android:orientation="vertical"></cn.com.basic.face.widget.VisitorView>
+ android:orientation="vertical"></cn.com.basic.face.widget.CheckInIntervieweeCell>
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0