删除未使用的代码

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareApiUtil.java

@@ -33,6 +33,11 @@ public class DeckSquareApiUtil {
     private static final String TAG = DeckSquareListAdapter.class.getSimpleName();
 
 
+    /**
+     *
+     * 如果未登录（不存在token），显示toast提示用户。如果已登录，返回token
+     * @return
+     */
     public static LoginToken getLoginData() {
         String serverToken = SharedPreferenceUtil.getServerToken();
         Integer serverUserId = SharedPreferenceUtil.getServerUserId();
@@ -45,20 +50,6 @@ public class DeckSquareApiUtil {
 
     }
 
-    /**
-     * 如果未登录（不存在token），显示toast提示用户。如果已登录，返回token
-     *
-     * @return
-     */
-    public static String getServerToken() {
-        String serverToken = SharedPreferenceUtil.getServerToken();//todo serverToken要外部传入还是此处获取？考虑
-        if (serverToken == null) {
-            YGOUtil.showTextToast("Please login first!");
-            return null;
-        } else {
-            return serverToken;
-        }
-    }
 
     public static SquareDeckResponse getSquareDecks() throws IOException {
         SquareDeckResponse result = null;

mobile/src/main/java/cn/garymb/ygomobile/utils/OkhttpUtil.java

@@ -25,88 +25,6 @@ public class OkhttpUtil {
 
     private static OkHttpClient okHttpClient;
 
-//    public static void post(String address, Map<String, Object> map, Callback callback) {
-//        post(address, map, null, null, 0, callback);
-//    }
-//
-//    public static void post(String address, Map<String, Object> map, Header oyHeader, String tag, int timeout, Callback callback) {
-//        post(address, map, null, oyHeader, tag, timeout, callback);
-//    }
-
-//    public static void post(String address, Map<String, Object> map, String cookie, Header oyHeader, String tag, int timeout, Callback callback) {
-//        okHttpClient = new OkHttpClient();
-//
-//        if (timeout != 0)
-//            okHttpClient = okHttpClient.newBuilder().connectTimeout(timeout, TimeUnit.SECONDS)//设置连接超时时间
-//                    .readTimeout(timeout, TimeUnit.SECONDS)//设置读取超时时间
-//                    .build();
-//
-//        MultipartBody.Builder builder1 = new MultipartBody.Builder();
-//        if (map != null) {
-//            builder1.setType(MultipartBody.FORM);
-//            for (Map.Entry<String, Object> stringObjectEntry : map.entrySet()) {
-//                String key = stringObjectEntry.getKey();
-//                Object value = stringObjectEntry.getValue();
-//                if (value instanceof List) {
-//                    List list = (List) value;
-//                    for (Object object : list) {
-//                        if (object instanceof File) {
-//                            File file = (File) object;
-//                            builder1.addFormDataPart(key
-//                                    , file.getName(),
-//                                    RequestBody.create(MediaType.parse("multipart/form-data"), file));
-//                        } else {
-//                            builder1.addFormDataPart(key, value.toString());
-//                        }
-//                    }
-//                } else if (value instanceof File) {//如果请求的值是文件
-//                    File file = (File) value;
-//                    //MediaType.parse("application/octet-stream")以二进制的形式上传文件
-//                    builder1.addFormDataPart(key, file.getName(),
-//                            RequestBody.create(MediaType.parse("multipart/form-data"), file));
-//                } else if (value instanceof String[]) {
-//
-//                    String[] list = (String[]) value;
-//                    for (Object object : list) {
-//                        if (object instanceof File) {
-//                            File file = (File) object;
-//                            builder1.addFormDataPart(key
-//                                    , file.getName(),
-//                                    RequestBody.create(MediaType.parse("multipart/form-data"), file));
-//                        } else {
-//                            Log.e("OkHttpUtil", key + "添加数组" + object.toString());
-//                            builder1.addFormDataPart(key, object.toString());
-//                        }
-//                    }
-////                    Log.e("OkhttpUtil","添加数组"+new Gson().toJson(value));
-//                } else {
-//                    //如果请求的值是string类型
-//                    builder1.addFormDataPart(key, value.toString());
-//                }
-//            }
-//        }
-//        Request.Builder request = new Request.Builder()
-//                .url(address);
-//        if (oyHeader != null)
-//            request = request.header(oyHeader.getName(), oyHeader.getValue());
-//
-////        request.addHeader("Connection", "keep-alive");
-//
-//        if (!TextUtils.isEmpty(tag))
-//            request = request.tag(tag);
-//        if (map != null)
-//            request.post(builder1.build());
-//        else
-//            request.post(okhttp3.internal.Util.EMPTY_REQUEST);
-//
-//
-
-    /// /        Log.e("OkhttpUtil","post请求："+builder1.build().toString());
-//        if (!TextUtils.isEmpty(cookie)) {
-//            request.addHeader("cookie", cookie);
-//        }
-//        okHttpClient.newCall(request.build()).enqueue(callback);
-//    }
     public static void put(String address, Map<String, Object> map, String cookie, Callback callback) {
         OkHttpClient.Builder client = new OkHttpClient.Builder();