升级2.x版本

README.md

@@ -4,13 +4,10 @@
 
 module 下添加
 
-`implementation 'com.yanyi.benyanyi:okhttplib:1.1.8'` 
+`implementation 'com.yanyi.benyanyi:okhttplib:2.0.0'` 
   
 ### 更新记录
-* 2019-08-19(1.1.8) 
-* 2019-08-16(1.1.7) 优化下载方法，添加下载暂停方法
-* 2019-08-15(1.1.6) 优化下载方法，添加下载文件后缀添加方法
-* 2019-08-13(1.1.5) 重构代码，优化方法，使调用更简洁明了
+* 2019-08-20(2.0.0) 升级2.x版本,重构代码，优化方法，使调用更简洁明了
 * 2019-07-19(1.1.4) 优化回调方法
 * 2019-06-14(1.1.3) 优化代码，更改包名，用于统一化开源库
 * 2019-03-06(1.1.2) 去除在线更新方法，将在线更新单独做开源库，去除多余下载方法，减少库大小

okhttplib/bintrayUpload.gradle

@@ -7,7 +7,7 @@ def siteUrl = 'http://www.yanyis.space/yanyi/baseokhttp' // 项目主页。
 def gitUrl = 'http://www.yanyis.space/yanyi/baseokhttp.git' // Git仓库的url。
 
 group = "com.yanyi.benyanyi"// 唯一包名,比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的com.ansen.http就是这里配置的。
