Skip to content

A
AnchorCollect
Commit 37eb74e2 authored by hywang's avatar hywang
Browse files
Options

1.修改输入框弹窗； 

2.增加输入框double限制;
3.公牛无法进入配种页面
parent f907b3a4
Hide whitespace changes
Inline Side-by-side
Showing with 504 additions and 193 deletions
app/src/main/AndroidManifest.xml
View file @ 37eb74e2
......@@ -48,7 +48,8 @@
android:name=".ui.login.LoginActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="landscape"
android:windowSoftInputMode="stateHidden|adjustResize">
android:windowSoftInputMode="stateHidden|adjustPan"
android:fitsSystemWindows="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
......@@ -61,7 +62,7 @@
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask"
android:screenOrientation="landscape"
android:windowSoftInputMode="stateHidden|adjustResize" />
android:windowSoftInputMode="stateHidden|adjustPan" />
<activity
android:name=".ui.splash.SplashActivity"
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/BasicsCollectFragment.java
View file @ 37eb74e2
......@@ -185,13 +185,13 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
.setCancelTextInfo(textInfo)
.setMaxWidth(600)
.setInputHintText("请输入可视化耳标号").setOkButton(new OnInputDialogButtonClickListener<InputDialog>() {
@Override
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
viewModel.tag.set(inputStr);
viewModel.initDataForTag(inputStr);
return false;
}
});
@Override
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
viewModel.tag.set(inputStr);
viewModel.initDataForTag(inputStr);
return false;
}
});
}
});
......@@ -353,40 +353,68 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
}
int finalInputType = inputType;
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Log.i("scan", "输入的是：" + input);
}
})
.onPositive(new MaterialDialog.SingleButtonCallback() {
//设置字体大小
TextInfo textInfo = new TextInfo();
textInfo.setFontSize(10);
InputDialog.show(uiParamEntity.getColumnComment(), "", "确定", "取消")
.setCancelable(false)
.setInputInfo(new InputInfo().setTextInfo(textInfo).setInputType(finalInputType))
.setTitleTextInfo(textInfo)
.setOkTextInfo(textInfo)
.setCancelTextInfo(textInfo)
.setMaxWidth(600)
.setInputHintText("输入" + uiParamEntity.getColumnComment()).setOkButton(new OnInputDialogButtonClickListener<InputDialog>() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
// baseDialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setShowName(inputStr);
viewModel.currentParamEntity.setContent(inputStr);
viewModel.currentParamEntity.notifyChange();
// }
return false;
}
})
.show();
});
/** 原
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
@Override public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Log.i("scan", "输入的是：" + input);
}
})
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
*/
}
//拍照
......@@ -394,7 +422,7 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
RxPermissions rxPermissions = new RxPermissions(getActivity());
rxPermissions.request(Manifest.permission.CAMERA, Manifest.permission
.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
.subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/BreedingRecordFragment.java
View file @ 37eb74e2
......@@ -24,6 +24,10 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
import com.bigkoo.pickerview.listener.OnTimeSelectChangeListener;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.bigkoo.pickerview.view.TimePickerView;
import com.kongzue.dialogx.dialogs.InputDialog;
import com.kongzue.dialogx.interfaces.OnInputDialogButtonClickListener;
import com.kongzue.dialogx.util.InputInfo;
import com.kongzue.dialogx.util.TextInfo;
import com.lingber.mycontrol.datagridview.DataGridView;
import com.lingber.mycontrol.datagridview.RecyclerviewAdapter;
import com.phlx.anchorcollect.App;
......@@ -249,6 +253,7 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
//判断下限制的长度
int columnSize = 500;//不限制的设置成500
int columnPointSize = -1;
if (uiParamEntity.getColumnType().indexOf("(") > -1 && uiParamEntity.getColumnType().indexOf(")") > -1) {
......@@ -257,6 +262,11 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf("(") + 1, uiParamEntity.getColumnType().indexOf(",")
)
) + 1;
columnPointSize = Integer.parseInt(
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf(",") + 1, uiParamEntity.getColumnType().indexOf(")")
)
);
} else {
columnSize = Integer.parseInt(
......@@ -267,40 +277,82 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
}
}
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
int maxColumnSize = columnSize * 37;
if (maxColumnSize < 600) {
maxColumnSize = 600;
}
if (maxColumnSize > 1200) {
maxColumnSize = 1200;
}
//设置字体大小
TextInfo textInfo = new TextInfo();
textInfo.setFontSize(10);
int finalColumnSize = columnSize;
int finalColumnPointSize = columnPointSize;
InputDialog.show(uiParamEntity.getColumnComment(), "", "确定", "取消")
.setCancelable(false)
.setInputInfo(new InputInfo().setTextInfo(textInfo).setInputType(finalInputType).setMAX_LENGTH(columnSize))
.setTitleTextInfo(textInfo)
.setOkTextInfo(textInfo)
.setCancelTextInfo(textInfo)
.setMaxWidth(maxColumnSize)
.setInputHintText("输入" + uiParamEntity.getColumnComment()).setOkButton(new OnInputDialogButtonClickListener<InputDialog>() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
if (uiParamEntity.getJavaType().equals("BigDecimal") || uiParamEntity.getJavaType().equals("Duoble")) {
if (!inputStr.matches(
"^\\d{1," + (finalColumnSize - finalColumnPointSize - 1) + "}(\\.\\d{1," + (finalColumnPointSize<1?1:finalColumnPointSize) + "})?$"
)) {
ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
return true;
}
}
viewModel.currentParamEntity.setShowName(inputStr);
viewModel.currentParamEntity.setContent(inputStr);
viewModel.currentParamEntity.notifyChange();
return false;
Log.i("scan", "输入的是：" + input);
}
})
});
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
/** 原
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
@Override public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Log.i("scan", "输入的是：" + input);
}
})
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
*/
}
//拍照
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/ImmunRecordFragment.java
View file @ 37eb74e2
......@@ -24,6 +24,10 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
import com.bigkoo.pickerview.listener.OnTimeSelectChangeListener;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.bigkoo.pickerview.view.TimePickerView;
import com.kongzue.dialogx.dialogs.InputDialog;
import com.kongzue.dialogx.interfaces.OnInputDialogButtonClickListener;
import com.kongzue.dialogx.util.InputInfo;
import com.kongzue.dialogx.util.TextInfo;
import com.phlx.anchorcollect.BR;
import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.R;
......@@ -234,6 +238,7 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
//判断下限制的长度
int columnSize = 500;//不限制的设置成500
int columnPointSize = -1;
if (uiParamEntity.getColumnType().indexOf("(") > -1 && uiParamEntity.getColumnType().indexOf(")") > -1) {
......@@ -242,6 +247,11 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf("(") + 1, uiParamEntity.getColumnType().indexOf(",")
)
) + 1;
columnPointSize = Integer.parseInt(
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf(",") + 1, uiParamEntity.getColumnType().indexOf(")")
)
);
} else {
columnSize = Integer.parseInt(
......@@ -252,40 +262,82 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
}
}
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
int maxColumnSize = columnSize * 37;
if (maxColumnSize < 600) {
maxColumnSize = 600;
}
if (maxColumnSize > 1200) {
maxColumnSize = 1200;
}
//设置字体大小
TextInfo textInfo = new TextInfo();
textInfo.setFontSize(10);
int finalColumnSize = columnSize;
int finalColumnPointSize = columnPointSize;
InputDialog.show(uiParamEntity.getColumnComment(), "", "确定", "取消")
.setCancelable(false)
.setInputInfo(new InputInfo().setTextInfo(textInfo).setInputType(finalInputType).setMAX_LENGTH(columnSize))
.setTitleTextInfo(textInfo)
.setOkTextInfo(textInfo)
.setCancelTextInfo(textInfo)
.setMaxWidth(maxColumnSize)
.setInputHintText("输入" + uiParamEntity.getColumnComment()).setOkButton(new OnInputDialogButtonClickListener<InputDialog>() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
if (uiParamEntity.getJavaType().equals("BigDecimal") || uiParamEntity.getJavaType().equals("Duoble")) {
if (!inputStr.matches(
"^\\d{1," + (finalColumnSize - finalColumnPointSize - 1) + "}(\\.\\d{1," + (finalColumnPointSize<1?1:finalColumnPointSize) + "})?$"
)) {
ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
return true;
}
}
viewModel.currentParamEntity.setShowName(inputStr);
viewModel.currentParamEntity.setContent(inputStr);
viewModel.currentParamEntity.notifyChange();
return false;
Log.i("scan", "输入的是：" + input);
}
})
});
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
/** 原
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
@Override public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Log.i("scan", "输入的是：" + input);
}
})
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
*/
}
//拍照
......@@ -293,7 +345,7 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
RxPermissions rxPermissions = new RxPermissions(getActivity());
rxPermissions.request(Manifest.permission.CAMERA, Manifest.permission
.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
.subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/MedicalRecordFragment.java
View file @ 37eb74e2
......@@ -24,6 +24,10 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
import com.bigkoo.pickerview.listener.OnTimeSelectChangeListener;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.bigkoo.pickerview.view.TimePickerView;
import com.kongzue.dialogx.dialogs.InputDialog;
import com.kongzue.dialogx.interfaces.OnInputDialogButtonClickListener;
import com.kongzue.dialogx.util.InputInfo;
import com.kongzue.dialogx.util.TextInfo;
import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.R;
import com.phlx.anchorcollect.data.VMFactory;
......@@ -232,6 +236,7 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
//判断下限制的长度
int columnSize = 500;//不限制的设置成500
int columnPointSize = -1;
if (uiParamEntity.getColumnType().indexOf("(") > -1 && uiParamEntity.getColumnType().indexOf(")") > -1) {
......@@ -240,6 +245,11 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf("(") + 1, uiParamEntity.getColumnType().indexOf(",")
)
) + 1;
columnPointSize = Integer.parseInt(
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf(",") + 1, uiParamEntity.getColumnType().indexOf(")")
)
);
} else {
columnSize = Integer.parseInt(
......@@ -250,40 +260,82 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
}
}
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
int maxColumnSize = columnSize * 37;
if (maxColumnSize < 600) {
maxColumnSize = 600;
}
if (maxColumnSize > 1200) {
maxColumnSize = 1200;
}
//设置字体大小
TextInfo textInfo = new TextInfo();
textInfo.setFontSize(10);
int finalColumnSize = columnSize;
int finalColumnPointSize = columnPointSize;
InputDialog.show(uiParamEntity.getColumnComment(), "", "确定", "取消")
.setCancelable(false)
.setInputInfo(new InputInfo().setTextInfo(textInfo).setInputType(finalInputType).setMAX_LENGTH(columnSize))
.setTitleTextInfo(textInfo)
.setOkTextInfo(textInfo)
.setCancelTextInfo(textInfo)
.setMaxWidth(maxColumnSize)
.setInputHintText("输入" + uiParamEntity.getColumnComment()).setOkButton(new OnInputDialogButtonClickListener<InputDialog>() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
if (uiParamEntity.getJavaType().equals("BigDecimal") || uiParamEntity.getJavaType().equals("Duoble")) {
if (!inputStr.matches(
"^\\d{1," + (finalColumnSize - finalColumnPointSize - 1) + "}(\\.\\d{1," + (finalColumnPointSize<1?1:finalColumnPointSize) + "})?$"
)) {
ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
return true;
}
}
viewModel.currentParamEntity.setShowName(inputStr);
viewModel.currentParamEntity.setContent(inputStr);
viewModel.currentParamEntity.notifyChange();
return false;
Log.i("scan", "输入的是：" + input);
}
})
});
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
/** 原
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
@Override public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Log.i("scan", "输入的是：" + input);
}
})
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
*/
}
//拍照
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/PerformanceFragment.java
View file @ 37eb74e2
......@@ -25,6 +25,10 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder;
import com.bigkoo.pickerview.listener.OnTimeSelectChangeListener;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.bigkoo.pickerview.view.TimePickerView;
import com.kongzue.dialogx.dialogs.InputDialog;
import com.kongzue.dialogx.interfaces.OnInputDialogButtonClickListener;
import com.kongzue.dialogx.util.InputInfo;
import com.kongzue.dialogx.util.TextInfo;
import com.phlx.anchorcollect.Configs;
import com.phlx.anchorcollect.R;
import com.phlx.anchorcollect.data.VMFactory;
......@@ -235,6 +239,7 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
//判断下限制的长度
int columnSize = 500;//不限制的设置成500
int columnPointSize = -1;
if (uiParamEntity.getColumnType().indexOf("(") > -1 && uiParamEntity.getColumnType().indexOf(")") > -1) {
......@@ -243,50 +248,97 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf("(") + 1, uiParamEntity.getColumnType().indexOf(",")
)
) + 1;
columnPointSize = Integer.parseInt(
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf(",") + 1, uiParamEntity.getColumnType().indexOf(")")
)
);
} else {
columnSize = Integer.parseInt(
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf("(") + 1, uiParamEntity.getColumnType().indexOf(")")
)
);
}
}
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
int maxColumnSize = columnSize * 37;
if (maxColumnSize < 600) {
maxColumnSize = 600;
}
if (maxColumnSize > 1200) {
maxColumnSize = 1200;
}
//设置字体大小
TextInfo textInfo = new TextInfo();
textInfo.setFontSize(10);
int finalColumnSize = columnSize;
int finalColumnPointSize = columnPointSize;
InputDialog.show(uiParamEntity.getColumnComment(), "", "确定", "取消")
.setCancelable(false)
.setInputInfo(new InputInfo().setTextInfo(textInfo).setInputType(finalInputType).setMAX_LENGTH(columnSize))
.setTitleTextInfo(textInfo)
.setOkTextInfo(textInfo)
.setCancelTextInfo(textInfo)
.setMaxWidth(maxColumnSize)
.setInputHintText("输入" + uiParamEntity.getColumnComment()).setOkButton(new OnInputDialogButtonClickListener<InputDialog>() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
if (uiParamEntity.getJavaType().equals("BigDecimal") || uiParamEntity.getJavaType().equals("Duoble")) {
if (!inputStr.matches(
"^\\d{1," + (finalColumnSize - finalColumnPointSize - 1) + "}(\\.\\d{1," + (finalColumnPointSize<1?1:finalColumnPointSize) + "})?$"
)) {
ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
return true;
}
}
viewModel.currentParamEntity.setShowName(inputStr);
viewModel.currentParamEntity.setContent(inputStr);
viewModel.currentParamEntity.notifyChange();
return false;
Log.i("scan", "输入的是：" + input);
}
})
});
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
/** 原
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
@Override public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Log.i("scan", "输入的是：" + input);
}
})
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
*/
}
//拍照
......@@ -294,7 +346,7 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
RxPermissions rxPermissions = new RxPermissions(getActivity());
rxPermissions.request(Manifest.permission.CAMERA, Manifest.permission
.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
.subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/WeightManFragment.java
View file @ 37eb74e2
......@@ -367,11 +367,11 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
} else if (uiParamEntity.getJavaType().equals("String")) {
inputType = InputType.TYPE_CLASS_TEXT;
}
int finalInputType = inputType;
//判断下限制的长度
int columnSize = 500;//不限制的设置成500
int columnPointSize = -1;
if (uiParamEntity.getColumnType().indexOf("(") > -1 && uiParamEntity.getColumnType().indexOf(")") > -1) {
......@@ -380,6 +380,11 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf("(") + 1, uiParamEntity.getColumnType().indexOf(",")
)
) + 1;
columnPointSize = Integer.parseInt(
uiParamEntity.getColumnType().substring(
uiParamEntity.getColumnType().indexOf(",") + 1, uiParamEntity.getColumnType().indexOf(")")
)
);
} else {
columnSize = Integer.parseInt(
......@@ -390,41 +395,82 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
}
}
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
int maxColumnSize = columnSize * 37;
if (maxColumnSize < 600) {
maxColumnSize = 600;
}
if (maxColumnSize > 1200) {
maxColumnSize = 1200;
}
//设置字体大小
TextInfo textInfo = new TextInfo();
textInfo.setFontSize(10);
int finalColumnSize = columnSize;
int finalColumnPointSize = columnPointSize;
InputDialog.show(uiParamEntity.getColumnComment(), "", "确定", "取消")
.setCancelable(false)
.setInputInfo(new InputInfo().setTextInfo(textInfo).setInputType(finalInputType).setMAX_LENGTH(columnSize))
.setTitleTextInfo(textInfo)
.setOkTextInfo(textInfo)
.setCancelTextInfo(textInfo)
.setMaxWidth(maxColumnSize)
.setInputHintText("输入" + uiParamEntity.getColumnComment()).setOkButton(new OnInputDialogButtonClickListener<InputDialog>() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
public boolean onClick(InputDialog baseDialog, View v, String inputStr) {
Log.i("scan", "输入的是：" + input);
}
})
if (uiParamEntity.getJavaType().equals("BigDecimal") || uiParamEntity.getJavaType().equals("Duoble")) {
if (!inputStr.matches(
"^\\d{1," + (finalColumnSize - finalColumnPointSize - 1) + "}(\\.\\d{1," + (finalColumnPointSize<1?1:finalColumnPointSize) + "})?$"
)) {
ToastUtils.showShort("输入异常，整数最大" + (finalColumnSize - finalColumnPointSize - 1) + "位，小数最大" + finalColumnPointSize + "位");
return true;
}
}
viewModel.currentParamEntity.setShowName(inputStr);
viewModel.currentParamEntity.setContent(inputStr);
viewModel.currentParamEntity.notifyChange();
return false;
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
});
/** 原
new MaterialDialog.Builder(getActivity())
.title(uiParamEntity.getColumnComment())
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.content("请输入")
// .widgetColor(Color.BLUE)//输入框光标的颜色
.inputType(inputType)//可以输入的类型
.inputRangeRes(0, columnSize, android.R.color.black)
//前2个一个是hint一个是预输入的文字
.input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
@Override public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
Log.i("scan", "输入的是：" + input);
}
})
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
// dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
String inputStr = dialog.getInputEditText().getText().toString();
// if (finalInputType == InputType.TYPE_CLASS_TEXT && inputStr.length() > 10) {
// dialog.getInputEditText().setText(inputStr.subSequence(0, 10));
// ToastUtils.showShort("输入长度超长");
// } else {
viewModel.currentParamEntity.setShowName(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.setContent(dialog.getInputEditText().getText().toString());
viewModel.currentParamEntity.notifyChange();
// }
}
})
.show();
*/
}
//拍照
......
app/src/main/java/com/phlx/anchorcollect/ui/fragment/vm/ImmunRecordVM.java
View file @ 37eb74e2
......@@ -205,10 +205,10 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
public void click(int id) {
if (Configs.tempUnid == null) {
ToastUtils.showShort("请扫描耳标或者输入耳标信息");
return;
}
// if (Configs.tempUnid == null) {
// ToastUtils.showShort("请扫描耳标或者输入耳标信息");
// return;
// }
//99备注，100照片
if (id == 99) {
......
app/src/main/java/com/phlx/anchorcollect/ui/main/MainActivity.java
View file @ 37eb74e2
......@@ -131,7 +131,7 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
//初始化Fragment
initFragment();
initRFID();
// initRFID();
}
private void initRFID(){
......
app/src/main/java/com/phlx/anchorcollect/ui/main/MainVM.java
View file @ 37eb74e2
......@@ -14,11 +14,14 @@ import com.phlx.anchorcollect.db.gen.DictEntityDao;
import com.phlx.anchorcollect.db.interf.DbQueryCallBack;
import com.phlx.anchorcollect.entity.CattleResumeEntity;
import com.phlx.anchorcollect.entity.DictEntity;
import com.phlx.anchorcollect.entity.GenTableColumn;
import com.phlx.anchorcollect.ui.base.MainBarVM;
import com.phlx.anchorcollect.util.EntityUtils;
import com.uhf.structures.FilterParams;
import org.greenrobot.greendao.query.QueryBuilder;
import java.io.File;
import java.util.List;
import me.goldze.mvvmhabit.binding.command.BindingAction;
......@@ -156,7 +159,29 @@ public class MainVM extends MainBarVM<Repository> {
ToastUtils.showShort("请先扫描耳标");
return;
}
onTabClickEvent.setValue(5);
QueryBuilder<CattleResumeEntity> builder =
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.Unid.eq(Configs.tempUnid));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
if (result != null && result.size() > 0) {
if (result.get(0).getSex().equals("2")) {
onTabClickEvent.setValue(5);
}else{
ToastUtils.showShort("公牛无法配种！");
}
}
}
@Override
public void onFailed() {
ToastUtils.showShort("基础档案数据库查询失败");
}
}).queryAsyncAll(CattleResumeEntity.class, builder);
}
});
......
build.gradle
View file @ 37eb74e2
......@@ -2,6 +2,9 @@
apply from: "config.gradle"
buildscript {
ext {
agp_version = '3.5.0'
}
repositories {
google()
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
......@@ -18,7 +21,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
// NOTE: Do not place your application dependencies here; they belong
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment