From 241c4cc951eb207520d9e7b3da29f3369c72ea11 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 03 五月 2017 18:10:53 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 4
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/DateSelectDialog.java | 6 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/DatePickerUtil.java | 131 +++++++++++++++++++++++++++++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java | 2
VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml | 2
VisitFace/DemoForBsk/app/src/main/res/layout/dialog_add.xml | 9 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java | 16 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml | 5 +
8 files changed, 157 insertions(+), 18 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
index 4d668d8..a51ab8b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceFragment.java
@@ -93,11 +93,11 @@
@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(item);
- //}
+ 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(item);
+ }
}
});
}
@@ -172,9 +172,9 @@
@Override
public void onClick(View view) {
MainActivity.selectPage(Constant.TabType.CHECK_IN);
-// cn.com.basic.face.fragment.CheckInFragment.getInstance().
-// getFragment_check_in_right_visitor_cell()
-// .setVisitorInfo(getVo(item));
+ cn.com.basic.face.fragment.CheckInFragment.getInstance().
+ 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());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/DateSelectDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/DateSelectDialog.java
index 595644e..c8e46ce 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/DateSelectDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/DateSelectDialog.java
@@ -1,11 +1,14 @@
package cn.com.basic.face.dialog;
import android.app.AlertDialog;
+import android.content.res.Resources;
import android.graphics.Color;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.DatePicker;
+import android.widget.EditText;
import com.bsk.zhangbo.demoforbsk.R;
import com.lidroid.xutils.ViewUtils;
@@ -18,6 +21,7 @@
import java.util.Locale;
import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.util.DatePickerUtil;
import cn.com.basic.face.util.OkClickedListener;
public class DateSelectDialog extends AlertDialog implements
@@ -38,6 +42,8 @@
calendar.setTime(date);
dialog_date_select_date_picker.init(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), this);
+ //DatePickerUtil.setFont(MainActivity.getInstance(), dialog_date_select_date_picker);
+
show();
setContentView(view);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index c9efe5a..2286421 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -61,7 +61,7 @@
if (i < bitmapList.size()) {
SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
item.setBitmap(surveillanceQueryItem.getBitmap());
-// item.setBase64Image(surveillanceQueryItem.getBase64Image());
+ item.setBase64Image(surveillanceQueryItem.getBase64Image());
item.setWidth(surveillanceQueryItem.getWidth());
item.setHeight(surveillanceQueryItem.getHeight());
}
@@ -71,7 +71,7 @@
if (i < bitmapList.size()) {
SurveillanceQueryItem surveillanceQueryItem = bitmapList.get(i);
item.setBitmap(surveillanceQueryItem.getBitmap());
-// item.setBase64Image(surveillanceQueryItem.getBase64Image());
+ item.setBase64Image(surveillanceQueryItem.getBase64Image());
item.setWidth(surveillanceQueryItem.getWidth());
item.setHeight(surveillanceQueryItem.getHeight());
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/DatePickerUtil.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/DatePickerUtil.java
new file mode 100644
index 0000000..8ad975d
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/DatePickerUtil.java
@@ -0,0 +1,131 @@
+package cn.com.basic.face.util;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.view.View;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.NumberPicker;
+import android.widget.TextView;
+
+import com.bsk.zhangbo.demoforbsk.R;
+
+import java.lang.reflect.Field;
+
+import cn.com.basic.face.base.MainActivity;
+
+public class DatePickerUtil {
+
+ public static void setFont(Activity activity, DatePicker datepicker) {
+ if (android.os.Build.VERSION.SDK_INT >= 20)
+ initLollipop(activity, datepicker);
+ else if (android.os.Build.VERSION.SDK_INT >= 14)
+ initKitkat(activity, datepicker);
+ }
+
+ private static void initLollipop(Activity activity, DatePicker datepicker) {
+ try {
+
+ Field delegateField = datepicker.getClass().getDeclaredField(
+ "mDelegate");
+ delegateField.setAccessible(true);
+ Object delegate = new Object();
+ delegate = delegateField.get(datepicker);
+
+ Field field = delegate.getClass().getDeclaredField("mDaySpinner");
+ setFont(activity, delegate, field);
+ field = delegate.getClass().getDeclaredField("mMonthSpinner");
+ setFont(activity, delegate, field);
+ field = delegate.getClass().getDeclaredField("mYearSpinner");
+ setFont(activity, delegate, field);
+ setFontEditText(activity, delegate, delegate.getClass()
+ .getDeclaredField("mDaySpinnerInput"));
+ setFontEditText(activity, delegate, delegate.getClass()
+ .getDeclaredField("mMonthSpinnerInput"));
+ setFontEditText(activity, delegate, delegate.getClass()
+ .getDeclaredField("mYearSpinnerInput"));
+
+ } catch (SecurityException e) {
+ } catch (IllegalArgumentException e) {
+ } catch (IllegalAccessException e) {
+ } catch (Exception e) {
+ }
+ }
+
+ private static void initKitkat(Activity activity, DatePicker datepicker) {
+ try {
+ Field field = datepicker.getClass().getDeclaredField("mDaySpinner");
+ setFont(activity, datepicker, field);
+ field = datepicker.getClass().getDeclaredField("mMonthSpinner");
+ setFont(activity, datepicker, field);
+ field = datepicker.getClass().getDeclaredField("mYearSpinner");
+ setFont(activity, datepicker, field);
+ setFontEditText(activity, datepicker, datepicker.getClass()
+ .getDeclaredField("mDaySpinnerInput"));
+ setFontEditText(activity, datepicker, datepicker.getClass()
+ .getDeclaredField("mMonthSpinnerInput"));
+ setFontEditText(activity, datepicker, datepicker.getClass()
+ .getDeclaredField("mYearSpinnerInput"));
+
+ } catch (SecurityException e) {
+ } catch (IllegalArgumentException e) {
+ } catch (IllegalAccessException e) {
+ } catch (Exception e) {
+ }
+ }
+
+ private static void setFont(Activity activity, Object datepicker,
+ Field field) throws Exception {
+ field.setAccessible(true);
+ Object yearPicker = new Object();
+ yearPicker = field.get(datepicker);
+ if (yearPicker instanceof NumberPicker) {
+ NumberPicker npYear = (NumberPicker)yearPicker;
+ }
+
+
+// ((View) yearPicker).setVisibility(View.VISIBLE);
+// //((View) yearPicker).setPadding(-2, 0, -2, 0);
+//
+// View childpicker;
+// childpicker = (View) activity.findViewById(
+// Resources.getSystem()
+// .getIdentifier("month", "id", "android"));
+ Field field1 = yearPicker.getClass().getDeclaredField("mInputText");
+ field1.setAccessible(true);
+ Object edittext = new Object();
+ edittext = field1.get(yearPicker);
+
+ Field field2 = yearPicker.getClass().getDeclaredField(
+ "mSelectorWheelPaint");
+ field2.setAccessible(true);
+ Object paint = new Object();
+ paint = field2.get(yearPicker);
+// if (CustomFontTextview.sTypeface == null)
+// CustomFontTextview.sTypeface = Typeface.createFromAsset(activity.getAssets(), "customfont.ttf");
+// ((Paint) paint).setTypeface(Typeface.create(CustomFontTextview.sTypeface, Typeface.BOLD));
+ //((Paint) paint).setTextSize(MainActivity);
+// ((Paint) paint).setColor(Color.RED);
+
+ //((TextView) edittext).setTypeface(CustomFontTextview.sTypeface, Typeface.BOLD);
+// ((TextView) edittext).setTextColor(Color.RED);
+ ((TextView) edittext).setTextSize(MainActivity.getInstance().getResources().getDimension(R.dimen.w14dp));
+ }
+
+ private static void setFontEditText(Activity activity, Object datePicker,
+ Field field) throws Exception {
+ field.setAccessible(true);
+ Object paint = new Object();
+ paint = field.get(datePicker);
+// if (CustomFontTextview.sTypeface == null)
+// CustomFontTextview.sTypeface = Typeface.createFromAsset(activity.getAssets(), "customfont.ttf");
+// ((EditText) paint).setTypeface(CustomFontTextview.sTypeface,Typeface.BOLD);
+// ((EditText) paint).setTextColor(Color.RED);
+ ((EditText) paint).setTextSize(MainActivity.getInstance().getResources().getDimension(R.dimen.w14dp));
+ }
+
+}
+
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java
index 4215fc9..e4f5cbb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightVisitorCell.java
@@ -64,9 +64,9 @@
fragment_check_in_right_visitor_cell_company_name.setText(item.getCompanyName());
fragment_check_in_right_visitor_cell_identity_number.setText(item.getIdentifyNum());
fragment_check_in_right_visitor_cell_mobile_phone.setText(item.getMobilePhone());
- fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto()));
if (item.getSurveillancePhoto() != null && !item.getSurveillancePhoto().equals("")) {
fragment_check_in_right_visitor_cell_photo_placeholder.setVisibility(INVISIBLE);
+ fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + item.getSurveillancePhoto()));
} else {
fragment_check_in_right_visitor_cell_photo.setImageURI(Uri.parse(AppApi.IMAGE_URL_BASE + "u45.png"));
fragment_check_in_right_visitor_cell_photo_placeholder.setVisibility(INVISIBLE);
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_add.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_add.xml
index 6529ce1..a43ce52 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_add.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_add.xml
@@ -18,8 +18,9 @@
android:padding="@dimen/w20dp"
android:gravity="center"
android:textColor="@android:color/white"
- android:textSize="@dimen/w16dp"
- android:background="@color/colorPrimary"/>
+ android:textSize="@dimen/w20dp"
+ android:background="@color/colorPrimary"
+ />
<EditText
android:id="@+id/dialog_add_content"
android:layout_width="@dimen/w200dp"
@@ -44,7 +45,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/confirm"
- android:textSize="@dimen/text_size_big"/>
+ android:textSize="@dimen/w16dp"/>
<View
android:layout_width="0.5dp"
android:layout_height="match_parent"
@@ -56,7 +57,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/cancel"
- android:textSize="@dimen/text_size_big"/>
+ android:textSize="@dimen/w16dp"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml
index 83ad706..501ee88 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_select.xml
@@ -18,7 +18,7 @@
android:padding="@dimen/w20dp"
android:gravity="center"
android:textColor="@android:color/white"
- android:textSize="@dimen/w16dp"
+ android:textSize="@dimen/w20dp"
android:background="@color/colorPrimary"/>
<cn.com.basic.face.dialog.wheelview.widget.WheelView
android:id="@+id/dialog_select_list_view"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
index 942b5ae..138b5dc 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
@@ -37,7 +37,7 @@
android:id="@+id/fragment_check_in_right_visitor_cell_photo"
android:layout_width="match_parent"
android:layout_height="match_parent"
- fresco:roundAsCircle = "true"
+ fresco:roundedCornerRadius="@dimen/w50dp"
android:layout_gravity="center_horizontal"
android:background="@drawable/u202"
android:layout_alignParentBottom="true"
@@ -51,7 +51,8 @@
android:text="娣诲姞\n鏉ヨ浜哄憳"
android:textSize="@dimen/w16dp"
android:gravity="center"
- android:layout_alignParentTop="true" />
+ android:layout_alignParentTop="true"
+ />
</RelativeLayout>
<LinearLayout
--
Gitblit v1.8.0