Skip to content

Commit 93db022

Browse files
committed
修复联动选择器不滑动(使用默认项)就确定时的奔溃问题
1 parent c2d53a9 commit 93db022

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/LinkagePicker.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -386,27 +386,30 @@ public void onSelected(int index) {
386386

387387
@Override
388388
public void onSubmit() {
389+
Fst fst = getSelectedFirstItem();
390+
Snd snd = getSelectedSecondItem();
391+
Trd trd = getSelectedThirdItem();
389392
if (provider.isOnlyTwo()) {
390393
if (onPickListener != null) {
391394
//noinspection unchecked
392-
onPickListener.onPicked(selectedFirstItem, selectedSecondItem, null);
395+
onPickListener.onPicked(fst, snd, null);
393396
}
394397
if (onLinkageListener != null) {
395-
onLinkageListener.onPicked(selectedFirstItem.getName(), selectedSecondItem.getName(), null);
398+
onLinkageListener.onPicked(fst.getName(), snd.getName(), null);
396399
}
397400
} else {
398401
if (onPickListener != null) {
399402
//noinspection unchecked
400-
onPickListener.onPicked(selectedFirstItem, selectedSecondItem, selectedThirdItem);
403+
onPickListener.onPicked(fst, snd, trd);
401404
}
402405
if (onLinkageListener != null) {
403406
String thirdName;
404-
if (selectedThirdItem instanceof LinkageThird) {
405-
thirdName = ((LinkageThird) selectedThirdItem).getName();
407+
if (trd instanceof LinkageThird) {
408+
thirdName = ((LinkageThird) trd).getName();
406409
} else {
407-
thirdName = selectedThirdItem.toString();
410+
thirdName = trd.toString();
408411
}
409-
onLinkageListener.onPicked(selectedFirstItem.getName(), selectedSecondItem.getName(), thirdName);
412+
onLinkageListener.onPicked(fst.getName(), snd.getName(), thirdName);
410413
}
411414
}
412415
}

0 commit comments

Comments
 (0)