Skip to content

Commit 780db65

Browse files
kylekyle
authored andcommitted
1.1.2
1 parent 19fce57 commit 780db65

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

demo/src/main/java/com/lantouzi/wheelview/demo/MainActivity.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ protected void onCreate(Bundle savedInstanceState) {
7070
mWheelView3.setItems(items3);
7171
mWheelView3.setAdditionCenterMark("m");
7272

73-
mWheelView4.setItems(items);
74-
mWheelView4.setEnabled(false);
73+
// mWheelView4.setItems(items);
74+
// mWheelView4.setEnabled(false);
7575

7676
mWheelView5.setItems(items);
7777
mWheelView5.setMinSelectableIndex(3);
@@ -97,5 +97,12 @@ public void onWheelItemChanged(WheelView wheelView, int position) {
9797
}
9898
});
9999

100+
mWheelView4.postDelayed(new Runnable() {
101+
@Override
102+
public void run() {
103+
mWheelView4.setItems(items);
104+
}
105+
}, 3000);
106+
100107
}
101108
}

library/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build
2+
*.iml

library/library.iml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6869
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -75,7 +76,9 @@
7576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7677
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
7880
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
7982
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8083
</content>
8184
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />

library/src/main/java/com/lantouzi/wheelview/WheelView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ public void setItems(List<String> items) {
460460
mMinSelectableIndex = Math.max(mMinSelectableIndex, 0);
461461
mMaxSelectableIndex = Math.min(mMaxSelectableIndex, mMarkCount - 1);
462462
}
463+
mContentRectF.set(0, 0, (mMarkCount - 1) * mIntervalDis, getMeasuredHeight());
463464
mCenterIndex = Math.min(mCenterIndex, mMarkCount);
464465
calcIntervalDis();
465466
invalidate();

0 commit comments

Comments
 (0)