|
|
@@ -213,7 +213,7 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
|
|
|
break;
|
|
|
case "D"://日期选择
|
|
|
case "T"://时间选择
|
|
|
- showDateDialog(true, position);
|
|
|
+ showDateDialog(!model.getCaption().contains("生日"), position);
|
|
|
break;
|
|
|
case "SF":
|
|
|
case "DF":
|
|
|
@@ -322,10 +322,8 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
|
|
|
@Override
|
|
|
public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
|
|
|
String date = year + "-" + month + "-" + day;
|
|
|
- if (needTime) {
|
|
|
- date += " " + hour + ":" + minute + ":00";
|
|
|
- }
|
|
|
- mBillAdapter.updateBillModelValues(position, date, date);
|
|
|
+ String dateTime = date + " " + hour + ":" + minute + ":00";
|
|
|
+ mBillAdapter.updateBillModelValues(position, needTime ? dateTime : date, dateTime);
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -484,7 +482,7 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
|
|
|
}
|
|
|
|
|
|
protected void handlerSelectDbFind(JSONObject object, int groupId) {
|
|
|
- LogUtil.d("Arison","groupId:"+groupId+" object:"+object.toJSONString());
|
|
|
+ LogUtil.d("Arison", "groupId:" + groupId + " object:" + object.toJSONString());
|
|
|
BillGroupModel mBillGroupModel = mBillAdapter.getBillGroupModel(groupId);
|
|
|
if (mBillGroupModel != null) {
|
|
|
if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {
|