修复bug

app/src/main/java/com/uas/hycollection/fragment/BreakdownRepairFragment.java

@@ -369,7 +369,7 @@ public class BreakdownRepairFragment extends BaseFragment{
             public void onClick(View v) {
                 at_station.setFocusableInTouchMode(true);
                 at_station.setText("");
-                getReapirInfo(at_station.getText().toString().trim(),ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
+                getReapirInfo(at_station.getText().toString().trim(),tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
                 at_station.requestFocus();
             }
         });
@@ -478,7 +478,7 @@ public class BreakdownRepairFragment extends BaseFragment{
 
         sc_codecollethree = SharedPreUtil.getString(mActivity, "sc_codecollethree", null);
         at_station.setText(sc_codecollethree);
-        getReapirInfo(sc_codecollethree,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
+        getReapirInfo(sc_codecollethree,tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
         getfuzzySearchSourceData(sc_codecollethree,"");
 
 
@@ -819,7 +819,7 @@ public class BreakdownRepairFragment extends BaseFragment{
 //                                    at_station.setText(sc_code);
 
                                     if (!StringUtil.isEmpty(sc_code)){
-                                        getReapirInfo(sc_code,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
+                                        getReapirInfo(sc_code,tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
                                     }
                                     at_station.clearFocus();
                                     ce_work_code.clearFocus();
@@ -1690,7 +1690,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                 at_station.setText(sc_code);
                 if (!StringUtil.isEmpty(sc_code)){
                     SharedPreUtil.saveString(mActivity,"sc_codecollethree",sc_code);
-                    getReapirInfo(sc_code,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
+                    getReapirInfo(sc_code,tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
                 }
                 at_station.clearFocus();
                 ce_work_code.clearFocus();
@@ -1870,7 +1870,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                     return;
                 }
 
-                getReapirInfo(at_station.getText().toString().trim(),ce_work_code.getText().toString().trim(),li_code);
+                getReapirInfo(at_station.getText().toString().trim(),tv_macode.getText().toString().trim(),li_code);
 
 
                 closeListPopupWindow();

app/src/main/java/com/uas/hycollection/fragment/StorageRechargeListFragment.java

@@ -366,7 +366,7 @@ public class StorageRechargeListFragment extends BaseFragment{
             @Override
             public void onClick(View v) {
                 at_station.setText("");
-                getReapirInfo(at_station.getText().toString().trim(),ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
+                getReapirInfo(at_station.getText().toString().trim(),tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
                 at_station.requestFocus();
                 at_station.setFocusableInTouchMode(true);
             }
@@ -478,7 +478,7 @@ public class StorageRechargeListFragment extends BaseFragment{
 
         sc_codecolletwo = SharedPreUtil.getString(mActivity, "sc_codecolletwo", null);
         at_station.setText(sc_codecolletwo);
-        getReapirInfo(sc_codecolletwo,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
+        getReapirInfo(sc_codecolletwo,tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
 //        getfuzzySearchSourceData(sc_codecolletwo,"");
         listSama = new ArrayList<>();
         WindowManager wm = mActivity.getWindowManager();
@@ -510,6 +510,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         va_timeColumn = new Column<String>("时间", "SR_INDATE");
     }
     public void getReapirInfo(String bgcode,String ma_code,String li_code){
+
         if (ce_work_code.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请选择工单流水");
             return;
@@ -918,7 +919,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                                 if (dataObject != null) {
                                     String sc_code = JsonUtils.optStringNotNull(dataObject, "SC_CODE");
 //                                    at_station.setText(sc_code);
-                                    getReapirInfo(sc_code,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
+                                    getReapirInfo(sc_code,tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
                                     at_station.clearFocus();
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.clearFocus();
@@ -1394,7 +1395,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                     return;
                 }
                 at_station.setText(sc_code);
-                getReapirInfo(sc_code,ce_work_code.getText().toString().trim(),ce_wuli.getText().toString().trim());
+                getReapirInfo(sc_code,tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
                 at_station.clearFocus();
                 ce_work_code.clearFocus();
                 tv_dc_emcode.clearFocus();
@@ -1583,7 +1584,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                     CommonUtil.toastNoRepeat(mActivity,"请选择物理线体");
                     return;
                 }
-                getReapirInfo(at_station.getText().toString().trim(),ce_work_code.getText().toString().trim(),li_code);
+                getReapirInfo(at_station.getText().toString().trim(),tv_macode.getText().toString().trim(),li_code);
                 closeListPopupWindow();
             }
         });

build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 32,
-            versionName      : "v1.2.2"
+            versionCode      : 33,
+            versionName      : "v1.2.3"
     ]
 
     depsVersion = [

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -13,6 +13,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 31;
-  public static final String VERSION_NAME = "v1.2.1";
+  public static final int VERSION_CODE = 33;
+  public static final String VERSION_NAME = "v1.2.3";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="31"
-    android:versionName="v1.2.1" >
+    android:versionCode="33"
+    android:versionName="v1.2.3" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"v1.2.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":33,"versionName":"v1.2.3","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/library_manifest/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="31"
-    android:versionName="v1.2.1" >
+    android:versionCode="33"
+    android:versionName="v1.2.3" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -1,8 +1,8 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 3    package="com.handmark.pulltorefresh.library"
-4    android:versionCode="31"
-5    android:versionName="v1.2.1" >
+4    android:versionCode="33"
+5    android:versionName="v1.2.3" >
 6
 7    <uses-sdk
 8        android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/merged_manifests/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"v1.2.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":33,"versionName":"v1.2.3","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug","dirName":""},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]