Merge remote-tracking branch 'origin/master-new-炒锅' into master-new-炒锅

app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateAllDataService.java

@@ -69,7 +69,6 @@ import okhttp3.RequestBody;
  */
 public class UpdateAllDataService {
     private static String path = UpdateDataService.path;
-    private static String key = UpdateDataService.key;
 
     public static void startUpLoadAll(List<BPA_GOODS> goods,Context context){
         if(ConfigName.getInstance().isFast2Click()){
@@ -113,7 +112,7 @@ public class UpdateAllDataService {
             params.put("autokey",ConfigName.getInstance().DeviceAutoKey);
             String body = new Gson().toJson(params);
             HttpHeaders headers = new HttpHeaders();
-            headers.put("key", key);
+            headers.put("key", UpdateDataService.key);
             OkGo.<ProcessModelBean>post(url)
                     .tag(context)
                     .upRequestBody( RequestBody.create(MediaType.parse("application/json; charset=utf-8"),body))
@@ -235,7 +234,7 @@ public class UpdateAllDataService {
     }
     private static void Post(String url, Context context, Object data, String typeInfo, IRunT<Response<UploadRes<UpResData>>> Success){
         HttpHeaders headers = new HttpHeaders();
-        headers.put("key", key);
+        headers.put("key", UpdateDataService.key);
         OkGo.<UploadRes<UpResData>>post(url)
                 .tag(context)
                 .upRequestBody(RequestBody.create(MediaType.parse("application/json; charset=utf-8"),new Gson().toJson(data)))