Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -14,6 +14,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseActivity;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -172,7 +174,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
         if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
             map.put("Authorization", OkGoUtil.getToken());
         }
-        mPresenter.getDataHead(RvFrameConfig.HOST,2, ApiConfig.HTTP_URL_GET_ACT, ActBean.class, map, true);
+        mPresenter.getDataHead(RvFrameConfig.HOST, 2, ApiConfig.HTTP_URL_GET_ACT, ActBean.class, map, true);
     }
 
     private void postActivityPopup(int id) {
@@ -277,6 +279,12 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
         if (intent != null && "discovery".equals(intent.getStringExtra("to"))) {
             setCurrent(TYPE_FOUND);
         }
+        if (intent != null && "mine_coupons".equals(intent.getStringExtra("to"))) {
+            setCurrent(TYPE_MINE);
+            ARouter.getInstance()
+                    .build(Constance.ACTIVITY_URL_COUPONALL)
+                    .navigation();
+        }
     }
 
     /****

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/OkHttpCreate.java

@@ -30,18 +30,47 @@ public class OkHttpCreate {
     private static OkHttpCreate okHttpClient;
     private OkHttpClient.Builder mHttpBuilder;
 
-    public OkHttpCreate() {
-
+    private OkHttpCreate() {
     }
 
     public static OkHttpCreate getOkHttpInstance() {
         if (okHttpClient == null) {
             okHttpClient = new OkHttpCreate();
         }
-
         return okHttpClient;
     }
 
+    private OkHttpClient.Builder getHttpBuilder() {
+        if (mHttpBuilder == null) {
+            mHttpBuilder = new OkHttpClient.Builder();
+            addHttpLogger();
+//          addHttpHeader();
+            setHttpTimeOut();
+//        mHttpBuilder.cookieJar(new CookieJar() {
+//            private final HashMap<HttpUrl, List<Cookie>> cookieStore = new HashMap<>(16);
+//
+//            @Override
+//            public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+//                cookieStore.put(HttpUrl.parse(url.host()), cookies);
+//            }
+//
+//            @Override
+//            public List<Cookie> loadForRequest(HttpUrl url) {
+//                List<Cookie> cookies = cookieStore.get(url.host());
+//                return cookies != null ? cookies : new ArrayList<Cookie>();
+//            }
+//        });
+            setCache(mHttpBuilder);
+//        addHttpHeader();
+//        return mHttpBuilder;
+        }
+        return mHttpBuilder;
+    }
+
+    public OkHttpClient.Builder createOkHttpBuilder() {
+        return getHttpBuilder();
+    }
+
     /**
      * 添加头部信息
      *
@@ -81,7 +110,7 @@ public class OkHttpCreate {
      * 添加日志文件
      * @return
      */
-    public OkHttpCreate addHttpLogger(OkHttpClient.Builder builder) {
+    private void addHttpLogger() {
         HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() {
             @Override
             public void log(String message) {
@@ -91,9 +120,7 @@ public class OkHttpCreate {
 
         });
         loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
-        builder.addInterceptor(loggingInterceptor);
-
-        return this;
+        this.mHttpBuilder.addInterceptor(loggingInterceptor);
     }
 
 
@@ -102,12 +129,10 @@ public class OkHttpCreate {
      *
      * @return
      */
-    public OkHttpCreate setHttpTimeOut(OkHttpClient.Builder builder) {
-        builder.connectTimeout(DEFAULT_CONNECT_TIMEOUT, TimeUnit.SECONDS);
-        builder.readTimeout(DEFAULT_WRITE_TIMEOUT, TimeUnit.SECONDS);
-        builder.writeTimeout(DEFAULT_READ_TIMEOUT, TimeUnit.SECONDS);
-
-        return this;
+    private void setHttpTimeOut() {
+        this.mHttpBuilder.connectTimeout(DEFAULT_CONNECT_TIMEOUT, TimeUnit.SECONDS);
+        this.mHttpBuilder.readTimeout(DEFAULT_WRITE_TIMEOUT, TimeUnit.SECONDS);
+        this.mHttpBuilder.writeTimeout(DEFAULT_READ_TIMEOUT, TimeUnit.SECONDS);
     }
 
     /**
@@ -122,40 +147,4 @@ public class OkHttpCreate {
         builder.cache(cache);
         return this;
     }
-
-
-    public OkHttpClient.Builder getHttpBuilder() {
-        if (mHttpBuilder == null) {
-            mHttpBuilder = new OkHttpClient.Builder();
-        }
-        return mHttpBuilder;
-    }
-
-    public OkHttpClient.Builder createOkHttpBuilder() {
-
-        getHttpBuilder();
-        addHttpLogger(mHttpBuilder);
-//        addHttpHeader();
-        setHttpTimeOut(mHttpBuilder);
-//        mHttpBuilder.cookieJar(new CookieJar() {
-//            private final HashMap<HttpUrl, List<Cookie>> cookieStore = new HashMap<>(16);
-//
-//            @Override
-//            public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
-//                cookieStore.put(HttpUrl.parse(url.host()), cookies);
-//            }
-//
-//            @Override
-//            public List<Cookie> loadForRequest(HttpUrl url) {
-//                List<Cookie> cookies = cookieStore.get(url.host());
-//                return cookies != null ? cookies : new ArrayList<Cookie>();
-//            }
-//        });
-//        setCache(mHttpBuilder);
-
-//        addHttpHeader();
-        return mHttpBuilder;
-    }
-
-
 }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/presenter/RetrofitPresenter.java

@@ -101,5 +101,4 @@ public abstract class RetrofitPresenter<V extends BaseView> extends WrapperPrese
     }
 
 
-
 }

plugin_share/src/main/java/com/rv/share/fragment/InviteFragment.java

@@ -120,7 +120,7 @@ public class InviteFragment extends BaseFragment<CommonPresenter> implements Bas
             header.put("Authorization", OkGoUtil.getToken());
 
             Map<String, Object> map = new HashMap<>();
-            map.put("state", 2);
+            map.put("state", 0);
             map.put("page", currentPage);
             map.put("limit", pageSize);
             mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INVITE_LIST, InviteListBean.class, map, header, true);

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -126,7 +126,15 @@ public class RvWebView extends WebView {
                 return "";
             }
             return OkGoUtil.getToken();
+        }
 
+        @JavascriptInterface
+        public void toMyCoupons() {
+            ComponentName name = new ComponentName(getContext(), "com.xxfc.rv.MainActivity");
+            Intent intent = new Intent();
+            intent.setComponent(name);
+            intent.putExtra("to", "mine_coupons");
+            getContext().startActivity(intent);
         }
 
         @JavascriptInterface