From 64ce5f7d063be31197208edd928b2a4e5c6e3dc2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 28 三月 2017 15:25:55 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java        |    5 +-
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java |   27 ++++++++++++-
 VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml                                    |   34 +++++++++++++++-
 VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_print.png                             |    0 
 VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_add.png                               |    0 
 VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_save.png                              |    0 
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java           |   18 +++++++++
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java              |   11 -----
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/RegisterMng.java                 |    8 ++--
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java                         |    4 +
 10 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/RegisterMng.java
similarity index 87%
rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.java
rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/RegisterMng.java
index 690026c..9d65f2f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/RegisterMng.java
@@ -17,11 +17,11 @@
  * Created by xiuxi on 2017/3/23.
  */
 
-public class PersonMng extends BaseMng {
+public class RegisterMng extends BaseMng {
 
-    public static PersonMng instance = new PersonMng();
+    public static RegisterMng instance = new RegisterMng();
 
-    public static PersonMng getInstance() {
+    public static RegisterMng getInstance() {
         return instance;
     }
 
@@ -43,7 +43,7 @@
             FileWriter fw2 = new FileWriter(f2);
             fw2.write("test2");
             fw2.close();
-            params.setUri(AppApi.BASEURL+AppApi.PERSON_REGISTER);
+            params.setUri(AppApi.BASEURL+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/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java
index 24398dd..b8fce8b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java
@@ -1,5 +1,7 @@
 package com.bsk.zhangbo.demoforbsk.service;
 
+import android.widget.Toast;
+
 import com.bsk.zhangbo.demoforbsk.base.BaseApplication;
 import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
 import com.bsk.zhangbo.demoforbsk.util.AppApi;
@@ -54,6 +56,22 @@
         });
     }
 
+    /**
+     * 娣诲姞璁垮璁板綍
+     * @param params
+     */
+    public void add(RequestParams params) {
+
+        params.setUri(AppApi.BASEURL+AppApi.CHECK_IN_ADD);
+        x.http().post(params, new BaseCommonCallBack() {
+            @Override
+            public void success() {
+                Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+            }
+        });
+
+    }
+
 
     /**
      * 鏌ヨ鎷滆浜嬬敱鍒楄〃
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java
index 2792514..368d1de 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java
@@ -1,8 +1,5 @@
 package com.bsk.zhangbo.demoforbsk.service;
 
-import android.widget.Toast;
-
-import com.bsk.zhangbo.demoforbsk.base.BaseApplication;
 import com.bsk.zhangbo.demoforbsk.ui.fragment.RegisterFragment;
 import com.bsk.zhangbo.demoforbsk.util.AppApi;
 import com.bsk.zhangbo.demoforbsk.util.MultipartUtility;
@@ -11,16 +8,10 @@
 import org.xutils.x;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Exchanger;
 
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.entity.Person;
-import cn.com.basic.face.discern.entity.VisitPersonType;
 import cn.com.basic.face.discern.query.item.VistorTypeQueryItem;
 
 /**
@@ -62,7 +53,7 @@
 
             String charset = "UTF-8";
             File uploadFile1 = new File("/sdcard/myvideo.mp4");
-            String requestURL = AppApi.BASEURL+AppApi.PERSON_REGISTER;
+            String requestURL = AppApi.BASEURL+AppApi.REGISTER_ADD;
 
             MultipartUtility multipart = new MultipartUtility(requestURL, charset);
 
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java
index 78a8870..90f9750 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java
@@ -18,7 +18,7 @@
 import com.bsk.zhangbo.demoforbsk.R;
 import com.bsk.zhangbo.demoforbsk.base.BaseFragment;
 import com.bsk.zhangbo.demoforbsk.service.DictionaryMng;
-import com.bsk.zhangbo.demoforbsk.service.PersonMng;
+import com.bsk.zhangbo.demoforbsk.service.RegisterMng;
 import com.bsk.zhangbo.demoforbsk.service.VisitorTypeMng;
 import com.bsk.zhangbo.demoforbsk.listeners.OkButtonClickedListener;
 import com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity;
@@ -32,7 +32,6 @@
 import org.xutils.http.RequestParams;
 
 import java.io.IOException;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -146,7 +145,7 @@
         params.addBodyParameter(VisitPersonType.FieldNames.visitorTypeId, VisitorTypeMng.getInstance().getId(isitorvTypeTv.getText().toString()));
         params.addBodyParameter(VisitPersonType.FieldNames.registerCompanyId, "0");
 
-        PersonMng.getInstance().add(params);
+        RegisterMng.getInstance().add(params);
     }
 
     @Override
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 9556c2e..0a90800 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
@@ -15,6 +15,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.VisitorCheckInMng;
 import com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity;
 import com.bsk.zhangbo.demoforbsk.util.Constant;
 import com.bsk.zhangbo.demoforbsk.widget.SingleSelectionPopup;
@@ -23,6 +24,8 @@
 import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.event.OnClick;
+
+import org.xutils.http.RequestParams;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -150,7 +153,6 @@
         fromPhone = (TextView)mVisitorFrom.findViewById(R.id.visitor_view_from_phone);
         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(){
@@ -175,9 +177,12 @@
 
         mVisitorFrom.setType(Constant.VISITOR_FROM);
         mVisitorTo.setType(Constant.VISITOR_TO);
-        mVisitorFrom.setTitle("dasfasdfasdf");
-        mVisitorTo.setTitle("dasfasdfasdf");
+        mVisitorFrom.setTitle("");
+        mVisitorTo.setTitle("");
         ViewUtils.inject(this, mVisitorTo);
+
+        ViewUtils.inject(this, mViewRight);
+
         return mViewRight;
     }
 
@@ -186,6 +191,22 @@
         MainActivity.selectPage(0);
     }
 
+    @OnClick(R.id.visitor_register_print)
+    public void print(View view) {
+
+    }
+
+    @OnClick(R.id.visitor_register_add)
+    public void add(View view) {
+
+    }
+
+    @OnClick(R.id.visitor_register_save)
+    public void save(View view) {
+        RequestParams params = new RequestParams();
+        VisitorCheckInMng.getInstance().add(params);
+    }
+
     public void visitorCheckIn(FacePhotoItem item) {
         mVisitorFrom.setTitle(item.getName());
     }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java
index 5cbb680..5f9737b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java
@@ -9,7 +9,7 @@
 
 	public final static String DICTIONARY_TYPE_LIST = "Dictionary/v_list.do";
 
-	public static final String PERSON_REGISTER = "Person/o_add.do";
+	public static final String REGISTER_ADD = "Person/o_add.do";
 
 	public static final String QUERY_INTERVIEWEE = "queryInterviewee/v_read.do";//琚浜哄垪琛�
 
@@ -17,4 +17,6 @@
 
 	public final static String VISITOR_LIST = "queryVisitor/v_list.do";
 
+	public static final String CHECK_IN_ADD = "Person/o_add.do";
+
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml
index e76c681..d63f576 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml
@@ -15,24 +15,52 @@
                 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/ic_launcher"/>
+                    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/ic_launcher"/>
+                    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/ic_launcher"/>
+                    android:src="@mipmap/visitor_register_save"/>
+                    -->
+                    <TextView
+                        android:id="@+id/visitor_register_print"
+                        android:layout_width="40dp"
+                        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_register_add"
+                        android:layout_width="40dp"
+                        android:layout_height="36dp"
+                        android:gravity="center"
+                        android:layout_marginLeft="10dp"
+                        android:textColor="@android:color/white"
+                        android:background="@drawable/main_btn_bcg"
+                        android:text="娣诲姞"/>
+                    <TextView
+                        android:id="@+id/visitor_register_save"
+                        android:layout_width="40dp"
+                        android:layout_height="36dp"
+                        android:gravity="center"
+                        android:layout_marginLeft="10dp"
+                        android:textColor="@android:color/white"
+                        android:background="@drawable/main_btn_bcg"
+                        android:text="淇濆瓨"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="wrap_content"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_add.png b/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_add.png
new file mode 100644
index 0000000..242d0cb
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_add.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_print.png b/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_print.png
new file mode 100644
index 0000000..a748461
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_print.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_save.png b/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_save.png
new file mode 100644
index 0000000..677a851
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_save.png
Binary files differ

--
Gitblit v1.8.0