优化基类

YangShuai
1 parent c6b9ffa4
Showing 22 changed files with 184 additions and 104 deletions
app/strike/src/main/java/com/cnlive/strike/MyFragment.java
app/strike/src/main/java/com/cnlive/strike/MyFragmentView.java
app/strike/src/main/java/com/cnlive/strike/MyPresenter.java
core/base/src/main/java/com/cnlive/libs/base/media/picker/ImageCaptureManager.java
core/base/src/main/java/com/cnlive/libs/base/media/picker/ui/camera/DiyCameraActivity.java
core/base/src/main/java/com/cnlive/libs/base/media/picker/view/HackyViewPager.java
core/base/src/main/java/com/cnlive/libs/base/media/picker/view/crop/CropView.java
core/base/src/main/java/com/cnlive/libs/base/mvp/BaseFragment.java
core/base/src/main/java/com/cnlive/libs/base/mvp/BaseView.java
core/base/src/main/java/com/cnlive/libs/base/mvp/ReflectUtil.java
core/base/src/main/java/com/cnlive/libs/base/ui/widget/arch/BottomMenuDialog.java
core/base/src/main/java/com/cnlive/libs/base/ui/widget/arch/BottomSheet.java
core/base/src/main/java/com/cnlive/libs/base/ui/widget/arch/LetterBarView.java
core/base/src/main/java/com/cnlive/libs/base/util/BrandUtils.java
core/base/src/main/java/com/cnlive/libs/base/util/FileUtils.java
core/base/src/main/java/com/cnlive/libs/base/util/GlideRoundedCornersTransform.java
core/base/src/main/java/com/cnlive/libs/base/util/StatusBarUtil2.java
core/base/src/main/java/com/cnlive/libs/base/util/WebPreviewShowImg.java
core/base/src/main/java/com/cnlive/libs/base/util/WebViewUtil.java
core/base/src/main/java/top/zibin/luban/InputStreamProvider.java
 package com.cnlive.strike;
+import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.cnlive.libs.base.mvp.BaseFragment;
+import com.hannesdorfmann.mosby3.mvp.MvpFragment;
 public class MyFragment extends BaseFragment<MyFragmentView,MyPresenter> {
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.activity_main1,container,false);
+    }
     @Override
