From c2807d4a1d6152c7eb429b3dc1141034ae0c82ac Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 08 五月 2017 12:56:36 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 22 ++++++++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java | 13 ++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java | 23 ++++++++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java | 10 ++--
5 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java
index e2eb339..b63b597 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java
@@ -23,6 +23,8 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
public class CountryDialog extends PopupWindow implements WheelView.OnWheelItemSelectedListener {
@@ -61,9 +63,25 @@
dismiss();
}
- public CountryDialog(View parentView, OkClickedListener okButtonClickedListener) {
+ public CountryDialog(View parentView, OkClickedListener okButtonClickedListener, String defaultValue) {
view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_country, null);
ViewUtils.inject(this, view);
+
+ if (defaultValue != null && !"".equals(defaultValue)) {
+ for (int i = 0; i < uniqueFirstLetterList.size(); i++) {
+ String firstLetter = uniqueFirstLetterList.get(i);
+ int j = 0;
+ for(String countryName : countriesGroupByFirstLetter.get(firstLetter)) {
+ if (defaultValue.equals(countryName)) {
+ dialog_country_name_first_letter.setSelection(i);
+ dialog_country_name.setSelection(j);
+ break;
+ }
+ j++;
+ }
+ }
+
+ }
this.countriesWithSameFirstLetter = countriesGroupByFirstLetter.get(uniqueFirstLetterList.get(dialog_country_name_first_letter.getSelection()));
@@ -80,7 +98,8 @@
dialog_country_name_first_letter.setBackgroundResource(R.color.colorBackground);
dialog_country_name_first_letter.setStyle(wheelViewStyle);
- dialog_country_name_first_letter.setSelection(4);
+
+ //dialog_country_name_first_letter.setSelection(4);
dialog_country_name.setWheelAdapter(new SelectDialog.WheelAdapter(MainActivity.getInstance()));
dialog_country_name.setSkin(WheelView.Skin.Holo);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
index a472ff4..47cac1d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
@@ -63,7 +63,7 @@
SelectDialog.idTypeList = idTypeList;
}
- public SelectDialog(View parentView, int type, OkClickedListener okButtonClickedListener) {
+ public SelectDialog(View parentView, int type, OkClickedListener okButtonClickedListener, String defaultValue) {
this.parentView = parentView;
View view = LayoutInflater.from(MainActivity.getInstance()).inflate(R.layout.dialog_select,null);
ViewUtils.inject(this, view);
@@ -84,6 +84,17 @@
dialog_select_list_view.setSkin(WheelView.Skin.Holo);
if (list != null && list.size() > 0) {
dialog_select_list_view.setWheelData(list);
+ Object itemObj = list.get(0);
+ if (itemObj instanceof String && defaultValue != null && !"".equals(defaultValue)) {
+ int selected = 0;
+ for (int i = 0; i < list.size(); i++) {
+ if (defaultValue.equals(list.get(i))) {
+ selected = i;
+ break;
+ }
+ }
+ dialog_select_list_view.setSelection(selected);
+ }
}
dialog_select_list_view.setWheelSize(5);
dialog_select_list_view.setBackgroundResource(R.color.colorBackground);
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 cf8e794..3f0f792 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
@@ -204,7 +204,7 @@
public void onSelected(String value) {
fragment_check_in_right_visitor_reason.setText(value);
}
- });
+ }, fragment_check_in_right_visitor_reason.getText().toString());
// fragment_check_in_right_visitor_reason.setFocusable(false);
// fragment_check_in_right_visitor_reason.setClickable(false);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
index c39ace0..ced6efd 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
@@ -265,7 +265,7 @@
public void onSelected(String value) {
fragment_device_right_camera1_brand.setText(value);
}
- });
+ },fragment_device_right_camera1_brand.getText().toString());
}
@OnClick(R.id.fragment_device_right_camera2_brand_more)
@@ -274,7 +274,7 @@
public void onSelected(String value) {
fragment_device_right_camera2_brand.setText(value);
}
- });
+ },fragment_device_right_camera2_brand.getText().toString());
}
@OnClick(R.id.fragment_device_right_camera1_resolution_more)
@@ -283,7 +283,7 @@
public void onSelected(String value) {
fragment_device_right_camera1_resolution.setText(value);
}
- });
+ },fragment_device_right_camera1_resolution.getText().toString());
}
@OnClick(R.id.fragment_device_right_camera2_resolution_more)
@@ -292,7 +292,7 @@
public void onSelected(String value) {
fragment_device_right_camera2_resolution.setText(value);
}
- });
+ },fragment_device_right_camera2_resolution.getText().toString());
}
@OnClick(R.id.fragment_device_right_lan_protocol_more)
@@ -301,7 +301,7 @@
public void onSelected(String value) {
fragment_device_right_lan_protocol.setText(value);
}
- });
+ },fragment_device_right_lan_protocol.getText().toString());
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
index 1059533..161d799 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -45,6 +45,7 @@
import org.xutils.http.RequestParams;
import java.io.ByteArrayOutputStream;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -368,7 +369,7 @@
public void onSelected(String value) {
fragment_register_country.setValue(value);
}
- });
+ },fragment_register_country.getValue());
}
//@OnClick(R.id.fragment_register_gender)
@@ -377,17 +378,28 @@
public void onSelected(String value) {
fragment_register_gender.setValue(value);
}
- });
+ }, fragment_register_gender.getValue());
}
//@OnClick(R.id.fragment_register_birthday)
public void fragment_register_birthday_click(View view) {
+ String birthdayStr = fragment_register_birthday.getValue();
+ Date birthday = new Date();
+ if (birthdayStr != null && !"".equals(birthdayStr)) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ birthday = sdf.parse(birthdayStr);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
new DateSelectDialog(
new OkClickedListener(){
public void onSelected(String value) {
fragment_register_birthday.setValue(value);
}
- },new Date());
+ }, birthday);
}
//@OnClick(R.id.fragment_register_visitor_class)
@@ -396,7 +408,7 @@
public void onSelected(String value) {
fragment_register_visitor_class.setValue(value);
}
- });
+ }, fragment_register_visitor_class.getValue());
}
//@OnClick(R.id.fragment_register_id_class)
@@ -405,7 +417,7 @@
public void onSelected(String value) {
fragment_register_id_class.setValue(value);
}
- });
+ }, fragment_register_id_class.getValue());
}
@OnClick(R.id.fragment_register_back)
--
Gitblit v1.8.0