xuxiuxi
2017-04-01 25aa12643351c69b3a5afff481aa29583acf1472


git-svn-id: http://192.168.1.226/svn/proxy@321 454eff88-639b-444f-9e54-f578c98de674
1个文件已删除
1个文件已添加
2 文件已重命名
2个文件已修改
71 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitLeftAdapter.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_time_row.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitLeftAdapter.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/VisitAdapter.java
@@ -6,16 +6,11 @@
import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter;
import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder;
/**
 * Created by Sinoe on 2017/2/23.
 */
public class VisitAdapter extends EasyRecyclerViewAdapter {
    private CheckBox mCheckBox;
public class VisitLeftAdapter extends EasyRecyclerViewAdapter {
    private int oldPosition,newPosition;
    @Override
    public int[] getItemLayouts() {
        return new int[]{R.layout.fragment_visit_left_time_row,R.layout.fragment_visit_left_row};
        return new int[]{R.layout.fragment_visit_left_date_row,R.layout.fragment_visit_left_person_row};
    }
    @Override
@@ -59,12 +54,12 @@
     * @param position
     */
    private void InfoViewHolder(EasyRecyclerViewHolder viewHolder,int position){
        mCheckBox = viewHolder.findViewById(R.id.item_visitor_info_check);
        CheckBox fragment_visit_left_person_row_check_box = viewHolder.findViewById(R.id.fragment_visit_left_person_row_check_box);
        if (position ==oldPosition){
            mCheckBox.setChecked(false);
            fragment_visit_left_person_row_check_box.setChecked(false);
        }
        if (position == newPosition){
            mCheckBox.setChecked(true);
            fragment_visit_left_person_row_check_box.setChecked(true);
        }
    }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
@@ -7,7 +7,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.adapter.AttendanceAdapter;
import cn.com.basic.face.adapter.VisitAdapter;
import cn.com.basic.face.adapter.VisitLeftAdapter;
import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.base.MainActivity;
@@ -23,7 +23,7 @@
    private View mViewLeft,mViewRight;
    private EasyRecyclerView mRightRecyclerView,mLeftRecyclerView;
    private AttendanceAdapter mRightAdapter;
    private VisitAdapter mLeftAdapter;
    private VisitLeftAdapter mLeftAdapter;
    public static AttendanceFragment newInstance(){
        return new AttendanceFragment();
    }
@@ -33,7 +33,7 @@
        mLeftRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_manager_recycler);
        LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);
        mLeftRecyclerView.setLayoutManager(manager);
        mLeftAdapter = new VisitAdapter();
        mLeftAdapter = new VisitLeftAdapter();
        ViewUtils.inject(this, mViewLeft);
        return mViewLeft;
    }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
@@ -8,7 +8,7 @@
import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.adapter.VisitAdapter;
import cn.com.basic.face.adapter.VisitLeftAdapter;
import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.base.MainActivity;
@@ -29,7 +29,7 @@
    private LinearLayout mRowLayout1,mRowLayout2,mRowLayout3,mRowLayout4,mRowLayout5,mRowLayout6,mRowLayout7;
    private TextView mRow1TextViewLeft,mRow1TextViewRight,mRow2TextViewLeft,mRow2TextViewRight,mRow3TextViewLeft,mRow3TextViewRight,mRow4TextViewLeft,mRow4TextViewRight,
    mRow5TextViewLeft,mRow5TextViewRight,mRow6TextViewLeft,mRow6TextViewRight,mRow7TextViewLeft,mRow7TextViewRight;
    private VisitAdapter mAdapter;
    private VisitLeftAdapter mAdapter;
    private EasyRecyclerView mRecyclerView;
    private int mOldPosition = 0,mNewPosition = 0;
    public static VisitFragment newInstance(){
@@ -41,7 +41,7 @@
        mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_manager_recycler);
        LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);
        mRecyclerView.setLayoutManager(manager);
        mAdapter = new VisitAdapter();
        mAdapter = new VisitLeftAdapter();
        ViewUtils.inject(this, mViewLeft);
        return mViewLeft;
    }
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml
New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical" android:layout_width="match_parent"
    android:layout_height="match_parent">
<TextView
android:id="@+id/fragment_visit_left_date_row_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"
android:background="@color/colorBackground"
android:padding="22dp"
android:text=""/>
    </LinearLayout>
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml
File was renamed from VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_row.xml
@@ -11,37 +11,37 @@
        android:paddingBottom="15dp"
        android:layout_marginLeft="24dp">
        <CheckBox
            android:id="@+id/item_visitor_info_check"
            android:id="@+id/fragment_visit_left_person_row_check_box"
            android:layout_centerVertical="true"
            android:clickable="false"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />
        <TextView
            android:id="@+id/item_visitor_info_name"
            android:id="@+id/fragment_visit_left_person_row_name"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_toRightOf="@id/item_visitor_info_check"
            android:layout_toRightOf="@id/fragment_visit_left_person_row_check_box"
            android:layout_marginLeft="12dp"
            android:textColor="@color/colorText_5"
            android:text="阿尔法"
            android:text=""
            android:textSize="@dimen/text_size_normal"/>
        <ImageView
            android:id="@+id/item_visitor_info_right_icon"
            android:id="@+id/fragment_visit_left_person_row_photo"
            android:layout_width="30dp"
            android:layout_height="15dp"
            android:layout_centerVertical="true"
            android:layout_alignParentRight="true"
            android:src="@mipmap/ic_launcher"/>
        <TextView
            android:id="@+id/item_visitor_info_state"
            android:id="@+id/fragment_visit_left_person_row_status"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_toLeftOf="@id/item_visitor_info_right_icon"
            android:layout_toLeftOf="@id/fragment_visit_left_person_row_photo"
            android:layout_marginRight="@dimen/view_size_10"
            android:textColor="@color/colorText_5"
            android:text="正在访问"
            android:text=""
            android:textSize="@dimen/text_size_normal"/>
    </RelativeLayout>
    <View
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_time_row.xml
File was deleted