修复低分辨率手机中选中项显示位置稍微偏上的问题

Author: xiaosong520

app/src/main/java/com/bigkoo/pickerviewdemo/MainActivity.java

@@ -3,17 +3,15 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bigkoo.pickerview.OptionsPickerView;
 import com.bigkoo.pickerview.TimePickerView;
-import com.bigkoo.pickerview.listener.CustomListener;
 import com.bigkoo.pickerview.lib.WheelView;
-
+import com.bigkoo.pickerview.listener.CustomListener;
 import com.bigkoo.pickerview.model.IPickerViewData;
 import com.bigkoo.pickerviewdemo.bean.CardBean;
 import com.bigkoo.pickerviewdemo.bean.PickerViewData;
@@ -359,6 +357,7 @@ public void onClick(View v) {
                 })
                 .build();
         pvCustomOptions.setPicker(cardItem);//添加数据
+
     }
 
     public void getData() {
@@ -367,27 +366,4 @@ public void getData() {
         }
     }
 
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (pvTime.isShowing()) {
-                pvTime.dismiss();
-                return true;
-            }
-            if (pvOptions.isShowing()) {
-                pvOptions.dismiss();
-                return true;
-            }
-            if (pvCustomOptions.isShowing()) {
-                pvCustomOptions.dismiss();
-                return true;
-            }
-            if (pvCustomTime.isShowing()) {
-                pvCustomTime.dismiss();
-                return true;
-            }
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
 }

app/src/main/res/layout/activity_main.xml

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
+
     <Button
         android:layout_margin="20dp"
         android:id="@+id/btn_Time"

pickerview/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-/*apply plugin: 'com.jfrog.bintray'*/
 apply plugin: 'com.novoda.bintray-release'//添加插件
 
 

pickerview/src/main/java/com/bigkoo/pickerview/lib/WheelView.java

@@ -9,6 +9,7 @@
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.Gravity;
@@ -116,7 +117,7 @@ public enum DividerType {
     private int drawCenterContentStart = 0;//中间选中文字开始绘制位置
     private int drawOutContentStart = 0;//非中间文字开始绘制位置
     private static final float SCALECONTENT = 0.8F;//非中间文字则用此控制高度，压扁形成3d错觉
-    private static final float CENTERCONTENTOFFSET = 7;//偏移量
+    private float CENTERCONTENTOFFSET ;//偏移量
 
     public WheelView(Context context) {
         this(context, null);
@@ -129,6 +130,11 @@ public WheelView(Context context, AttributeSet attrs) {
         dividerColor = getResources().getColor(R.color.pickerview_wheelview_textcolor_out);*/
 
         textSize = getResources().getDimensionPixelSize(R.dimen.pickerview_textsize);//默认大小
+
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        float density = dm.density; // 屏幕密度（0.75/1.0/1.5/2.0/3.0）
+        CENTERCONTENTOFFSET = density * 2.1F;
+
         if (attrs != null) {
             TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.pickerview, 0, 0);
             mGravity = a.getInt(R.styleable.pickerview_pickerview_gravity, Gravity.CENTER);
@@ -234,15 +240,22 @@ private void measureTextWidthHeight() {
         for (int i = 0; i < adapter.getItemsCount(); i++) {
             String s1 = getContentText(adapter.getItem(i));
             paintCenterText.getTextBounds(s1, 0, s1.length(), rect);
+
             int textWidth = rect.width();
+            int textHeight = rect.height();
+
             if (textWidth > maxTextWidth) {
                 maxTextWidth = textWidth;
             }
-            paintCenterText.getTextBounds("\u661F\u671F", 0, 2, rect); // 星期的字符编码（设置item高度为两个汉字高度）
-            int textHeight = rect.height();
-            if (textHeight > maxTextHeight) {
+            paintCenterText.getTextBounds("\u661F\u671F", 0, 2, rect); // 星期的字符编码（以它为标准高度）
+            int standardHeight = rect.height();
+
+            if (textHeight > maxTextHeight) {//所有Item文字的最大高度
                 maxTextHeight = textHeight;
             }
+            if (maxTextHeight<standardHeight){//没有超过标准高度，设为标准高度
+                maxTextHeight = standardHeight;
+            }
         }
         itemHeight = lineSpacingMultiplier * maxTextHeight;
     }
@@ -610,7 +623,7 @@ public boolean onTouchEvent(MotionEvent event) {
             default:
                 if (!eventConsumed) {//屏幕点击或者拖拽事件
                     float y = event.getY();
-                    // 由于之前是有向右偏移90度，所以 实际弧度范围为α2 =π/2-α （α=[0,π]）
+                    // 由于之前是有向右偏移90度，所以 实际弧度范围为α2 =π/2-α （α=[0,π] α2 = [-π/2,π/2]）
                     // 根据cosα = sin(π/2-α)
                     // (radius - y) / radius = sinα2 = sin(π/2-α) = cosα
                     // arccos(cosα)= α

pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java

@@ -5,13 +5,13 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.view.Gravity;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.Button;
 import android.widget.FrameLayout;
 
 import com.bigkoo.pickerview.R;
@@ -93,7 +93,7 @@ public void onClick(View view) {
             contentContainer = (ViewGroup) rootView.findViewById(R.id.content_container);
             contentContainer.setLayoutParams(params);
         }
-
+        setKeyBackCancelable(true);
 
     }
 
@@ -210,7 +210,7 @@ public BasePickerView setOnDismissListener(OnDismissListener onDismissListener)
         return this;
     }
 
-    /*public BasePickerView setKeyBackCancelable(boolean isCancelable) {
+    public BasePickerView setKeyBackCancelable(boolean isCancelable) {
         rootView.setFocusable(isCancelable);
         rootView.setFocusableInTouchMode(isCancelable);
         if (isCancelable) {
@@ -232,7 +232,7 @@ && isShowing()){
             }
             return false;
         }
-    } ;*/
+    } ;
 
     protected BasePickerView setOutSideCancelable(boolean isCancelable) {
         if (rootView != null) {