diff --git a/ChangeLog.md b/ChangeLog.md
index 82a95c47..21ccb660 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,15 @@
+### v1.3.0 - 2016.12.15
+支持设置选择器主体背景颜色；
+所有选择器支持滑动实时监听;
+所有选择器支持内嵌到其他视图容器;
+重构单项选择器，数字选择器支持小数；
+### v1.2.4 - 2016.11.23
+修复默认选中第一项时颜色不高亮问题；
+修复联动选择器数组越界问题；
+多级联动选择器支持设置各列比例；
+时期及时间选择器内部逻辑修改；
 ### v1.2.3 - 2016.10.13
-修复日期选择器中当开始年份和结束年份相同时的Bug；   
+修复日期选择器中当开始年份和结束年份相同时的Bug；
 修复年月日时分选择器的设置默认值时分没有补零的Bug；   
 支持所有选择器顶部高度及字号的设置；   
 修复日期选择器选中项显示有误问题，感谢@msdx；   
diff --git a/README.md b/README.md
index 96a15917..ffc1a05d 100755
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@
 
 安卓选择器类库，包括日期选择器、时间选择器、单项选择器、城市选择器、颜色选择器、文件选择器、目录选择器、数字选择器、星座选择器、生肖选择器等，可自定义顶部及底部界面，可自定义窗口动画。
 欢迎大伙儿在[Issues](https://github.com/gzu-liyujiang/AndroidPicker/issues)提交你的意见或建议。    
-欢迎Fork & Pull requests贡献您的代码。[查看更新日志](https://github.com/gzu-liyujiang/AndroidPicker/blob/master/ChangeLog.md)。     
+欢迎Fork & Pull requests贡献您的代码，大家共同学习。
+[查看更新日志](https://github.com/gzu-liyujiang/AndroidPicker/blob/master/ChangeLog.md)，×新版本未对旧版API作兼容处理，升级后若编译报错请根据错误提示更改×。
 
 # Install
 “app”是测试用例；“library”包括WheelPicker、ColorPicker、FilePicker，
@@ -20,14 +21,15 @@ dependencies {
     compile 'cn.qqtheme.framework:ColorPicker:latest.release'
 }
 ```
+若无法下载的话，可换[JitPack](https://jitpack.io/#gzu-liyujiang/AndroidPicker)的仓库试试！
 #### 需要学习或修改源代码，则下载本项目手动集成
 下载示例项目后导入“library”下的相关module到你的项目（记得将module下的build.gradle修改类似于下面的内容，否则可能会报错找不到BuildToolsVersion）：
 ```groovy
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion 22.0.1
+    compileSdkVersion 23
+    buildToolsVersion 23.0.1
 
     defaultConfig {
         minSdkVersion 14
@@ -58,6 +60,8 @@ dependencies {
 ```
 
 # Method
+View getContentView()
+得到选择器视图，可内嵌到其他视图容器
 void setFillScreen(boolean fillScreen)
 固定高度为屏幕的高     
 void setGravity(int gravity)
@@ -116,7 +120,9 @@ void setTopLineColor(int topLineColor)
 设置顶部标题栏下划线颜色     
 void setTopLineVisible(boolean topLineVisible)
 设置顶部标题栏下划线是否显示    
-......   
+void setBackgroundColor(int backgroundColor)
+设置主体背景颜色
+......
 
 # Custom
 #### 自定义窗口进入退出动画(可选)
@@ -321,14 +327,14 @@ https://github.com/wangjiegulu/WheelView
 https://github.com/jbruchanov/AndroidColorPicker      
 
 # Screenshots
-![自定义选择器效果图](/screenshots/custom.gif)   
+![滑轮选择器内嵌效果图](/screenshots/nestwheelview.jpg)
+![自定义选择器效果图](/screenshots/custom.gif)
 ![日期选择器效果图](/screenshots/date.gif)            
 ![日期选择器效果图](/screenshots/monthday.jpg)   
 ![时间选择器效果图](/screenshots/time.gif)   
 ![单项选择器效果图](/screenshots/option.gif)           
 ![地址选择器效果图](/screenshots/address.gif)   
-![地址选择器效果图](/screenshots/address.png)         
-![数字选择器效果图](/screenshots/number.gif)   
+![数字选择器效果图](/screenshots/number.gif)
 ![星座选择器效果图](/screenshots/constellation.jpg)   
 ![颜色选择器效果图](/screenshots/color.gif)    
 ![文件选择器效果图](/screenshots/file.gif)    
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2cf0480..ec09a8fb 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="cn.qqtheme.androidpicker">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="cn.qqtheme.androidpicker">
 
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".MyApp"
@@ -15,11 +15,12 @@
         tools:ignore="AllowBackup,GoogleAppIndexingWarning,NewApi">
         <activity android:name=".MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity android:name=".NestActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java b/app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java
index 0e5351bb..ac74fd61 100755
--- a/app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java
+++ b/app/src/main/java/cn/qqtheme/androidpicker/MainActivity.java
@@ -47,17 +47,21 @@ private void showToast(String msg) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
     }
 
+    public void onNestView(View view) {
+        startActivity(new Intent(this, NestActivity.class));
+    }
+
     public void onAnimationStyle(View view) {
         NumberPicker picker = new NumberPicker(this);
         picker.setAnimationStyle(R.style.Animation_CustomPopup);
         picker.setOffset(2);//偏移量
-        picker.setRange(40, 100, 1);//数字范围
-        picker.setSelectedItem(65);
-        picker.setLabel("Kg");
-        picker.setOnOptionPickListener(new OptionPicker.OnOptionPickListener() {
+        picker.setRange(10.50, 20.00, 1.5);//数字范围
+        picker.setSelectedItem(10.50);
+        picker.setLabel("℃");
+        picker.setOnNumberPickListener(new NumberPicker.OnNumberPickListener() {
             @Override
-            public void onOptionPicked(int position, String option) {
-                showToast(option);
+            public void onItemPicked(int index, Number item) {
+                showToast("index=" + index + ", item=" + item.doubleValue());
             }
         });
         picker.show();
@@ -66,17 +70,17 @@ public void onOptionPicked(int position, String option) {
     public void onAnimator(View view) {
         CustomHeaderAndFooterPicker picker = new CustomHeaderAndFooterPicker(this);
         picker.setGravity(Gravity.CENTER);//居中
-        picker.setOnOptionPickListener(new OptionPicker.OnOptionPickListener() {
+        picker.setOnItemPickListener(new OptionPicker.OnOptionPickListener() {
             @Override
-            public void onOptionPicked(int position, String option) {
-                showToast(option);
+            public void onItemPicked(int index, String item) {
+                showToast("index=" + index + ", item=" + item);
             }
         });
         picker.show();
     }
 
     public void onYearMonthDayPicker(View view) {
-        DatePicker picker = new DatePicker(this);
+        final DatePicker picker = new DatePicker(this);
         picker.setRangeStart(2016, 8, 29);
         picker.setRangeEnd(2022, 1, 11);
         picker.setSelectedItem(2016, 10, 14);
@@ -86,6 +90,22 @@ public void onDatePicked(String year, String month, String day) {
                 showToast(year + "-" + month + "-" + day);
             }
         });
+        picker.setOnWheelListener(new DatePicker.OnWheelListener() {
+            @Override
+            public void onYearWheeled(int index, String year) {
+                picker.setTitleText(year + "-" + picker.getSelectedMonth() + "-" + picker.getSelectedDay());
+            }
+
+            @Override
+            public void onMonthWheeled(int index, String month) {
+                picker.setTitleText(picker.getSelectedYear() + "-" + month + "-" + picker.getSelectedDay());
+            }
+
+            @Override
+            public void onDayWheeled(int index, String day) {
+                picker.setTitleText(picker.getSelectedYear() + "-" + picker.getSelectedMonth() + "-" + day);
+            }
+        });
         picker.show();
     }
 
@@ -152,10 +172,10 @@ public void onOptionPicker(View view) {
         picker.setOffset(2);
         picker.setSelectedIndex(0);
         picker.setTextSize(11);
-        picker.setOnOptionPickListener(new OptionPicker.OnOptionPickListener() {
+        picker.setOnItemPickListener(new OptionPicker.OnOptionPickListener() {
             @Override
-            public void onOptionPicked(int position, String option) {
-                showToast(option);
+            public void onItemPicked(int index, String item) {
+                showToast("index=" + index + ", item=" + item);
             }
         });
         picker.show();
@@ -213,11 +233,12 @@ public void onConstellationPicker(View view) {
         picker.setSubmitTextSize(22);
         picker.setTextColor(0xFFFF0000, 0xFF999999);
         picker.setLineColor(0xFFEE0000);
+        picker.setBackgroundColor(0xFFF1F1F1);
         picker.setSelectedItem("射手");
         picker.setOnOptionPickListener(new OptionPicker.OnOptionPickListener() {
             @Override
-            public void onOptionPicked(int position, String option) {
-                showToast(option);
+            public void onItemPicked(int index, String item) {
+                showToast("index=" + index + ", item=" + item);
             }
         });
         picker.show();
@@ -231,10 +252,10 @@ public void onNumberPicker(View view) {
         picker.setRange(145, 200, 1);//数字范围
         picker.setSelectedItem(172);
         picker.setLabel("厘米");
-        picker.setOnOptionPickListener(new OptionPicker.OnOptionPickListener() {
+        picker.setOnNumberPickListener(new NumberPicker.OnNumberPickListener() {
             @Override
-            public void onOptionPicked(int position, String option) {
-                showToast(option);
+            public void onItemPicked(int index, Number item) {
+                showToast("index=" + index + ", item=" + item.intValue());
             }
         });
         picker.show();
@@ -250,6 +271,7 @@ public void onAddress2Picker(View view) {
             String json = ConvertUtils.toString(getAssets().open("city2.json"));
             data.addAll(JSON.parseArray(json, Province.class));
             AddressPicker picker = new AddressPicker(this, data);
+            picker.setCycleDisable(true);
             picker.setHideProvince(true);
             picker.setSelectedItem("贵州", "贵阳", "花溪");
             picker.setOnAddressPickListener(new AddressPicker.OnAddressPickListener() {
diff --git a/app/src/main/java/cn/qqtheme/androidpicker/NestActivity.java b/app/src/main/java/cn/qqtheme/androidpicker/NestActivity.java
new file mode 100755
index 00000000..2c64e79f
--- /dev/null
+++ b/app/src/main/java/cn/qqtheme/androidpicker/NestActivity.java
@@ -0,0 +1,56 @@
+package cn.qqtheme.androidpicker;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.Arrays;
+
+import cn.qqtheme.framework.picker.TimePicker;
+import cn.qqtheme.framework.widget.WheelView;
+
+/**
+ * 内嵌选择器
+ * <br />
+ * Author:李玉江[QQ:1032694760]
+ * DateTime:2016/12/16 00:42
+ * Builder:Android Studio
+ */
+public class NestActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_nest);
+        final TextView textView = (TextView) findViewById(R.id.wheelview_tips);
+        WheelView wheelView = (WheelView) findViewById(R.id.wheelview_single);
+        //noinspection RedundantArrayCreation
+        wheelView.setItems(Arrays.asList(new String[]{
+                "贵州穿青人",
+                "少数民族",
+                "不在56少数个民族之列",
+                "第57个民族"}));
+        wheelView.setOnWheelListener(new WheelView.OnWheelListener() {
+            @Override
+            public void onSelected(boolean isUserScroll, int index, String item) {
+                textView.setText("index=" + index + ",item=" + item);
+            }
+        });
+        final TimePicker picker = new TimePicker(this, TimePicker.HOUR_12);
+        picker.setOnWheelListener(new TimePicker.OnWheelListener() {
+            @Override
+            public void onHourWheeled(int index, String hour) {
+                textView.setText(hour + ":" + picker.getSelectedMinute());
+            }
+
+            @Override
+            public void onMinuteWheeled(int index, String minute) {
+                textView.setText(picker.getSelectedHour() + ":" + minute);
+            }
+        });
+        ViewGroup viewGroup = (ViewGroup) findViewById(R.id.wheelview_container);
+        viewGroup.addView(picker.getContentView());
+    }
+
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fe29bb17..fb5da924 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,6 +8,12 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="onNestView"
+            android:text="选择器视图内嵌" />
+
         <Button
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_nest.xml b/app/src/main/res/layout/activity_nest.xml
new file mode 100755
index 00000000..0651f65c
--- /dev/null
+++ b/app/src/main/res/layout/activity_nest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp">
+
+    <TextView
+        android:id="@+id/wheelview_tips"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/app_name"/>
+
+    <cn.qqtheme.framework.widget.WheelView
+        android:id="@+id/wheelview_single"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_margin="5dp"
+        android:background="#cccccc"/>
+
+    <LinearLayout
+        android:id="@+id/wheelview_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 19eabf6d..cf8600ae 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,8 +15,8 @@ com.android.build.gradle.overridePathCheck=true
 #android.useDeprecatedNdk=true
 
 #下面定义一些常量供gradle脚本使用
-VERSION_NAME=1.2.4.20161123
-VERSION_CODE=124
+VERSION_NAME=1.3.0
+VERSION_CODE=130
 COMPILE_SDK_VERSION=23
 MIN_SDK_VERSION=11
 #安卓6.0开始(API23+)，需要动态申请权限
diff --git a/library/ColorPicker/src/main/java/cn/qqtheme/framework/picker/ColorPicker.java b/library/ColorPicker/src/main/java/cn/qqtheme/framework/picker/ColorPicker.java
index 4eba1a78..11d88ef5 100755
--- a/library/ColorPicker/src/main/java/cn/qqtheme/framework/picker/ColorPicker.java
+++ b/library/ColorPicker/src/main/java/cn/qqtheme/framework/picker/ColorPicker.java
@@ -93,6 +93,7 @@ public void onColorChanged(ColorPanelView view, int color) {
         hexValView.setPadding(0, 0, 0, 0);
         hexValView.setSingleLine(true);
         hexValView.setOnEditorActionListener(this);
+        hexValView.setEnabled(false);
         hexValDefaultColor = hexValView.getTextColors();
         previewLayout.addView(hexValView);
         rootLayout.addView(previewLayout);
diff --git a/library/Common/src/main/java/cn/qqtheme/framework/popup/BasicPopup.java b/library/Common/src/main/java/cn/qqtheme/framework/popup/BasicPopup.java
index c6411a94..46643132 100755
--- a/library/Common/src/main/java/cn/qqtheme/framework/popup/BasicPopup.java
+++ b/library/Common/src/main/java/cn/qqtheme/framework/popup/BasicPopup.java
@@ -71,7 +71,7 @@ private void onShowPrepare() {
         V view = makeContentView();
         popupDialog.setContentView(view);// 设置弹出窗体的布局
         setContentViewAfter(view);
-        LogUtils.verbose("do something before popup show");
+        LogUtils.verbose(this, "do something before popup show");
         if (width == 0 && height == 0) {
             //未明确指定宽高，优先考虑全屏再考虑半屏然后再考虑包裹内容
             width = screenWidthPixels;
@@ -141,7 +141,7 @@ public void setAnimationStyle(@StyleRes int animRes) {
 
     public void setOnDismissListener(DialogInterface.OnDismissListener onDismissListener) {
         popupDialog.setOnDismissListener(onDismissListener);
-        LogUtils.verbose("popup setOnDismissListener");
+        LogUtils.verbose(this, "popup setOnDismissListener");
     }
 
     /**
@@ -184,12 +184,12 @@ public boolean isShowing() {
     public void show() {
         onShowPrepare();
         popupDialog.show();
-        LogUtils.verbose("popup show");
+        LogUtils.verbose(this, "popup show");
     }
 
     public void dismiss() {
         popupDialog.dismiss();
-        LogUtils.verbose("popup dismiss");
+        LogUtils.verbose(this, "popup dismiss");
     }
 
     public boolean onKeyDown(int keyCode, KeyEvent event) {
@@ -216,6 +216,8 @@ public Window getWindow() {
      * 弹框的内容视图
      */
     public View getContentView() {
+        // fixed: 2016-12-15 可以取出选择器视图添加到其他容器中
+        onShowPrepare();
         return popupDialog.getContentView();
     }
 
diff --git a/library/Common/src/main/java/cn/qqtheme/framework/popup/ConfirmPopup.java b/library/Common/src/main/java/cn/qqtheme/framework/popup/ConfirmPopup.java
index c388c3ce..36714db2 100755
--- a/library/Common/src/main/java/cn/qqtheme/framework/popup/ConfirmPopup.java
+++ b/library/Common/src/main/java/cn/qqtheme/framework/popup/ConfirmPopup.java
@@ -39,6 +39,8 @@ public abstract class ConfirmPopup<V extends View> extends BasicPopup<View> {
     protected int cancelTextSize = 0;
     protected int submitTextSize = 0;
     protected int titleTextSize = 0;
+    protected int backgroundColor = Color.WHITE;
+    protected TextView titleView;
 
     public ConfirmPopup(Activity activity) {
         super(activity);
@@ -113,7 +115,11 @@ public void setSubmitText(@StringRes int textRes) {
      * 设置顶部标题栏标题文字
      */
     public void setTitleText(CharSequence titleText) {
-        this.titleText = titleText;
+        if (titleView != null) {
+            titleView.setText(titleText);
+        } else {
+            this.titleText = titleText;
+        }
     }
 
     /**
@@ -165,6 +171,13 @@ public void setTitleTextSize(@IntRange(from = 10, to = 40) int titleTextSize) {
         this.titleTextSize = titleTextSize;
     }
 
+    /**
+     * 设置选择器主体背景颜色
+     */
+    public void setBackgroundColor(@ColorInt int backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
+
     /**
      * @see #makeHeaderView()
      * @see #makeCenterView()
@@ -174,7 +187,7 @@ public void setTitleTextSize(@IntRange(from = 10, to = 40) int titleTextSize) {
     protected final View makeContentView() {
         LinearLayout rootLayout = new LinearLayout(activity);
         rootLayout.setLayoutParams(new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
-        rootLayout.setBackgroundColor(Color.WHITE);
+        rootLayout.setBackgroundColor(backgroundColor);
         rootLayout.setOrientation(LinearLayout.VERTICAL);
         rootLayout.setGravity(Gravity.CENTER);
         rootLayout.setPadding(0, 0, 0, 0);
@@ -228,7 +241,7 @@ public void onClick(View v) {
         });
         topButtonLayout.addView(cancelButton);
 
-        TextView titleView = new TextView(activity);
+        titleView = new TextView(activity);
         RelativeLayout.LayoutParams titleLayoutParams = new RelativeLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
         int margin = ConvertUtils.toPx(activity, 20);
         titleLayoutParams.leftMargin = margin;
diff --git a/library/Common/src/main/java/cn/qqtheme/framework/popup/PopupDialog.java b/library/Common/src/main/java/cn/qqtheme/framework/popup/PopupDialog.java
index fd84dd61..27a75c95 100755
--- a/library/Common/src/main/java/cn/qqtheme/framework/popup/PopupDialog.java
+++ b/library/Common/src/main/java/cn/qqtheme/framework/popup/PopupDialog.java
@@ -83,7 +83,11 @@ void setContentView(View view) {
     }
 
     View getContentView() {
-        return contentLayout.getChildAt(0);
+        // IllegalStateException: The specified child already has a parent.
+        // You must call removeView() on the child's parent first.
+        FrameLayout layout = new FrameLayout(getContext());
+        layout.addView(contentLayout.getChildAt(0));
+        return layout;
     }
 
     void setSize(int width, int height) {
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/DateTimePicker.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/DateTimePicker.java
index 737742e8..8cb95941 100755
--- a/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/DateTimePicker.java
+++ b/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/DateTimePicker.java
@@ -187,10 +187,10 @@ protected View makeCenterView() {
             } else {
                 yearView.setItems(years, selectedYearIndex);
             }
-            yearView.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
+            yearView.setOnWheelListener(new WheelView.OnWheelListener() {
                 @Override
-                public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
-                    selectedYearIndex = selectedIndex;
+                public void onSelected(boolean isUserScroll, int index, String item) {
+                    selectedYearIndex = index;
                     //需要根据年份及月份动态计算天数
                     days.clear();
                     int maxDays = DateUtils.calculateDaysInMonth(DateUtils.trimZero(item), DateUtils.trimZero(months.get(selectedMonthIndex)));
@@ -213,10 +213,10 @@ public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
         } else {
             monthView.setItems(months, selectedMonthIndex);
         }
-        monthView.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
+        monthView.setOnWheelListener(new WheelView.OnWheelListener() {
             @Override
-            public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
-                selectedMonthIndex = selectedIndex;
+            public void onSelected(boolean isUserScroll, int index, String item) {
+                selectedMonthIndex = index;
                 if (mode != YEAR_MONTH) {
                     //年月日或年月模式下，需要根据年份及月份动态计算天数
                     days.clear();
@@ -241,10 +241,10 @@ public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
             } else {
                 dayView.setItems(days, selectedDayIndex);
             }
-            dayView.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
+            dayView.setOnWheelListener(new WheelView.OnWheelListener() {
                 @Override
-                public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
-                    selectedDayIndex = selectedIndex;
+                public void onSelected(boolean isUserScroll, int index, String item) {
+                    selectedDayIndex = index;
                 }
             });
         }
@@ -265,15 +265,15 @@ public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
             minutes.add(DateUtils.fillZero(i));
         }
         minuteView.setItems(minutes, selectedMinute);
-        hourView.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
+        hourView.setOnWheelListener(new WheelView.OnWheelListener() {
             @Override
-            public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
+            public void onSelected(boolean isUserScroll, int index, String item) {
                 selectedHour = item;
             }
         });
-        minuteView.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
+        minuteView.setOnWheelListener(new WheelView.OnWheelListener() {
             @Override
-            public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
+            public void onSelected(boolean isUserScroll, int index, String item) {
                 selectedMinute = item;
             }
         });
diff --git a/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/TimePicker.java b/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/TimePicker.java
index 23805378..2494e1ba 100755
--- a/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/TimePicker.java
+++ b/library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/TimePicker.java
@@ -26,6 +26,7 @@
 public class TimePicker extends WheelPicker {
     public static final int HOUR_24 = 0;//24小时制
     public static final int HOUR_12 = 1;//12小时制
+    private OnWheelListener onWheelListener;
     private OnTimePickListener onTimePickListener;
     private int mode;
     private String hourLabel = "时", minuteLabel = "分";
@@ -88,7 +89,7 @@ public void setRangeStart(int startHour, int startMinute) {
             illegal = true;
         }
         if (illegal) {
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("out of range");
         }
         this.startHour = startHour;
         this.startMinute = startMinute;
@@ -109,7 +110,7 @@ public void setRangeEnd(int endHour, int endMinute) {
             illegal = true;
         }
         if (illegal) {
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("out of range");
         }
         this.endHour = endHour;
         this.endMinute = endMinute;
@@ -123,6 +124,13 @@ public void setSelectedItem(int hour, int minute) {
         selectedMinute = DateUtils.fillZero(minute);
     }
 
+    /**
+     * 设置滑动监听器
+     */
+    public void setOnWheelListener(OnWheelListener onWheelListener) {
+        this.onWheelListener = onWheelListener;
+    }
+
     public void setOnTimePickListener(OnTimePickListener listener) {
         this.onTimePickListener = listener;
     }
@@ -139,6 +147,7 @@ protected View makeCenterView() {
         hourView.setTextColor(textColorNormal, textColorFocus);
         hourView.setLineVisible(lineVisible);
         hourView.setLineColor(lineColor);
+        hourView.setCycleDisable(cycleDisable);
         layout.addView(hourView);
         TextView hourTextView = new TextView(activity);
         hourTextView.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
@@ -155,6 +164,7 @@ protected View makeCenterView() {
         minuteView.setLineVisible(lineVisible);
         minuteView.setLineColor(lineColor);
         minuteView.setOffset(offset);
+        minuteView.setCycleDisable(cycleDisable);
         layout.addView(minuteView);
         TextView minuteTextView = new TextView(activity);
         minuteTextView.setLayoutParams(new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
@@ -174,17 +184,23 @@ protected View makeCenterView() {
         }
         hourView.setItems(hours, selectedHour);
         minuteView.setItems(changeMinuteData(selectedHour), selectedMinute);
-        hourView.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
+        hourView.setOnWheelListener(new WheelView.OnWheelListener() {
             @Override
-            public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
+            public void onSelected(boolean isUserScroll, int index, String item) {
                 selectedHour = item;
+                if (onWheelListener != null) {
+                    onWheelListener.onHourWheeled(index, selectedHour);
+                }
                 minuteView.setItems(changeMinuteData(item), selectedMinute);
             }
         });
-        minuteView.setOnWheelViewListener(new WheelView.OnWheelViewListener() {
+        minuteView.setOnWheelListener(new WheelView.OnWheelListener() {
             @Override
-            public void onSelected(boolean isUserScroll, int selectedIndex, String item) {
+            public void onSelected(boolean isUserScroll, int index, String item) {
                 selectedMinute = item;
+                if (onWheelListener != null) {
+                    onWheelListener.onMinuteWheeled(index, selectedMinute);
+                }
             }
         });
         return layout;
@@ -243,4 +259,12 @@ public interface OnTimePickListener {
 
     }
 
+    public interface OnWheelListener {
+
+        void onHourWheeled(int index, String hour);
+
+        void onMinuteWheeled(int index, String minute);
+
+    }
+
 }
diff --git a/screenshots/nestwheelview.jpg b/screenshots/nestwheelview.jpg
new file mode 100755
index 00000000..4f93d54d
Binary files /dev/null and b/screenshots/nestwheelview.jpg differ