From 386839ed53a6ede6994ecf34c800eebf3e3c1ef9 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 29 三月 2017 16:46:34 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java                         |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java  |    4 +-
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInIntervieweeCell.java       |    2 
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml                  |   11 ++---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java            |   31 +--------------
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInRightVisitorCell.java      |   46 +++++++++-------------
 7 files changed, 32 insertions(+), 66 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java
index 680b079..c2c41db 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/OneBottomRecylerViewAdapter.java
@@ -168,7 +168,7 @@
         if (data instanceof VisitorQueryItem) {
             final VisitorQueryItem item = (VisitorQueryItem)data;
             nameTv.setText(item.getName());
-            photoIv.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE+item.getImagePath()));
+            photoIv.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE +item.getImagePath()));
             if (1==1) {
                 statusTv.setBackground(context.getDrawable(R.drawable.rectangle_textview));
 
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java
index 0a80db6..b350e3a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitorRecyclerViewAdapter.java
@@ -102,7 +102,7 @@
             VisitorQueryItem item = (VisitorQueryItem) data;
             nameTv.setText(item.getName());
 
-            photoIv.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
+            photoIv.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath()));
 
         }
 
@@ -130,7 +130,7 @@
             VisitorQueryItem item = (VisitorQueryItem) data;
             mToNameTv.setText(item.getName());
             mTvDepartment.setText(item.getDeptName());
-            photoIv.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
+            photoIv.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath()));
         }
 
         RelativeLayout itemVisitorToRl = (RelativeLayout) holder.findViewById(R.id.item_visitor_to_rl);
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 3aaa80f..e6e5778 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
@@ -64,15 +64,6 @@
     private List mList = new ArrayList();;
 
     private static CheckInFragment instance = new CheckInFragment();
-    private TextView leftCompanyName;
-    private TextView leftIdentityNumber;
-    private ImageView leftPhoto;
-    private TextView leftMobilePhone;
-    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;
@@ -87,7 +78,6 @@
     private RadioButton visitorRegisterRbLeft;
     @ViewInject(R.id.fragment_check_in_left_sort_by_dept_radio_button)
     private RadioButton visitorRegisterCheckDepartment;
-    private ImageView fragment_check_in_right_interviewee_cell_photo;
 
     public static CheckInFragment getInstance() {
         return instance;
@@ -213,20 +203,8 @@
     public View addRightLayout() {
         fragment_check_in_right = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_check_in_right,null);
         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);
 
         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;
@@ -276,15 +254,12 @@
     }
 
     public void visitorCheckIn(FacePhotoItem item) {
-        fragment_check_in_right_visitor_cell.setTitle(item.getName());
+//        fragment_check_in_right_visitor_cell.setTitle(item.getName());
     }
 
     public void visitorCheckIn(VisitorQueryItem item) {
-        fragment_check_in_right_visitor_cell.setTitle(item.getName());
-        leftMobilePhone.setText(item.getMobilePhone());
-        leftCompanyName.setText(item.getCompanyName());
-        leftIdentityNumber.setText(item.getIdentify());
-        leftPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
+        fragment_check_in_right_visitor_cell.setVisitorInfo(item);
+        selectedVisitor = item;
     }
 
     public void listChanged(List list, boolean isClear) {
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 e2d2b53..328b4b2 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,7 +1,7 @@
 package cn.com.basic.face.util;
 
 public class AppApi {
-	public final static String CHENXINGGROUND_IMAGEURL_BASE = "http://192.168.1.27:8080/ssm/img/";
+	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/";
 
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
index 0456659..b7f0faa 100644
--- 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
@@ -64,6 +64,6 @@
                 Toast.makeText(MainActivity.getInstance(), "姝e湪鍛煎彨搴ф満"+item.getPhone(), Toast.LENGTH_SHORT).show();
             }
         });
-        fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
+        fragment_check_in_right_interviewee_cell_photo.setImageURI(Uri.parse(AppApi.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
index b226566..c7f7855 100644
--- 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
@@ -1,62 +1,54 @@
 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 com.bsk.zhangbo.demoforbsk.R;
 import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 
 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 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);
-    }
-
-
+    @ViewInject(R.id.fragment_check_in_right_visitor_cell_name)
+    private TextView fragment_check_in_right_visitor_cell_name;
+    @ViewInject(R.id.fragment_check_in_right_visitor_cell_company_name)
+    private TextView fragment_check_in_right_visitor_cell_company_name;
+    @ViewInject(R.id.fragment_check_in_right_visitor_cell_identity_number)
+    private TextView fragment_check_in_right_visitor_cell_identity_number;
+    @ViewInject(R.id.fragment_check_in_right_visitor_cell_photo)
+    private ImageView fragment_check_in_right_visitor_cell_photo;
+    @ViewInject(R.id.fragment_check_in_right_visitor_cell_mobile_phone)
+    private TextView fragment_check_in_right_visitor_cell_mobile_phone;
 
     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()));
+        fragment_check_in_right_visitor_cell_name.setText(item.getName());
+        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()));
     }
 }
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 6473016..cf034ec 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/fragment_check_in_right_interviewee_cell_name"
+        android:id="@+id/fragment_check_in_right_visitor_cell_name"
         android:textColor="@color/colorText_5"
         android:paddingTop="@dimen/view_size_5"
         android:paddingBottom="@dimen/view_size_5"
@@ -24,10 +24,9 @@
         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:id="@+id/fragment_check_in_right_visitor_cell_photo"
             android:layout_width="100dp"
             android:layout_height="100dp"
             fresco:roundAsCircle = "true"
@@ -46,7 +45,7 @@
                 android:textSize="@dimen/text_size_big"
                 android:textColor="@color/colorText_5"/>
             <TextView
-                android:id="@+id/visitor_view_left_phone"
+                android:id="@+id/fragment_check_in_right_visitor_cell_mobile_phone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
@@ -65,7 +64,7 @@
                 android:textSize="@dimen/text_size_big"
                 android:textColor="@color/colorText_5"/>
             <TextView
-                android:id="@+id/visitor_view_left_company_name"
+                android:id="@+id/fragment_check_in_right_visitor_cell_company_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
@@ -84,7 +83,7 @@
                 android:textSize="@dimen/text_size_big"
                 android:textColor="@color/colorText_5"/>
             <TextView
-                android:id="@+id/visitor_view_left_identity_number"
+                android:id="@+id/fragment_check_in_right_visitor_cell_identity_number"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""

--
Gitblit v1.8.0