xuxiuxi
2017-03-28 64ce5f7d063be31197208edd928b2a4e5c6e3dc2


git-svn-id: http://192.168.1.226/svn/proxy@215 454eff88-639b-444f-9e54-f578c98de674
3个文件已添加
1 文件已重命名
6个文件已修改
107 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/RegisterMng.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_add.png 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_print.png 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_save.png 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/RegisterMng.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.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() {
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();
            }
        });
    }
    /**
     * 查询拜访事由列表
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);
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
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());
    }
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";
}
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"
VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_add.png
VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_print.png
VisitFace/DemoForBsk/app/src/main/res/mipmap-xxhdpi/visitor_register_save.png