From a691c82c836ede72bb8b4ec8813826b3d2d1e3fc Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 17:27:47 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/drawable/u38.png | 0
VisitFace/DemoForBsk/app/src/main/res/drawable/u36.png | 0
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml | 50 ++++++++++++++++++-------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 7 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 40 +++++++++++++++++--
5 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index ebdad56..cf8e794 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -1,13 +1,14 @@
package cn.com.basic.face.fragment;
+import android.content.Context;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
+import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
-import android.widget.TextView;
import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
@@ -32,9 +33,7 @@
import org.xutils.http.RequestParams;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Visit;
@@ -60,7 +59,7 @@
@ViewInject(R.id.fragment_check_in_right_remark)
private EditText fragment_check_in_right_remark;
@ViewInject(R.id.fragment_check_in_right_visitor_reason)
- private TextView fragment_check_in_right_visitor_reason;
+ private EditText fragment_check_in_right_visitor_reason;
@ViewInject(R.id.fragment_check_in_left_search_edit_text)
private EditText fragment_check_in_left_search_edit_text;
@ViewInject(R.id.fragment_check_in_left_visitor_radio)
@@ -192,13 +191,44 @@
//fragment_check_in_right_visitor_reason_click(view);
}
- @OnClick(R.id.fragment_check_in_right_visitor_reason)
+ //@OnClick(R.id.fragment_check_in_right_visitor_reason)
public void fragment_check_in_right_visitor_reason_click(View view) {
+
+ }
+ @OnClick(R.id.fragment_check_in_right_visitor_reason_more)
+ public void fragment_check_in_right_visitor_reason_more_click(View view) {
+ InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(
+ Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(fragment_check_in_right_visitor_reason.getWindowToken(), 0);
new SelectDialog(getView(), Constant.DialogSelectType.VISIT_REASON, new OkClickedListener() {
public void onSelected(String value) {
fragment_check_in_right_visitor_reason.setText(value);
}
});
+// fragment_check_in_right_visitor_reason.setFocusable(false);
+// fragment_check_in_right_visitor_reason.setClickable(false);
+ }
+
+ @OnClick(R.id.fragment_check_in_right_parent)
+ public void fragment_check_in_right_linear_layout_click(View view) {
+ InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(
+ Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(fragment_check_in_right_visitor_reason.getWindowToken(), 0);
+ }
+
+ @OnClick(R.id.fragment_check_in_left_parent)
+ public void fragment_check_in_left_parent_click(View view) {
+ InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(
+ Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(fragment_check_in_right_visitor_reason.getWindowToken(), 0);
+ }
+
+ @OnClick(R.id.fragment_check_in_right_visitor_reason_edit)
+ public void fragment_check_in_right_visitor_reason_edit_click(View view) {
+ fragment_check_in_right_visitor_reason.setFocusableInTouchMode(true);
+ fragment_check_in_right_visitor_reason.requestFocus();
+ InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
}
public void checkInFromHomePage(CheckInQueryItem item) {
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/u36.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/u36.png
new file mode 100644
index 0000000..de2e520
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/u36.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/u38.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/u38.png
new file mode 100644
index 0000000..a91240c
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/u38.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
index 79c473d..2d33c8b 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
@@ -1,7 +1,8 @@
<?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">
+ android:layout_height="match_parent"
+ >
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -9,7 +10,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:id="@+id/fragment_check_in_right_parent"
+ >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/h76dp"
@@ -78,7 +81,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/h20dp"
android:orientation="vertical">
-
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -88,17 +90,37 @@
android:text="@string/visitor_reason"
android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
/>
- <TextView
- android:id="@+id/fragment_check_in_right_visitor_reason"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@null"
- android:layout_marginTop="@dimen/h15dp"
- android:layout_marginBottom="@dimen/h12dp"
- android:text=""
- android:textSize="@dimen/w14dp"
- android:textColor="@color/colorText_b"
- />
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <EditText
+ android:id="@+id/fragment_check_in_right_visitor_reason"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:textSize="@dimen/w14dp"
+ android:textColor="@color/colorText_b"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u36"
+ android:id="@+id/fragment_check_in_right_visitor_reason_edit"
+ android:layout_alignParentRight="true"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u38"
+ android:id="@+id/fragment_check_in_right_visitor_reason_more"
+ android:layout_toLeftOf="@id/fragment_check_in_right_visitor_reason_edit"
+ android:layout_marginRight="@dimen/w10dp"
+ />
+ </RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
index b1d48be..d85f02b 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
@@ -1,7 +1,9 @@
<?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">
+ android:layout_height="match_parent"
+ android:id="@+id/fragment_check_in_left_parent"
+ >
<TextView
android:id="@+id/fragment_device_back"
android:layout_width="wrap_content"
@@ -17,7 +19,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorSearch"
- android:orientation="vertical">
+ android:orientation="vertical"
+ >
<EditText
android:id="@+id/fragment_device_left_search"
android:layout_width="match_parent"
--
Gitblit v1.8.0