修复bug

app/src/main/java/com/kuxuan/fastbrowser/App.java

@@ -22,13 +22,17 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
         Laraver.init(this)
+                //配置Host
                 .withApiHost("http://114.67.235.114/RestServer/api/")
+                //配置 字体库，
                 .withIcon(new FontAwesomeModule())
+                //配置js native 互调
                 .withJavascriptInterface("Laraver")
-                .withWeChatAppId("wxfcdcecd9df8e0faa")
-                .withWeChatAppSecret("a0560f75335b06e33bea70f29ff219bf")
+                //配置js native 互调
                 .withWebEvent("Laraver",new TextEvent())
+                //配置网络拦截器，需要自己复写
                 .withInterceptor(new ReleaseInterceptor())
+
                 .withWebHost("https://wwww.baidu.com/")
                 .configure();
         DatabaseManager.getInstance().init(this);

app/src/main/java/com/kuxuan/fastbrowser/ExampleDelegate.java

@@ -3,14 +3,19 @@ package com.kuxuan.fastbrowser;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
+import android.widget.Toast;
 
+import com.kuxuan.laraver.app.Laraver;
 import com.kuxuan.laraver.delegates.LaraverDelegate;
 import com.kuxuan.laraver.net.RestClient;
 import com.kuxuan.laraver.net.RestCreator;
 import com.kuxuan.laraver.net.callback.IError;
 import com.kuxuan.laraver.net.callback.IFailure;
 import com.kuxuan.laraver.net.callback.ISuccess;
+import com.kuxuan.laraver.net.callback.RxCallBack;
 import com.kuxuan.laraver.net.rx.RxRestClient;
+import com.kuxuan.laraver.ui.loader.LoaderStyle;
+import com.kuxuan.laraver.util.log.LaraverLogger;
 
 import java.util.WeakHashMap;
 