-version = "1.1.8" //项目引用的版本号，比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的1.0.1就是这里配置的。
+version = "2.0.0" //项目引用的版本号，比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的1.0.1就是这里配置的。
 install {
     repositories.mavenInstaller {
         // This generates POM.xml with proper parameters

okhttplib/src/main/java/com/benyanyi/okhttp/download/DownloadCall.java

@@ -2,6 +2,7 @@ package com.benyanyi.okhttp.download;
 
 import android.content.Context;
 
+import com.benyanyi.okhttp.listener.OnDownLoadObserver;
 import com.benyanyi.okhttp.util.FormatUtil;
 
 /**
@@ -22,14 +23,6 @@ public class DownloadCall implements DownloadConfig {
         this.suffix = builder.suffix;
     }
 
-    //    @Override
-//    public void start(OnDownLoadObserver onDownLoadObserver) {
-//        if (FormatUtil.isEmpty(this.suffix)) {
-//            DownloadManager.getInstance(mContext).download(url, onDownLoadObserver);
-//        } else {
-//            DownloadManager.getInstance(mContext).download(url, suffix, onDownLoadObserver);
-//        }
-//    }
     @Override
     public void start() {
         if (FormatUtil.isEmpty(this.suffix)) {
@@ -39,6 +32,15 @@ public class DownloadCall implements DownloadConfig {
         }
     }
 
+    @Override
+    public void start(OnDownLoadObserver onDownLoadObserver) {
+        if (FormatUtil.isEmpty(this.suffix)) {
+            DownloadManager.getInstance(mContext).download(url, onDownLoadObserver);
+        } else {
+            DownloadManager.getInstance(mContext).download(url, suffix, onDownLoadObserver);
+        }
+    }
+
     @Override
     public void pause() {
         DownloadManager.getInstance(mContext).pause(url);

okhttplib/src/main/java/com/benyanyi/okhttp/download/DownloadConfig.java

@@ -1,5 +1,7 @@
 package com.benyanyi.okhttp.download;
 
+import com.benyanyi.okhttp.listener.OnDownLoadObserver;
+
 /**
  * @author YanYi
  * @date 2019-08-15 10:25
@@ -8,9 +10,10 @@ package com.benyanyi.okhttp.download;
  */
 public interface DownloadConfig {
 
-//    void start(OnDownLoadObserver onDownLoadObserver);
     void start();
 
+    void start(OnDownLoadObserver onDownLoadObserver);
+
     void pause();
 
     void cancel();

okhttplib/src/main/java/com/benyanyi/okhttp/download/DownloadManager.java

@@ -2,6 +2,8 @@ package com.benyanyi.okhttp.download;
 
 import android.content.Context;
 
+import com.benyanyi.okhttp.listener.OnDownLoadObserver;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -84,13 +86,22 @@ class DownloadManager {
      *
      * @param suffix 文件名后缀
      * @param url    下载请求的网址
-     *               //     * @param onDownLoadObserver 用来回调的接口
      */
     void download(String url, String suffix) {
         this.suffix = suffix;
         this.download(url);
     }
 
+    /**
+     * 开始下载
+     *
+     * @param suffix             文件名后缀
+     * @param url                下载请求的网址
+     * @param onDownLoadObserver 用来回调的接口
+     */
+    void download(String url, String suffix, OnDownLoadObserver onDownLoadObserver) {
+    }
+
     /**
      * 开始下载
      *
@@ -151,6 +162,43 @@ class DownloadManager {
 //        }
     }
 
+    void download(String url, OnDownLoadObserver onDownLoadObserver) {
+        Observable.just(url)
+                //call的map已经有了,就证明正在下载,则这次不下载
+                .filter(new Predicate<String>() {
+                    @Override
+                    public boolean test(String s) throws Exception {
+                        return !downCalls.containsKey(s);
+                    }
+                })
+                .flatMap(new Function<String, ObservableSource<?>>() {
+                    @Override
+                    public ObservableSource<?> apply(String s) throws Exception {
+                        return Observable.just(createDownInfo(s));
+                    }
+                })
+                //检测本地文件夹,生成新的文件名
+                .map(new Function<Object, DownloadInfo>() {
+                    @Override
+                    public DownloadInfo apply(Object o) throws Exception {
+                        return getRealFileName((DownloadInfo) o);
+                    }
+                })
+                //下载
+                .flatMap(new Function<DownloadInfo, ObservableSource<DownloadInfo>>() {
+                    @Override
+                    public ObservableSource<DownloadInfo> apply(DownloadInfo downloadInfo) throws Exception {
+                        return Observable.create(new DownloadSubscribe(downloadInfo));
+                    }
+                })
+                //在主线程回调
+                .observeOn(AndroidSchedulers.mainThread())
+                //在子线程执行
+                .subscribeOn(Schedulers.io())
+                //添加观察者
+                .subscribe(onDownLoadObserver);
+    }
+
     /**
      * 暂停
      *

okhttplib/src/main/res/layout/notification_contentview.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="@dimen/length10">
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="@dimen/length50"
-        android:layout_height="@dimen/length50" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/padding5"
-        android:gravity="center_vertical"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/comm_black"
-            android:textSize="@dimen/size16" />
-
-        <ProgressBar
-            android:id="@+id/pBar"
-            style="@android:style/Widget.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/padding7"
-            android:layout_marginTop="@dimen/padding3" />
-
-    </LinearLayout>
-
-</LinearLayout>

okhttplib/src/main/res/layout/progress_dialog.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="@dimen/padding10">
-
-    <ProgressBar
-        android:id="@+id/progress"
-        style="@android:style/Widget.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/padding7" />
-
-</LinearLayout>

okhttplib/src/main/res/values-sw240dp-land/dimens.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="title_height">33.75dp</dimen>
-    <dimen name="drawer_width">180.0dp</dimen>
-    <dimen name="padding1">0.75dp</dimen>
-    <dimen name="padding2">1.5dp</dimen>
-    <dimen name="padding3">2.25dp</dimen>
-    <dimen name="padding5">3.75dp</dimen>
-    <dimen name="padding7">5.25dp</dimen>
-    <dimen name="padding8">6.0dp</dimen>
-    <dimen name="padding10">7.5dp</dimen>
-    <dimen name="padding13">9.75dp</dimen>
-    <dimen name="padding15">11.25dp</dimen>
-    <dimen name="padding20">15.0dp</dimen>
-    <dimen name="padding30">22.5dp</dimen>
-    <dimen name="height5">3.75dp</dimen>
-    <dimen name="length16">12.0dp</dimen>
-    <dimen name="length20">15.0dp</dimen>
-    <dimen name="length25">18.75dp</dimen>
-    <dimen name="length30">22.5dp</dimen>
-    <dimen name="length35">26.25dp</dimen>
-    <dimen name="length40">30.0dp</dimen>
-    <dimen name="length50">37.5dp</dimen>
-    <dimen name="length60">45.0dp</dimen>
-    <dimen name="length70">52.5dp</dimen>
-    <dimen name="length80">60.0dp</dimen>
-    <dimen name="length100">75.0dp</dimen>
-    <dimen name="length120">90.0dp</dimen>
-    <dimen name="length150">112.5dp</dimen>
-    <dimen name="length160">120.0dp</dimen>
-    <dimen name="length180">135.0dp</dimen>
-    <dimen name="length240">180.0dp</dimen>
-    <dimen name="size8">6.0sp</dimen>
-    <dimen name="size10">7.5sp</dimen>
-    <dimen name="size12">9.0sp</dimen>
-    <dimen name="size13">9.75sp</dimen>
-    <dimen name="size14">10.5sp</dimen>
-    <dimen name="size15">11.25sp</dimen>
-    <dimen name="size16">12.0sp</dimen>
-    <dimen name="size18">13.5sp</dimen>
-    <dimen name="size20">15.0sp</dimen>
-    <dimen name="size24">18.0sp</dimen>
-    <dimen name="footer_height">45.0dp</dimen>
-    <dimen name="img_length">30.0dp</dimen>
-</resources>

okhttplib/src/main/res/values-sw480dp-land/dimens.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="title_height">67.5dp</dimen>
-    <dimen name="drawer_width">360.0dp</dimen>
-    <dimen name="padding1">1.5dp</dimen>
-    <dimen name="padding2">3.0dp</dimen>
-    <dimen name="padding3">4.5dp</dimen>
-    <dimen name="padding5">7.5dp</dimen>
-    <dimen name="padding7">10.5dp</dimen>
-    <dimen name="padding8">12.0dp</dimen>
-    <dimen name="padding10">15.0dp</dimen>
-    <dimen name="padding13">19.5dp</dimen>
-    <dimen name="padding15">22.5dp</dimen>
-    <dimen name="padding20">30.0dp</dimen>
-    <dimen name="padding30">45.0dp</dimen>
-    <dimen name="height5">7.5dp</dimen>
-    <dimen name="length16">24.0dp</dimen>
-    <dimen name="length20">30.0dp</dimen>
-    <dimen name="length25">37.5dp</dimen>
-    <dimen name="length30">45.0dp</dimen>
-    <dimen name="length35">52.5dp</dimen>
-    <dimen name="length40">60.0dp</dimen>
-    <dimen name="length50">75.0dp</dimen>
-    <dimen name="length60">90.0dp</dimen>
-    <dimen name="length70">105.0dp</dimen>
-    <dimen name="length80">120.0dp</dimen>
-    <dimen name="length100">150.0dp</dimen>
-    <dimen name="length120">180.0dp</dimen>
-    <dimen name="length150">225.0dp</dimen>
-    <dimen name="length160">240.0dp</dimen>
-    <dimen name="length180">270.0dp</dimen>
-    <dimen name="length240">360.0dp</dimen>
-    <dimen name="size8">12.0sp</dimen>
-    <dimen name="size10">15.0sp</dimen>
-    <dimen name="size12">18.0sp</dimen>
-    <dimen name="size13">19.5sp</dimen>
-    <dimen name="size14">21.0sp</dimen>
-    <dimen name="size15">22.5sp</dimen>
-    <dimen name="size16">24.0sp</dimen>
-    <dimen name="size18">27.0sp</dimen>
-    <dimen name="size20">30.0sp</dimen>
-    <dimen name="size24">36.0sp</dimen>
-    <dimen name="footer_height">90.0dp</dimen>
-    <dimen name="img_length">60.0dp</dimen>
-</resources>

okhttplib/src/main/res/values-sw600dp-land/dimens.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="title_height">84.15dp</dimen>
-    <dimen name="drawer_width">448.8dp</dimen>
-    <dimen name="padding1">1.87dp</dimen>
-    <dimen name="padding2">3.74dp</dimen>
-    <dimen name="padding3">5.61dp</dimen>
-    <dimen name="padding5">9.350000000000001dp</dimen>
-    <dimen name="padding7">13.09dp</dimen>
-    <dimen name="padding8">14.96dp</dimen>
-    <dimen name="padding10">18.700000000000003dp</dimen>
-    <dimen name="padding13">24.310000000000002dp</dimen>
-    <dimen name="padding15">28.05dp</dimen>
-    <dimen name="padding20">37.400000000000006dp</dimen>
-    <dimen name="padding30">56.1dp</dimen>
-    <dimen name="height5">9.350000000000001dp</dimen>
-    <dimen name="length16">29.92dp</dimen>
-    <dimen name="length20">37.400000000000006dp</dimen>
-    <dimen name="length25">46.75dp</dimen>
-    <dimen name="length30">56.1dp</dimen>
-    <dimen name="length35">65.45dp</dimen>
-    <dimen name="length40">74.80000000000001dp</dimen>
-    <dimen name="length50">93.5dp</dimen>
-    <dimen name="length60">112.2dp</dimen>
-    <dimen name="length70">130.9dp</dimen>
-    <dimen name="length80">149.60000000000002dp</dimen>
-    <dimen name="length100">187.0dp</dimen>
-    <dimen name="length120">224.4dp</dimen>
-    <dimen name="length150">280.5dp</dimen>
-    <dimen name="length160">299.20000000000005dp</dimen>
-    <dimen name="length180">336.6dp</dimen>
-    <dimen name="length240">448.8dp</dimen>
-    <dimen name="size8">14.96sp</dimen>
-    <dimen name="size10">18.700000000000003sp</dimen>
-    <dimen name="size12">22.44sp</dimen>
-    <dimen name="size13">24.310000000000002sp</dimen>
-    <dimen name="size14">26.18sp</dimen>
-    <dimen name="size15">28.05sp</dimen>
-    <dimen name="size16">29.92sp</dimen>
-    <dimen name="size18">33.660000000000004sp</dimen>
-    <dimen name="size20">37.400000000000006sp</dimen>
-    <dimen name="size24">44.88sp</dimen>
-    <dimen name="footer_height">112.2dp</dimen>
-    <dimen name="img_length">74.80000000000001dp</dimen>
-</resources>

okhttplib/src/main/res/values-sw720dp-land/dimens.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="title_height">101.25dp</dimen>
-    <dimen name="drawer_width">540.0dp</dimen>
-    <dimen name="padding1">2.25dp</dimen>
-    <dimen name="padding2">4.5dp</dimen>
-    <dimen name="padding3">6.75dp</dimen>
-    <dimen name="padding5">11.25dp</dimen>
-    <dimen name="padding7">15.75dp</dimen>
-    <dimen name="padding8">18.0dp</dimen>
-    <dimen name="padding10">22.5dp</dimen>
-    <dimen name="padding13">29.25dp</dimen>
-    <dimen name="padding15">33.75dp</dimen>
-    <dimen name="padding20">45.0dp</dimen>
-    <dimen name="padding30">67.5dp</dimen>
-    <dimen name="height5">11.25dp</dimen>
-    <dimen name="length16">36.0dp</dimen>
-    <dimen name="length20">45.0dp</dimen>
-    <dimen name="length25">56.25dp</dimen>
-    <dimen name="length30">67.5dp</dimen>
-    <dimen name="length35">78.75dp</dimen>
-    <dimen name="length40">90.0dp</dimen>
-    <dimen name="length50">112.5dp</dimen>
-    <dimen name="length60">135.0dp</dimen>
-    <dimen name="length70">157.5dp</dimen>
-    <dimen name="length80">180.0dp</dimen>
-    <dimen name="length100">225.0dp</dimen>
-    <dimen name="length120">270.0dp</dimen>
-    <dimen name="length150">337.5dp</dimen>
-    <dimen name="length160">360.0dp</dimen>
-    <dimen name="length180">405.0dp</dimen>
-    <dimen name="length240">540.0dp</dimen>
-    <dimen name="size8">18.0sp</dimen>
-    <dimen name="size10">22.5sp</dimen>
-    <dimen name="size12">27.0sp</dimen>
-    <dimen name="size13">29.25sp</dimen>
-    <dimen name="size14">31.5sp</dimen>
-    <dimen name="size15">33.75sp</dimen>
-    <dimen name="size16">36.0sp</dimen>
-    <dimen name="size18">40.5sp</dimen>
-    <dimen name="size20">45.0sp</dimen>
-    <dimen name="size24">54.0sp</dimen>
-    <dimen name="footer_height">135.0dp</dimen>
-    <dimen name="img_length">90.0dp</dimen>
-</resources>

okhttplib/src/main/res/values-sw800dp-land/dimens.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="title_height">112.5dp</dimen>
-    <dimen name="drawer_width">600.0dp</dimen>
-    <dimen name="padding1">2.5dp</dimen>
-    <dimen name="padding2">5.0dp</dimen>
-    <dimen name="padding3">7.5dp</dimen>
-    <dimen name="padding5">12.5dp</dimen>
-    <dimen name="padding7">17.5dp</dimen>
-    <dimen name="padding8">20.0dp</dimen>
-    <dimen name="padding10">25.0dp</dimen>
-    <dimen name="padding13">32.5dp</dimen>
-    <dimen name="padding15">37.5dp</dimen>
-    <dimen name="padding20">50.0dp</dimen>
-    <dimen name="padding30">75.0dp</dimen>
-    <dimen name="height5">12.5dp</dimen>
-    <dimen name="length16">40.0dp</dimen>
-    <dimen name="length20">50.0dp</dimen>
-    <dimen name="length25">62.5dp</dimen>
-    <dimen name="length30">75.0dp</dimen>
-    <dimen name="length35">87.5dp</dimen>
-    <dimen name="length40">100.0dp</dimen>
-    <dimen name="length50">125.0dp</dimen>
-    <dimen name="length60">150.0dp</dimen>
-    <dimen name="length70">175.0dp</dimen>
-    <dimen name="length80">200.0dp</dimen>
-    <dimen name="length100">250.0dp</dimen>
-    <dimen name="length120">300.0dp</dimen>
-    <dimen name="length150">375.0dp</dimen>
-    <dimen name="length160">400.0dp</dimen>
-    <dimen name="length180">450.0dp</dimen>
-    <dimen name="length240">600.0dp</dimen>
-    <dimen name="size8">20.0sp</dimen>
-    <dimen name="size10">25.0sp</dimen>
-    <dimen name="size12">30.0sp</dimen>
-    <dimen name="size13">32.5sp</dimen>
-    <dimen name="size14">35.0sp</dimen>
-    <dimen name="size15">37.5sp</dimen>
-    <dimen name="size16">40.0sp</dimen>
-    <dimen name="size18">45.0sp</dimen>
-    <dimen name="size20">50.0sp</dimen>
-    <dimen name="size24">60.0sp</dimen>
-    <dimen name="footer_height">150.0dp</dimen>
-    <dimen name="img_length">100.0dp</dimen>
-</resources>

okhttplib/src/main/res/values-w820dp/dimens.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="title_height">115.2dp</dimen>
-    <dimen name="drawer_width">614.4dp</dimen>
-    <dimen name="padding1">2.56dp</dimen>
-    <dimen name="padding2">5.12dp</dimen>
-    <dimen name="padding3">7.68dp</dimen>
-    <dimen name="padding5">12.8dp</dimen>
-    <dimen name="padding7">17.92dp</dimen>
-    <dimen name="padding8">20.48dp</dimen>
-    <dimen name="padding10">25.6dp</dimen>
-    <dimen name="padding13">33.28dp</dimen>
-    <dimen name="padding15">38.4dp</dimen>
-    <dimen name="padding20">51.2dp</dimen>
-    <dimen name="padding30">76.8dp</dimen>
-    <dimen name="height5">12.8dp</dimen>
-    <dimen name="length16">40.96dp</dimen>
-    <dimen name="length20">51.2dp</dimen>
-    <dimen name="length25">64.0dp</dimen>
-    <dimen name="length30">76.8dp</dimen>
-    <dimen name="length35">89.60000000000001dp</dimen>
-    <dimen name="length40">102.4dp</dimen>
-    <dimen name="length50">128.0dp</dimen>
-    <dimen name="length60">153.6dp</dimen>
-    <dimen name="length70">179.20000000000002dp</dimen>
-    <dimen name="length80">204.8dp</dimen>
-    <dimen name="length100">256.0dp</dimen>
-    <dimen name="length120">307.2dp</dimen>
-    <dimen name="length150">384.0dp</dimen>
-    <dimen name="length160">409.6dp</dimen>
-    <dimen name="length180">460.8dp</dimen>
-    <dimen name="length240">614.4dp</dimen>
-    <dimen name="size8">20.48sp</dimen>
-    <dimen name="size10">25.6sp</dimen>
-    <dimen name="size12">30.72sp</dimen>
-    <dimen name="size13">33.28sp</dimen>
-    <dimen name="size14">35.84sp</dimen>
-    <dimen name="size15">38.4sp</dimen>
-    <dimen name="size16">40.96sp</dimen>
-    <dimen name="size18">46.08sp</dimen>
-    <dimen name="size20">51.2sp</dimen>
-    <dimen name="size24">61.44sp</dimen>
-    <dimen name="footer_height">153.6dp</dimen>
-    <dimen name="img_length">102.4dp</dimen>
-</resources>

okhttplib/src/main/res/values/colors.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-
-    <color name="them_color">#FF4081</color>
-    <!--<color name="them_color">#282a2b</color>-->
-
-    <color name="comm_red">#f00</color>
-    <color name="comm_blue">#00f</color>
-    <color name="comm_white">#fff</color>
-    <color name="comm_green">#0f0</color>
-    <color name="comm_gray">#aaa</color>
-
-    <color name="comm_white2">#e7e7e7</color>
-    <color name="comm_white_tr">#66ffffff</color>
-    <color name="comm_black">#505050</color>
-    <color name="comm_black1">#000000</color>
-    <color name="comm_black2">#919191</color>
-    <color name="comm_red_s">#ff2f00</color>
-    <color name="comm_green_s">#39ce08</color>
-    <color name="comm_green_b">#397B19</color>
-    <color name="comm_blue1">#2af</color>
-    <color name="comm_blue2">#22e5ff</color>
-    <color name="comm_blue_big">#26f</color>
-    <color name="comm_violet">#9A32CD</color>
-    <color name="comm_transparent">#00000000</color>
-    <color name="comm_find_gray">#d5eaeaea</color>
-    <color name="comm_light_yellow">#FDFDB3</color>
-    <color name="comm_yellow">#f5ce64</color>
-    <color name="comm_green_blue">#52dfc8</color>
-    <color name="comm_orange">#f1962d</color>
-    <color name="comm_orange_red">#ff6000</color>
-    <color name="comm_data_time">#2f19dfbb</color>
-    <color name="comm_gray_background">#60000000</color>
-    <color name="comm_light_blue">#C0E3FF</color>
-</resources>

okhttplib/src/main/res/values/dimens.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <dimen name="title_height">45dp</dimen>
-    <dimen name="drawer_width">240dp</dimen>
-    <dimen name="padding1">1dp</dimen>
-    <dimen name="padding2">2dp</dimen>
-    <dimen name="padding3">3dp</dimen>
-    <dimen name="padding4">4dp</dimen>
-    <dimen name="padding5">5dp</dimen>
-    <dimen name="padding7">7dp</dimen>
-    <dimen name="padding8">8dp</dimen>
-    <dimen name="padding10">10dp</dimen>
-    <dimen name="padding13">13dp</dimen>
-    <dimen name="padding15">15dp</dimen>
-    <dimen name="padding20">20dp</dimen>
-    <dimen name="padding30">30dp</dimen>
-    <dimen name="height5">5dp</dimen>
-    <dimen name="small">0.5dp</dimen>
-    <dimen name="length10">10dp</dimen>
-    <dimen name="length16">16dp</dimen>
-    <dimen name="length20">20dp</dimen>
-    <dimen name="length25">25dp</dimen>
-    <dimen name="length30">30dp</dimen>
-    <dimen name="length35">35dp</dimen>
-    <dimen name="length40">40dp</dimen>
-    <dimen name="length45">45dp</dimen>
-    <dimen name="length50">50dp</dimen>
-    <dimen name="length55">55dp</dimen>
-    <dimen name="length60">60dp</dimen>
-    <dimen name="length70">70dp</dimen>
-    <dimen name="length80">80dp</dimen>
-    <dimen name="length90">90dp</dimen>
-    <dimen name="length100">100dp</dimen>
-    <dimen name="length105">105dp</dimen>
-    <dimen name="length110">110dp</dimen>
-    <dimen name="length120">120dp</dimen>
-    <dimen name="length150">150dp</dimen>
-    <dimen name="length160">160dp</dimen>
-    <dimen name="length180">180dp</dimen>
-    <dimen name="length200">200dp</dimen>
-    <dimen name="length240">240dp</dimen>
-    <dimen name="size8">8sp</dimen>
-    <dimen name="size10">10sp</dimen>
-    <dimen name="size12">12sp</dimen>
-    <dimen name="size13">13sp</dimen>
-    <dimen name="size14">14sp</dimen>
-    <dimen name="size15">15sp</dimen>
-    <dimen name="size16">16sp</dimen>
-    <dimen name="size18">18sp</dimen>
-    <dimen name="size20">20sp</dimen>
-    <dimen name="size24">24sp</dimen>
-    <dimen name="footer_height">60dp</dimen>
-    <dimen name="img_length">40dp</dimen>
-
-</resources>

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

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">okhttp</string>
-</resources>