xuxiuxi
2017-04-19 05a02b8f7f7ab29f596a628ad7533d39ee36baeb


git-svn-id: http://192.168.1.226/svn/proxy@484 454eff88-639b-444f-9e54-f578c98de674
4个文件已修改
48 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
@@ -24,6 +24,10 @@
         */
        public static final String visitReasonId = "visitReasonId";
        /**
         * 访问事由主键
         */
        public static final String visitReason = "visitReason";
        /**
         * 访问备注
         */
        public static final String remark = "remark";
@@ -67,6 +71,8 @@
    // 访问事件主键
    private String visitId;
    // 访问事由主键
    private String visitReason;
    // 访问事由主键
    private String visitReasonId;
    // 访问备注
@@ -266,4 +272,13 @@
             ",visiteeCompanyId ="+ visiteeCompanyId +  ",最新的访问状态 ="+ currentStateId +  ",当前访问的警告状态 ="+ warning   
            ;
    }
    public String getVisitReason() {
        return visitReason;
    }
    public void setVisitReason(String visitReason) {
        this.visitReason = visitReason;
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -168,6 +168,7 @@
        }
        RequestParams params = new RequestParams();
        params.addBodyParameter(Visit.FieldNames.visitReasonId, DictionaryMng.getInstance().getId(fragment_check_in_right_visitor_reason.getText().toString()));
        params.addBodyParameter(Visit.FieldNames.visitReason, fragment_check_in_right_visitor_reason.getText().toString());
        params.addBodyParameter(Visit.FieldNames.remark, fragment_check_in_right_remark.getText().toString());
        params.addBodyParameter(Visit.FieldNames.visitorId, visitor.getRegisterId());
        params.addBodyParameter(Visit.FieldNames.visiteeId, interviewee.getRegisterId());
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
@@ -40,6 +40,17 @@
        return instance;
    }
    @OnClick(R.id.fragment_device_left_wifi_relative_layout)
    public void fragment_device_left_wifi_relative_layout_click(View view) { fragment_device_left_wifi_check_box_click(view); }
    @OnClick(R.id.fragment_device_left_lan_relative_layout)
    public void fragment_device_left_lan_relative_layout_click(View view) { fragment_device_left_lan_check_box_click(view); }
    @OnClick(R.id.fragment_device_left_school_relative_layout)
    public void fragment_device_left_school_relative_layout_click(View view) { fragment_device_left_school_check_box_click(view); }
    @OnClick(R.id.fragment_device_left_camera1_relative_layout)
    public void fragment_device_left_camera1_relative_layout_click(View view) { fragment_device_left_camera1_check_box_click(view); }
    @OnClick(R.id.fragment_device_left_camera2_relative_layout)
    public void fragment_device_left_camera2_relative_layout_click(View view) { fragment_device_left_camera2_check_box_click(view); }
    public void clearAll() {
        fragment_device_left_wifi_check_box.setChecked(false);
        fragment_device_left_lan_check_box.setChecked(false);
@@ -87,10 +98,19 @@
        MainActivity.selectPage(0);
    }
    @OnClick(R.id.fragment_device_left_wifi_relative_layout)
    public void fragment_device_left_wifi_relative_layout_click(View view) {
        Toast.makeText(MainActivity.getInstance(), "eh", Toast.LENGTH_SHORT).show();
        fragment_device_left_wifi_check_box.setChecked(!fragment_device_left_wifi_check_box.isSelected());
    @OnClick(R.id.fragment_device_right_delete)
    public void fragment_device_right_delete_click(View view) {
    }
    @OnClick(R.id.fragment_device_right_add)
    public void fragment_device_right_add_click(View view) {
    }
    @OnClick(R.id.fragment_device_right_save)
    public void fragment_device_right_save_click(View view) {
    }
}
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
@@ -12,7 +12,6 @@
        android:layout_centerVertical="true"
        android:textColor="#8BD2F6"
        />
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
@@ -83,7 +82,6 @@
                android:layout_height="wrap_content"
                android:id="@+id/fragment_device_left_lan_relative_layout"
                >
                <RadioButton
                    android:id="@+id/fragment_device_left_lan_check_box"
                    android:layout_centerVertical="true"
@@ -121,7 +119,6 @@
                android:layout_height="wrap_content"
                android:id="@+id/fragment_device_left_school_relative_layout"
                >
                <RadioButton
                    android:id="@+id/fragment_device_left_school_check_box"
                    android:layout_centerVertical="true"
@@ -166,7 +163,6 @@
                android:layout_height="wrap_content"
                android:id="@+id/fragment_device_left_camera1_relative_layout"
                >
                <RadioButton
                    android:id="@+id/fragment_device_left_camera1_check_box"
                    android:layout_centerVertical="true"