@@ -27,6 +32,7 @@ import io.reactivex.schedulers.Schedulers;
  */
 
 public class ExampleDelegate extends LaraverDelegate {
+    String a = null;
     @Override
     public Object setLayout() {
         return R.layout.delegate_example;
@@ -34,13 +40,13 @@ public class ExampleDelegate extends LaraverDelegate {
 
     @Override
     public void onBindView(@Nullable Bundle savedInstanceState, View rootView) {
-       testRestClient();
+        testRestClient();
     }
 
     private void testRestClient(){
         RestClient.builder()
                 .url("http://news.baidu.com")
-                .loader(getContext())
+                .loader(getContext(), LoaderStyle.BallClipRotateIndicator)
                 .success(new ISuccess() {
                     @Override
                     public void onSuccess(String response) {
@@ -66,45 +72,49 @@ public class ExampleDelegate extends LaraverDelegate {
 
     // TODO: 2017/12/6 RX JAVA  网络请求实例   第一种
     void onCallRxget(){
-        final String url = "index.php";
+        final String url = "home/newlist";
         final WeakHashMap<String,Object> params = new WeakHashMap<>();
-
+        params.put("pageId",1);
+        params.put("type","recomment");
+//        pageId=1&type=recomment
         final Observable<String> observable  = RestCreator.getRxRestService().get(url,params);
         observable.subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<String>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-
-                    }
-
+                .subscribe(new RxCallBack() {
                     @Override
                     public void onNext(String s) {
-
+                        super.onNext(s);
+                        a = s;
+                        showToast(a);
+                        LaraverLogger.json("ok",s);
+                        //Toast.makeText(Laraver.getApplicationContext(), s, Toast.LENGTH_SHORT).show();
                     }
 
+                    //解除绑定
                     @Override
-                    public void onError(Throwable e) {
-
-                    }
-
-                    @Override
-                    public void onComplete() {
+                    public void onSubscribe(Disposable d) {
+                        super.onSubscribe(d);
 
                     }
                 });
 
     }
+    public void showToast(String s){
+        Toast.makeText(_mActivity, s, Toast.LENGTH_SHORT).show();
+    }
 
     // TODO: 2017/12/6 RX JAVA  网络请求实例 第二种
     private void onCallRxRestClient(){
         final String url = "index.php";
         RxRestClient.builder()
                 .url(url)
+                .params("id","id")
+                .params("id","id")
                 .build()
                 .get()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
+
                 .subscribe(new Observer<String>() {
                     @Override
                     public void onSubscribe(Disposable d) {

app/src/main/java/com/kuxuan/fastbrowser/MainActivity.java

@@ -38,7 +38,7 @@ public class MainActivity extends ProxyActivity{
 
     @Override
     public LaraverDelegate setRootDelegate() {
-        return new EcBottomDelegate();
+        return new ExampleDelegate();
     }
 
 }

laraver-browser/src/main/java/com/kuxuan/laraver/browser/main/EcBottomDelegate.java

@@ -31,11 +31,19 @@ public class EcBottomDelegate extends BaseBottomDelegate {
         return builder.addItems(items).build();
     }
 
+    /**
+     * 第一个显示的delegate
+     * @return
+     */
     @Override
     public int setIndexDelegate() {
         return 0;
     }
 
+    /**
+     * delegate 点击变换的颜色
+     * @return
+     */
     @Override
     public int setClickedColor() {
         return Color.parseColor("#ffff8800");

laraver-browser/src/main/java/com/kuxuan/laraver/browser/main/discover/DiscoverDelegate.java

@@ -30,6 +30,7 @@ public class DiscoverDelegate extends BottomItemDelegate {
         super.onLazyInitView(savedInstanceState);
         final WebDelegateImpl delegate = WebDelegateImpl.create("index.html");
         delegate.setTopDelegate(this.getParentDelegate());
+        //加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
         getSupportDelegate().loadRootFragment(R.id.web_discovery_container,delegate);
     }
 }

laraver-browser/src/main/java/com/kuxuan/laraver/browser/main/index/IndexDelegate.java

@@ -42,9 +42,6 @@ public class IndexDelegate extends BottomItemDelegate implements View.OnFocusCha
 
     private RefreshHandler mRefreshHandler = null;
 
-
-
-
     @Override
     public void onBindView(@Nullable Bundle savedInstanceState, @NonNull View rootView) {
         mRefreshHandler = RefreshHandler.create(mRefreshLayout, mRecyclerView, new IndexDataConverter());

laraver-browser/src/main/java/com/kuxuan/laraver/browser/main/sort/content/ContentDelegate.java

@@ -11,6 +11,8 @@ import com.kuxuan.laraver.browser.R;
 import com.kuxuan.laraver.browser.R2;
 import com.kuxuan.laraver.delegates.LaraverDelegate;
 import com.kuxuan.laraver.net.RestClient;
+import com.kuxuan.laraver.net.callback.IError;
+import com.kuxuan.laraver.net.callback.IFailure;
 import com.kuxuan.laraver.net.callback.ISuccess;
 
 import java.util.List;
@@ -66,6 +68,7 @@ public class ContentDelegate extends LaraverDelegate {
                         mRecyclerView.setAdapter(sectionAdapter);
                     }
                 })
+
                 .build()
                 .get();
     }

laraver-core/src/main/java/com/kuxuan/laraver/delegates/bottom/BottomItemDelegate.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.widget.Toast;
 
 import com.kuxuan.laraver.R;
+import com.kuxuan.laraver.app.Laraver;
 import com.kuxuan.laraver.delegates.LaraverDelegate;
 
 /**
@@ -14,43 +15,18 @@ import com.kuxuan.laraver.delegates.LaraverDelegate;
  * @date 2017/12/9
  */
 
-public abstract class BottomItemDelegate extends LaraverDelegate implements View.OnKeyListener {
-    private long mExitTime = 0;
-    private static final int EXIT_TIME = 2000;
+public abstract class BottomItemDelegate extends LaraverDelegate {
+    private static final long WAIT_TIME = 2000L;
+    private long TOUCH_TIME = 0;
 
     @Override
-    public void onResume() {
-        super.onResume();
-        final View rootView = getView();
-        if(rootView !=null){
-            rootView.setFocusableInTouchMode(true);
-            rootView.requestFocus();
-            rootView.setOnKeyListener(this);
+    public boolean onBackPressedSupport() {
+        if (System.currentTimeMillis() - TOUCH_TIME < WAIT_TIME) {
+            _mActivity.finish();
+        } else {
+            TOUCH_TIME = System.currentTimeMillis();
+            Toast.makeText(_mActivity, "双击退出" + Laraver.getApplicationContext().getString(R.string.app_name), Toast.LENGTH_SHORT).show();
         }
-
-    }
-
-    /**
-     * 双击退出应用
-     * @param v
-     * @param keyCode
-     * @param keyEvent
-     * @return
-     */
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent keyEvent) {
-        if(keyCode == KeyEvent.KEYCODE_BACK&& keyEvent.getAction() == KeyEvent.ACTION_DOWN){
-            if((System.currentTimeMillis() - mExitTime) > EXIT_TIME){
-                Toast.makeText(getContext(), "双击退出" + getString(R.string.app_name) , Toast.LENGTH_SHORT).show();
-                mExitTime = System.currentTimeMillis();
-            }else{
-                _mActivity.finish();
-                if(mExitTime !=0){
-                    mExitTime = 0;
-                }
-            }
-            return true;
-        }
-        return false;
+        return true;
     }
 }

laraver-core/src/main/java/com/kuxuan/laraver/ui/LaraverLoader.java

@@ -1,71 +0,0 @@
-package com.kuxuan.laraver.ui;
-
-import android.content.Context;
-import android.support.v7.app.AppCompatDialog;
-import android.view.Gravity;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.kuxuan.laraver.R;
-import com.kuxuan.laraver.util.dimen.DimenUtil;
-import com.wang.avi.AVLoadingIndicatorView;
-
-import java.util.ArrayList;
-
-
-/**
- *
- * @author huangfuruixin
- * @date 2017/12/6
- */
-
-public class LaraverLoader {
-    private static final int LOADER_SIZE_SCALE = 8;
-    private static final int LOADER_OFFSET_SCALE = 10;
-
-    private static final ArrayList<AppCompatDialog> LOADERS = new ArrayList<>();
-
-    private static final String DEFAULT_LOADER = LoaderStyle.BallClipRotatePulseIndicator.name();
-
-    public static void showLoading(Context context, Enum<LoaderStyle> type) {
-        showLoading(context, type.name());
-    }
-
-    public static void showLoading(Context context, String type) {
-
-        final AppCompatDialog dialog = new AppCompatDialog(context, R.style.dialog);
-
-        final AVLoadingIndicatorView avLoadingIndicatorView = LoaderCreator.create(type, context);
-        dialog.setContentView(avLoadingIndicatorView);
-
-        int deviceWidth = DimenUtil.getScreenWidth();
-        int deviceHeight = DimenUtil.getScreenHeight();
-
-        final Window dialogWindow = dialog.getWindow();
-
-        if (dialogWindow != null) {
-            final WindowManager.LayoutParams lp = dialogWindow.getAttributes();
-            lp.width = deviceWidth / LOADER_SIZE_SCALE;
-            lp.height = deviceHeight / LOADER_SIZE_SCALE;
-            lp.height = lp.height + deviceHeight / LOADER_OFFSET_SCALE;
-            lp.gravity = Gravity.CENTER;
-        }
-        LOADERS.add(dialog);
-        dialog.show();
-    }
-
-    public static void showLoading(Context context) {
-        showLoading(context, DEFAULT_LOADER);
-    }
-
-    public static void stopLoading() {
-        for (AppCompatDialog dialog : LOADERS) {
-            if (dialog != null) {
-                if (dialog.isShowing()) {
-                    dialog.cancel();
-                }
-            }
-        }
-    }
-
-}

laraver-core/src/main/java/com/kuxuan/laraver/ui/LoaderCreator.java

@@ -1,51 +0,0 @@
-package com.kuxuan.laraver.ui;
-
-import android.content.Context;
-
-import com.wang.avi.AVLoadingIndicatorView;
-import com.wang.avi.Indicator;
-
-import java.util.WeakHashMap;
-
-/**
- * 为反射创建缓存，提高性能
- * @author huangfuruixin
- * @date 2017/12/6
- */
-
-public class LoaderCreator {
-    private static final WeakHashMap<String,Indicator> LOADING_MAP = new WeakHashMap<>();
-
-
-    static AVLoadingIndicatorView create(String type,Context context){
-        final AVLoadingIndicatorView avLoadingIndicatorView = new AVLoadingIndicatorView(context);
-        if (LOADING_MAP.get(type) == null){
-            final Indicator indicator = getIndicator(type);
-            LOADING_MAP.put(type,indicator);
-        }
-        avLoadingIndicatorView.setIndicator(LOADING_MAP.get(type));
-        return avLoadingIndicatorView;
-    }
-
-    private static Indicator getIndicator(String name){
-        if(name ==null||name.isEmpty()){
-            return null;
-        }
-        final StringBuilder drawableClassName = new StringBuilder();
-        if(!name.contains(".")){
-            final String defaultPackName = AVLoadingIndicatorView.class.getPackage().getName();
-            drawableClassName.append(defaultPackName)
-                    .append(".indicators")
-                    .append(".");
-        }
-
-        drawableClassName.append(name);
-        try {
-            final Class<?> drawableClass = Class.forName(drawableClassName.toString());
-            return (Indicator) drawableClass.newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}

laraver-core/src/main/java/com/kuxuan/laraver/ui/LoaderStyle.java

@@ -1,40 +0,0 @@
-package com.kuxuan.laraver.ui;
-
-/**
- *
- * @author huangfuruixin
- * @date 2017/12/6
- */
-
-@SuppressWarnings("unused")
-public enum LoaderStyle {
-    BallPulseIndicator,
-    BallGridPulseIndicator,
-    BallClipRotateIndicator,
-    BallClipRotatePulseIndicator,
-    SquareSpinIndicator,
-    BallClipRotateMultipleIndicator,
-    BallPulseRiseIndicator,
-    BallRotateIndicator,
-    CubeTransitionIndicator,
-    BallZigZagIndicator,
-    BallZigZagDeflectIndicator,
-    BallTrianglePathIndicator,
-    BallScaleIndicator,
-    LineScaleIndicator,
-    LineScalePartyIndicator,
-    BallScaleMultipleIndicator,
-    BallPulseSyncIndicator,
-    BallBeatIndicator,
-    LineScalePulseOutIndicator,
-    LineScalePulseOutRapidIndicator,
-    BallScaleRippleIndicator,
-    BallScaleRippleMultipleIndicator,
-    BallSpinFadeLoaderIndicator,
-    LineSpinFadeLoaderIndicator,
-    TriangleSkewSpinIndicator,
-    PacmanIndicator,
-    BallGridBeatIndicator,
-    SemiCircleSpinIndicator,
-    CustomIndicator
-}