修改生产信息绑定赋值问题

app/src/main/java/com/uas/rd_equipment/UrlDataAdapter.java

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.util.Base64;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -49,6 +50,7 @@ public class UrlDataAdapter extends BaseQuickAdapter<UrlDataBean.DeviceBean.UrlB
             public void onClick(View v) {
                 String path = item.getPath();
                 String filepath = new String(Base64.decode(path.getBytes(),Base64.DEFAULT));
+                Log.e("filepath",filepath);
                 if (!StringUtil.isEmpty(filepath)){
                     jumpUriToBrowser(mContext,filepath);
                 }else {

app/src/main/java/com/uas/rd_equipment/fragment/AddEquipmentGrantFragment.java

@@ -994,11 +994,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                 tv_prompt.setVisibility(View.VISIBLE);
                 tv_prompt.setTextColor(Color.GREEN);
                 tv_prompt.setText("领用成功");
-                String result = o.toString();
-                JSONObject resultObject = JSON.parseObject(result);
-                JSONObject dataObject = resultObject.getJSONObject("items");
-                String de_name = FastjsonUtil.getText(dataObject, "dc_code");
-                tv_grantcode.setText(de_name);
+
             }
 
             @Override

app/src/main/res/layout/pop_outboundlist_quantity.xml

@@ -13,7 +13,7 @@
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:background="@color/transparent"
-        android:text="拨出单过账"
+        android:text="出库单过账"
         android:textSize="@dimen/app_text_size_body_2" />
 
 

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

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">设备管理系统</string>
-    <string name="app_name_mes">设备管理系统</string>
+    <string name="app_name_mes">设备管理</string>
     <string name="app_name_test">康特客</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>

build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 13,
-            versionName      : "v1.0.3"
+            versionCode      : 14,
+            versionName      : "v1.0.4"
     ]
 
     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 = 12;
-  public static final String VERSION_NAME = "v1.0.2";
+  public static final int VERSION_CODE = 13;
+  public static final String VERSION_NAME = "v1.0.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="12"
-    android:versionName="v1.0.2" >
+    android:versionCode="13"
+    android:versionName="v1.0.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":12,"versionName":"v1.0.2","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":13,"versionName":"v1.0.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="12"
-    android:versionName="v1.0.2" >
+    android:versionCode="13"
+    android:versionName="v1.0.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="12"
-5    android:versionName="v1.0.2" >
+4    android:versionCode="13"
+5    android:versionName="v1.0.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":12,"versionName":"v1.0.2","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":13,"versionName":"v1.0.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":""}}]