xuxiuxi
2017-03-31 370f1eb822076137e3bae53e2e36451c977c8834


git-svn-id: http://192.168.1.226/svn/proxy@297 454eff88-639b-444f-9e54-f578c98de674
1个文件已删除
4 文件已重命名
4个文件已修改
415 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/BirthdayPickerDialog.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SingleSelectionDialog.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/MyGLSurfaceView.java 356 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/BirthdayPickerDialog.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/BirthdayPickerDialog.java
@@ -1,4 +1,4 @@
package cn.com.basic.face.widget;
package cn.com.basic.face.dialog;
import android.app.AlertDialog;
import android.app.DatePickerDialog;
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionDialog.java
@@ -1,4 +1,4 @@
package cn.com.basic.face.widget;
package cn.com.basic.face.dialog;
import android.content.Context;
import android.graphics.Color;
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SingleSelectionDialog.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionDialog.java
@@ -1,4 +1,4 @@
package cn.com.basic.face.widget;
package cn.com.basic.face.dialog;
import android.content.Context;
import android.graphics.Color;
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitReasonDialog.java
@@ -1,4 +1,4 @@
package cn.com.basic.face.widget;
package cn.com.basic.face.dialog;
import android.content.Context;
import android.graphics.Color;
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -20,7 +20,7 @@
import cn.com.basic.face.widget.CheckInIntervieweeCell;
import cn.com.basic.face.widget.CheckInLeftListView;
import cn.com.basic.face.widget.CheckInRightVisitorCell;
import cn.com.basic.face.widget.VisitReasonDialog;
import cn.com.basic.face.dialog.VisitReasonDialog;
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -9,10 +9,8 @@
import android.view.Gravity;
import android.view.View;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
@@ -20,15 +18,14 @@
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.RegisterMng;
import cn.com.basic.face.service.VisitorTypeMng;
import cn.com.basic.face.listeners.OkButtonClickedListener;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.widget.BirthdayPickerDialog;
import cn.com.basic.face.widget.CountrySelectionDialog;
import cn.com.basic.face.dialog.BirthdayPickerDialog;
import cn.com.basic.face.dialog.CountrySelectionDialog;
import cn.com.basic.face.widget.RegisterRightFieldLabelView;
import cn.com.basic.face.widget.RegisterRightFieldTextView;
import cn.com.basic.face.widget.SingleSelectionDialog;
import cn.com.basic.face.dialog.SingleSelectionDialog;
import com.facebook.drawee.view.SimpleDraweeView;
import com.lidroid.xutils.ViewUtils;
@@ -46,9 +43,6 @@
import cn.com.basic.face.discern.entity.Person;
import cn.com.basic.face.discern.entity.VisitPersonType;
/**
 * Created by Administrator on 2017/2/20 0020.
 */
public class RegisterFragment extends BaseFragment implements View.OnClickListener{
    @ViewInject(R.id.register_name)
@@ -189,19 +183,11 @@
        });
    }
    /**
     * 选择人物快照
     * @param view
     */
    @OnClick(R.id.fragment_register_choose_photo)
    public void fragment_register_choose_photo_click(View view) {
        Toast.makeText(getActivity(), "选择人物快照", Toast.LENGTH_SHORT).show();
    }
    /**
     * 点击上传图片
     * @param view
     */
    @OnClick(R.id.fragment_register_update__photo)
    public void fragment_register_update__photo_click(View view) {
        Intent intent = new Intent();
@@ -213,6 +199,11 @@
    @OnClick(R.id.fragment_register_back)
    public void back(View view) {
        MainActivity.selectPage(0);
    }
    @OnClick(R.id.fragment_register_idcard_photo)
    public void identityPhoto(View view) {
        Toast.makeText(getActivity(), "证件快照", Toast.LENGTH_SHORT).show();
    }
    public void setVisitorTypeList(List visitorTypeList) {
@@ -251,19 +242,11 @@
        }
    }
    /**
     * 证件快照
     * @param view
     */
    @OnClick(R.id.fragment_register_idcard_photo)
    public void identityPhoto(View view) {
        Toast.makeText(getActivity(), "证件快照", Toast.LENGTH_SHORT).show();
    }
    @Override
    public void onClick(View v) {}
    public void setRegisterInfo(CheckInQueryItem item) {
        fragment_register_choose_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath()));
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/MyGLSurfaceView.java
File was deleted
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java
@@ -5,10 +5,6 @@
import android.view.KeyEvent;
import android.widget.EditText;
/**
 * Created by xiuxi on 2017/3/29.
 */
public class SearchEditText extends EditText {
    public SearchEditText(Context context) {
        super(context);
@@ -19,8 +15,7 @@
    }
    @Override
    public boolean onKeyDown(int keyCode, KeyEvent event)
    {
    public boolean onKeyDown(int keyCode, KeyEvent event) {
        if (keyCode==KeyEvent.KEYCODE_ENTER) {
            return true;
        }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java
@@ -13,15 +13,9 @@
import java.util.ArrayList;
import java.util.List;
import cn.com.basic.face.adapter.CheckInLeftListViewAdapter;
import cn.com.basic.face.adapter.SupervisoryBottomListViewAdapter;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.WindowsUtil;
/**
 * Created by xiuxi on 2017/3/31.
 */
public class SupervisoryBottomListView extends EasyRecyclerView {
@@ -73,7 +67,6 @@
    }
    public void show(List list, boolean isVisitorList) {
        //mAdapter.setRowType(isVisitorList? Constant.CheckIn.VISITOR_ROW:Constant.CheckIn.INTERVIEWEE_ROW);
        refresh(list);
    }