xuxiuxi
2017-06-30 87573f233c30ad88495d62d39474dc1893484c0f


git-svn-id: http://192.168.1.226/svn/proxy@676 454eff88-639b-444f-9e54-f578c98de674
6个文件已修改
45 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/drawable/circle.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -1,6 +1,7 @@
package cn.com.basic.face.adapter;
import android.content.Context;
import android.graphics.Color;
import android.net.Uri;
import android.view.View;
import android.view.ViewGroup;
@@ -51,7 +52,6 @@
                        break;
                }
            }
        }
        @Override
@@ -90,20 +90,16 @@
                    fragment_home_bottom_register_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE +item.getImagePath()));
                } else {
                    if (item.getBitmap() != null) {
                        //fragment_home_bottom_register_cell_photo.setImageResource(R.drawable.u45);
                        fragment_home_bottom_register_cell_photo.setImageBitmap(item.getBitmap());
//                        fragment_home_bottom_register_cell_photo.setImageBitmap(BitmapUtil.getRoundedCornerBitmap(item.getBitmap(),
//                                (int)MainActivity.getInstance().getResources().getDimension(R.dimen.w10dp)));
                    } else {
                        fragment_home_bottom_register_cell_photo.setImageResource(R.drawable.u45);
                    }
                }
                fragment_home_bottom_register_cell_to_register.setOnClickListener(new View.OnClickListener(){
                fragment_home_bottom_register_cell_photo.setOnClickListener(new View.OnClickListener(){
                    @Override
                    public void onClick(View view) {
                        MainActivity.selectPage(1);
//                        RegisterFragment.getInstance().setRegisterInfo(getVo(item));//java.lang.OutOfMemoryError: Failed to allocate a 25338980 byte allocation with 15827186 free bytes and 15MB until OOM
                        if(item.getBitmap() != null) {
                            RegisterFragment.getInstance().setChoosePhoto(item.getBitmap());
                            RegisterFragment.getInstance().setSurveillanceQueryItem_selectPhoto(item);
@@ -177,10 +173,8 @@
                    }
                }
                if (1==1) {
                    fragment_home_bottom_visitor_cell_status.setBackground(context.getDrawable(R.drawable.rectangle_textview));
                    fragment_home_bottom_visitor_cell_status.setHeight((int)(context.getResources().getDisplayMetrics().density * 45));
                    fragment_home_bottom_visitor_cell_status.setOnClickListener(new View.OnClickListener(){
                    fragment_home_bottom_visitor_cell_photo.setOnClickListener(new View.OnClickListener(){
                        @Override
                        public void onClick(View view) {
                            MainActivity.selectPage(Constant.TabType.CHECK_IN);
@@ -188,9 +182,12 @@
                                    getFragment_check_in_right_visitor_cell()
                                    .setVisitorInfo(getVo(item));
                            if (item.getBitmap() != null && (item.getImagePath() == null || "".equals(item.getImagePath()))) {
//                                cn.com.basic.face.fragment.CheckInFragment.getInstance().
//                                        getFragment_check_in_right_visitor_cell().setPhoto(item.getBitmap());
                                cn.com.basic.face.fragment.CheckInFragment.getInstance().
                                        getFragment_check_in_right_visitor_cell().setPhoto(item.getBitmap());
                                        getFragment_check_in_right_visitor_cell().setPhotoUri(Uri.parse(AppApi.IMAGE_URL_BASE +item.getSurveillancePhoto()));
                            }
                            cn.com.basic.face.fragment.CheckInFragment.getInstance().selectVisiteeRadio();
                        }
                    });
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -159,6 +159,11 @@
        }
    }
    public void selectVisiteeRadio() {
        fragment_check_in_left_interviewee_radio.callOnClick();
        fragment_check_in_left_interviewee_radio.setChecked(true);
    }
    @Override
    public void setMenuVisibility(boolean menuVisible) {
        super.setMenuVisibility(menuVisible);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -618,7 +618,7 @@
    @Override
    protected void initData() {
        resetForm();
        readIdCard();
        //readIdCard();
    }
    public void readIdCard() {
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java
@@ -78,6 +78,11 @@
        fragment_check_in_right_visitor_cell_photo_placeholder.setVisibility(INVISIBLE);
    }
    public void setPhotoUri(Uri uri) {
        fragment_check_in_right_visitor_cell_photo.setImageURI(uri);
        fragment_check_in_right_visitor_cell_photo_placeholder.setVisibility(INVISIBLE);
    }
    public CheckInQueryItem getVisitor() {
        return item;
    }
VisitFace/DemoForBsk/app/src/main/res/drawable/circle.xml
@@ -1,7 +1,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#F6335A" />
<solid android:color="#40F6335A" />
<size
    android:height="@dimen/w45dp"
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
@@ -42,11 +42,13 @@
        android:visibility="visible"
        />
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_width="@dimen/w122dp"
        android:layout_height="@dimen/h35dp"
        android:layout_alignParentBottom="true"
        android:visibility="gone"
        android:paddingBottom="@dimen/h15dp"
        android:visibility="visible"
        android:paddingBottom="@dimen/h7dp"
        android:paddingRight="@dimen/w7dp"
        android:paddingLeft="@dimen/w7dp"
        >
        <TextView
            android:id="@+id/fragment_home_bottom_visitor_cell_name"
@@ -54,7 +56,7 @@
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:text=""
            android:textSize="@dimen/w12dp"
            android:textSize="@dimen/w10dp"
            android:background="#40000000"
            android:gravity="center"
            android:textColor="@android:color/white"/>
@@ -68,8 +70,8 @@
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:text="来访登记"
            android:background="#40000000"
            android:textSize="@dimen/w12dp"
            android:background="#40F6335A"
            android:textSize="@dimen/w10dp"
            android:gravity="center"
            android:textColor="@android:color/white"/>
    </LinearLayout>