1.锡盟临时打标功能,修改名称

app/src/main/java/com/phlx/wool/ui/cattle/vm/CattleMarkVM.java

@@ -63,7 +63,7 @@ public class CattleMarkVM extends BackBarVM<Repository> {
 
     //初始化ToolBar
     public void initToolbar() {
-        setBackTitleText("补打标签");
+        setBackTitleText("基础信息录入");
         setSettingVisibleObservable(View.GONE);
         setBackRightTextVisible(View.VISIBLE);
         setBackRightText("保存");

app/src/main/java/com/phlx/wool/ui/cattle/vm/CattleUploadVM.java

@@ -72,7 +72,7 @@ public class CattleUploadVM extends BackBarVM<Repository> {
                                     .compose(RxUtils.bindToLifecycle(getLifecycleProvider()))
                                     .compose(RxUtils.schedulersTransformer())
                                     .compose(RxUtils.exceptionTransformer())
-                                    .doOnSubscribe(disposable -> showDialog("正在上传补打记录数据..."))
+                                    .doOnSubscribe(disposable -> showDialog("正在上传基础数据..."))
                                     .subscribe((Consumer<CattleResponse<List<CattleLabelEntity>>>) response -> {
                                         KLog.e(response.getCode() + response.getMsg());
                                         if (response.getCode() == 0) {
@@ -84,13 +84,13 @@ public class CattleUploadVM extends BackBarVM<Repository> {
                                                         dismissDialog();
                                                         refreshUploadCount();
                                                     }else{
-                                                        ToastUtils.showShort("删除补打记录失败");
+                                                        ToastUtils.showShort("删除基础数据失败");
                                                     }
                                                 }
                                             }).deleteAsyncAll(CattleLabelEntity.class);
                                         } else {
                                             dismissDialog();
-                                            ToastUtils.showShort("补打记录上传失败");
+                                            ToastUtils.showShort("基础数据上传失败");
                                         }
                                     }, (Consumer<ResponseThrowable>) throwable -> {
                                         dismissDialog();

app/src/main/res/values/strings.xml

 <resources>
 <!--    <string name="app_name">追溯系统</string>-->
-    <string name="app_name">补打系统</string>
+    <string name="app_name">基础信息录入</string>
     <string name="setting">设置</string>
     <string name="jobNum">工号:</string>
     <string name="pleaseInputUserName">请输入用户名</string>