-    protected int initLayout() {
-        return R.layout.activity_main1;
+    protected void initView() {
+//        getMvpView().initView();
+        getPresenter().test();
     }
     @Override
-    protected void init() {
-        Log.e(TAG, "init: "+TAG );
+    protected void initData() {
+
     }
+
+
 }
 package com.cnlive.strike;
+import android.util.Log;
+
 import com.cnlive.libs.base.mvp.BaseFragment;
 import com.cnlive.libs.base.mvp.BaseView;
+import com.cnlive.strike.databinding.ActivityMain1Binding;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
 public class MyFragmentView extends BaseView {
-
-
-    public MyFragmentView(BaseFragment fragment) {
-        super(fragment);
-    }
-
-    @Override
-    protected void initView() {
-    }
-
-    @Override
-    protected void initData() {
-
-    }
-
-    public void test() {
+    public void initView() {
+        Log.e(TAG, "initView: " + TAG);
     }
 }
 package com.cnlive.strike;
 import com.cnlive.libs.base.mvp.BasePresenter;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 public class MyPresenter extends BasePresenter<MyFragmentView> {
+    protected final String TAG = this.getClass().getSimpleName();
     public void test() {
-        getView().test();
+        getView().initView();
+
     }
 }
@@ -21,9 +21,9 @@ import java.util.Locale;
 /**
  * 创建：wukuiqing
- * <p>
+ * <presenter>
  * 时间：2018/3/22
- * <p>
+ * <presenter>
  * 描述： 相机操作
  */
 public class ImageCaptureManager {
@@ -312,7 +312,7 @@ public class DiyCameraActivity extends AppCompatActivity implements Recyclerview
             Media media = new Media(file.getPath(), file.getName(), enddutain, 3, file.length(), 0, "", enddutain);
             medias.add(media);
             oldlist.add(media);
-            CircleData.ReleaseVideoTypeListBean releaseVideoTypeListBean = releaseVideoTypeListBeans.get((Integer) v.getTag());
+            CircleData.ReleaseVideoTypeListBean releaseVideoTypeListBean = releaseVideoTypeListBeans.get((Integer) view.getTag());
             intent.putParcelableArrayListExtra(PickerConfig.EXTRA_RESULT, oldlist);
             intent.putExtra("isCircleVideo", "cancircle");
             EventBus.getDefault().postSticky(new CircleChoose(releaseVideoTypeListBean));
@@ -9,11 +9,11 @@ import android.view.MotionEvent;
 /**
  * Hacky fix for Issue #4 and
  * http://code.google.com/p/android/issues/detail?id=18990
- * <p/>
+ * <presenter/>
  * ScaleGestureDetector seems to mess up the touch events, which means that
  * ViewGroups which make use of onInterceptTouchEvent throw a lot of
  * IllegalArgumentException: pointerIndex out of range.
- * <p/>
+ * <presenter/>
  * There's not much I can do in my code for now, but we can mask the result by
  * just catching the problem and ignoring it.
  *
 /*******************************************************************************
  * Copyright 2016 oginotihiro
- * <p/>
+ * <presenter/>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p/>
+ * <presenter/>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <presenter/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -9,46 +9,56 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ViewDataBinding;
+
 /**
  * @author ys
  */
 public abstract class BaseFragment<V extends BaseView, P extends BasePresenter<V>> extends com.hannesdorfmann.mosby3.mvp.MvpFragment<V, P> {
-    public V v;
-    public P p;
-    public ViewDataBinding binding;
+    public V view;
+    public P presenter;
     protected final String TAG = this.getClass().getSimpleName();
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        binding = DataBindingUtil.inflate(inflater, initLayout(), container, false);
-        return binding.getRoot();
-    }
-
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (null != getMvpView()&&null!=getPresenter()) {
-            init();
+        if (null != getMvpView() && null != getPresenter()) {
+            initView();
+            initData();
         }
     }
+    @NonNull
+    public V createView() {
+        return ReflectUtil.instanceView(0, this.getClass(), this, BaseView.class);
+    }
+
     @Override
     public P createPresenter() {
-        if (p == null) {
-            return ReflectUtil.instance(BasePresenter.class);
+        return ReflectUtil.instancePresenter(1, this.getClass(), BasePresenter.class);
+    }
+
+    @NonNull
+    @Override
+    public V getMvpView() {
+        if (null == view) {
+            return createView();
         } else {
-            return ReflectUtil.instance(1, this);
+            return view;
         }
     }
+//    /**
+//     * 初始化布局
+//     *
+//     * @return 布局id
+//     */
+//    protected abstract int initLayout();
+
     /**
-     * 初始化布局
-     *
-     * @return 布局id
+     * 初始化视图
      */
-    protected abstract int initLayout();
+    protected abstract void initView();
-    protected abstract void init();
+    protected abstract void initData();
 }
@@ -5,24 +5,17 @@ import android.app.Activity;
 import androidx.databinding.ViewDataBinding;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+
 /**
  * @author ys
  */
-public abstract class BaseView implements MvpView {
-    private BaseFragment fragment;
-    protected ViewDataBinding binding;
-
-    public BaseView(BaseFragment fragment) {
-        this.fragment = fragment;
-        this.binding = fragment.binding;
-    }
-
-    public Activity getContext() {
-        return fragment == null ? null : fragment.getActivity();
-    }
-
-    protected abstract void initView();
-
-    protected abstract void initData();
-
+public class BaseView implements MvpView {
+    protected final String TAG = this.getClass().getSimpleName();
+    protected ViewDataBinding rootBind;
+
+//    public void initView() {
+//    }
+//
+//    public void initData() {
+//    }
 }
 package com.cnlive.libs.base.mvp;
+import android.util.Log;
+
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -51,6 +54,7 @@ public class ReflectUtil {
         return result;
     }
+
     public static <R> R instance(Class type) {
         R result = null;
         try {
@@ -71,4 +75,68 @@ public class ReflectUtil {
         }
         return result;
     }
+
+
+    /**
+     * 创建view的实例
+     *
+     * @param position
+     * @param type
+     * @param data
+     * @param baseView
+     * @param <R>
+     * @return
+     */
+    public static <R> R instanceView(int position, Class type, Object data, Class baseView) {
+        R result = null;
+        Class<R> clazz = null;
+        try {
+            ParameterizedType pt = (ParameterizedType) type.getGenericSuperclass();
+            clazz = (Class<R>) pt.getActualTypeArguments()[position];
+        } catch (Exception e) {
+            //直接使用基类
+            clazz=baseView;
+        }
+        Constructor constructor = null;
+        try {
+            constructor = clazz.getConstructor(new Class[]{data.getClass()});
+            result = (R) constructor.newInstance(data);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+            //没有找到含有参数的构造函数
+            try {
+                result = clazz.newInstance();
+            } catch (IllegalAccessException ex) {
+                ex.printStackTrace();
+            } catch (InstantiationException ex) {
+                ex.printStackTrace();
+            }
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    public static <R> R instancePresenter(int position, Class type, Class basePresenter) {
+        R result = null;
+        try {
+            ParameterizedType pt = (ParameterizedType) type.getGenericSuperclass();
+            Class<R> clazz = (Class<R>) pt.getActualTypeArguments()[position];
+            result = clazz.newInstance();
+        } catch (Exception ignored) {
+            Class<R> clazz = basePresenter;
+            try {
+                result = clazz.newInstance();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
 }
@@ -20,9 +20,9 @@ import java.util.List;
 /**
  * 创建：wukuiqing
- * <p>
+ * <presenter>
  * 时间：2018/1/8
- * <p>
+ * <presenter>
  * 描述：底部弹出的  Dialog
  */
@@ -33,12 +33,12 @@ import java.util.List;
 /**
  * QMUIBottomSheet 在 {@link Dialog} 的基础上重新定制了 {@link #show()} 和 {@link #hide()} 时的动画效果, 使 {@link Dialog} 在界面底部升起和降下。
- * <p>
+ * <presenter>
  * 提供了以下两种面板样式:
  * <ul>
  * <li>列表样式, 使用 {@link BottomSheet.BottomListSheetBuilder} 生成。</li>
  * </ul>
- * </p>
+ * </presenter>
  */
 public class BottomSheet extends Dialog {
     private static final String TAG = "QMUIBottomSheet";
@@ -46,13 +46,13 @@ import com.cnlive.strike.base.R;
 /**
  * 字母导航条
  *
- * <p>
+ * <presenter>
  * 可用于需要按照字母排序的应用中. <br>
  * 若排序的 item 首字为中文时，需要将每个 item 的首个汉字转化为拼音然后进行排序.<br>将汉字转换为拼音可用 pinyin4j.jar 来转换
- * </p>
- * <p>
+ * </presenter>
+ * <presenter>
  * 当点击导航条的字母时，会触发监听事件,若要监听，则可以使用 {@link #setOnLetterSelectListener(OnLetterSelectListener)} 来设置
- * </p>
+ * </presenter>
  *
  * @attr ref com.lwz.letterbarview.lib.R.styleable#LetterBar_lbLetterBarBackground
  * @attr ref com.lwz.letterbarview.lib.R.styleable#LetterBar_lbLetterBarTextColor
@@ -225,7 +225,7 @@ public class LetterBarView extends View {
 	/**
 	 * 计算字母导航条的参数
-	 * <p> 根据字母的高度来计算 导航条的宽度 和 其在 X 轴的位置
+	 * <presenter> 根据字母的高度来计算 导航条的宽度 和 其在 X 轴的位置
 	 */
 	private void calculateLetterBarParams() {
 		calculateLetterSpaceHeight();
@@ -11,9 +11,9 @@ import java.util.Properties;
 /**
  * 作者: 吴奎庆
- * <p>
+ * <presenter>
  * 时间: 2018/7/30
- * <p>
+ * <presenter>
  * 简介:
  */
@@ -31,9 +31,9 @@ import static android.os.Environment.MEDIA_MOUNTED;
 /**
  * 作者: 吴奎庆
- * <p>
+ * <presenter>
  * 时间: 2018/9/11
- * <p>
+ * <presenter>
  * 简介:
  */
@@ -669,7 +669,7 @@ public class FileUtils {
     /**
      * Return the files in directory.
-     * <p>Doesn't traverse subdirectories</p>
+     * <presenter>Doesn't traverse subdirectories</presenter>
      *
      * @param dirPath The path of directory.
      * @return the files in directory
@@ -680,7 +680,7 @@ public class FileUtils {
     /**
      * Return the files in directory.
-     * <p>Doesn't traverse subdirectories</p>
+     * <presenter>Doesn't traverse subdirectories</presenter>
      *
      * @param dir The directory.
      * @return the files in directory
@@ -718,7 +718,7 @@ public class FileUtils {
     /**
      * Return the files that satisfy the filter in directory.
-     * <p>Doesn't traverse subdirectories</p>
+     * <presenter>Doesn't traverse subdirectories</presenter>
      *
      * @param dirPath The path of directory.
      * @param filter  The filter.
@@ -731,7 +731,7 @@ public class FileUtils {
     /**
      * Return the files that satisfy the filter in directory.
-     * <p>Doesn't traverse subdirectories</p>
+     * <presenter>Doesn't traverse subdirectories</presenter>
      *
      * @param dir    The directory.
      * @param filter The filter.
@@ -15,9 +15,9 @@ import java.security.MessageDigest;
 /**
  * 作者: 吴奎庆
- * <p>
+ * <presenter>
  * 时间: 2018/9/13
- * <p>
+ * <presenter>
  * 简介:
  */
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
 /**
  * Created by Jaeger on 16/2/14.
- * <p>
+ * <presenter>
  * Email: chjie.jaeger@gmail.com
  * GitHub: https://github.com/laobie
  */
@@ -163,7 +163,7 @@ public class StatusBarUtil2 {
     /**
      * 使状态栏半透明
-     * <p>
+     * <presenter>
      * 适用于图片作为背景的界面,此时需要图片填充到状态栏
      *
      * @param activity 需要设置的activity
@@ -174,7 +174,7 @@ public class StatusBarUtil2 {
     /**
      * 使状态栏半透明
-     * <p>
+     * <presenter>
      * 适用于图片作为背景的界面,此时需要图片填充到状态栏
      *
      * @param activity       需要设置的activity
@@ -190,7 +190,7 @@ public class StatusBarUtil2 {
     /**
      * 针对根布局是 CoordinatorLayout, 使状态栏半透明
-     * <p>
+     * <presenter>
      * 适用于图片作为背景的界面,此时需要图片填充到状态栏
      *
      * @param activity       需要设置的activity
@@ -219,7 +219,7 @@ public class StatusBarUtil2 {
     /**
      * 使状态栏透明(5.0以上半透明效果,不建议使用)
-     * <p>
+     * <presenter>
      * 适用于图片作为背景的界面,此时需要图片填充到状态栏
      *
      * @param activity 需要设置的activity
@@ -2,9 +2,9 @@ package com.cnlive.libs.base.util;
 /**
  * 作者: 吴奎庆
- * <p>
+ * <presenter>
  * 时间: 2019/1/30
- * <p>
+ * <presenter>
  * 简介:
  */
 public class WebPreviewShowImg {
@@ -22,7 +22,7 @@ public class WebViewUtil {
     private static Activity context;
     /**
-     * 将<p>标签转为html同时有回调
+     * 将<presenter>标签转为html同时有回调
      *
      * @param pData
      * @param webView
@@ -31,7 +31,7 @@ public class WebViewUtil {
     public static void setPtoHtmlData(String pData, WebView webView, WebEleClickListener webEleClickListener) {
         if (null != webView) {
             webEleListener = webEleClickListener;
-            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:40px} img{background-size:contain|cover;width:100%;height: auto;} p{margin:0px;font-size:40px}</style></head><body>" + pData + "</body></html>";
+            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:40px} img{background-size:contain|cover;width:100%;height: auto;} presenter{margin:0px;font-size:40px}</style></head><body>" + pData + "</body></html>";
             // 设置支持javascript脚本
             webView.getSettings().setJavaScriptEnabled(true);
             webView.addJavascriptInterface(new JsObject(), "injectedObject");
@@ -59,7 +59,7 @@ public class WebViewUtil {
     }
     /**
-     * 将<p>标签转为html没有回调,直接跳转
+     * 将<presenter>标签转为html没有回调,直接跳转
      *
      * @param activity
      * @param pData
@@ -68,7 +68,7 @@ public class WebViewUtil {
     public static void setPtoHtmlData(Activity activity, String pData, WebView webView) {
         if (null != webView) {
             context = activity;
-            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:40px} img{background-size:contain|cover;width:100%;height: auto;} p{margin:0px;font-size:40px}</style></head><body>" + pData + "</body></html>";
+            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:40px} img{background-size:contain|cover;width:100%;height: auto;} presenter{margin:0px;font-size:40px}</style></head><body>" + pData + "</body></html>";
             // 设置支持javascript脚本
             webView.getSettings().setJavaScriptEnabled(true);
             webView.addJavascriptInterface(new JsObject(), "injectedObject");
@@ -96,7 +96,7 @@ public class WebViewUtil {
     }
     /**
-     * 将<p>标签转为html没有回调,直接跳转,可指定文字大小
+     * 将<presenter>标签转为html没有回调,直接跳转,可指定文字大小
      *
      * @param activity
      * @param pData
@@ -107,7 +107,7 @@ public class WebViewUtil {
         if (null != webView) {
             context = activity;
-            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:" + fontSize + "px} img{background-size:contain|cover;width:100%;height: auto;} p{margin:0px;font-size:" + fontSize + "px}</style></head><body>" + pData + "</body></html>";
+            String html = "<html><head><meta charset=\"UTF-8\"><style type=\"text/css\">html,body{padding:0px;margin:0px;font-size:" + fontSize + "px} img{background-size:contain|cover;width:100%;height: auto;} presenter{margin:0px;font-size:" + fontSize + "px}</style></head><body>" + pData + "</body></html>";
             // 设置支持javascript脚本
             webView.getSettings().setJavaScriptEnabled(true);
             webView.addJavascriptInterface(new JsObject(), "injectedObject");
@@ -5,7 +5,7 @@ import java.io.InputStream;
 /**
  * 通过此接口获取输入流，以兼容文件、FileProvider方式获取到的图片
- * <p>
+ * <presenter>
  * Get the input stream through this interface, and obtain the picture using compatible files and FileProvider
  */
 public interface InputStreamProvider {
@@ -314,8 +314,8 @@ public class Luban implements Handler.Callback {
     /**
      * Do I need to keep the image's alpha channel
      *
-     * @param focusAlpha <p> true - to keep alpha channel, the compress speed will be slow. </p>
-     *                   <p> false - don't keep alpha channel, it might have a black background.</p>
+     * @param focusAlpha <presenter> true - to keep alpha channel, the compress speed will be slow. </presenter>
+     *                   <presenter> false - don't keep alpha channel, it might have a black background.</presenter>
      */
     public Builder setFocusAlpha(boolean focusAlpha) {
       this.focusAlpha = focusAlpha;
@@ -3,16 +3,16 @@ package top.zibin.luban;
 /**
  * Author: zibin
  * Datetime: 2018/5/18
- * <p>
+ * <presenter>
  * 提供修改压缩图片命名接口
- * <p>
+ * <presenter>
  * A functional interface (callback) that used to rename the file after compress.
  */
 public interface OnRenameListener {
   /**
    * 压缩前调用该方法用于修改压缩后文件名
-   * <p>
+   * <presenter>
    * Call before compression begins.
    *
    * @param filePath 传入文件路径/ file path