initViews方法加入泛型参数

zyyoona7 · Jul 17, 2018 · 61928bb · 61928bb
1 parent ad6618b
commit 61928bb
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/app/src/main/java/com/zyyoona7/easypopup/easypop/CmmtPopup.java b/app/src/main/java/com/zyyoona7/easypopup/easypop/CmmtPopup.java
@@ -47,7 +47,7 @@ protected void initAttributes() {
     }
 
     @Override
-    protected void initViews(View view, BasePopup basePopup) {
+    protected void initViews(View view, CmmtPopup basePopup) {
 
         mCancelTv = findViewById(R.id.tv_cancel);
         mOkTv = findViewById(R.id.tv_ok);

diff --git a/app/src/main/java/com/zyyoona7/easypopup/easypop/ComplexPopup.java b/app/src/main/java/com/zyyoona7/easypopup/easypop/ComplexPopup.java
@@ -48,7 +48,7 @@ protected void initAttributes() {
     }
 
     @Override
-    protected void initViews(View view, BasePopup basePopup) {
+    protected void initViews(View view, ComplexPopup basePopup) {
         mOkBtn = findViewById(R.id.btn_ok);
         mCancelBtn = findViewById(R.id.btn_cancel);
         mRecyclerView = findViewById(R.id.rv_complex);

diff --git a/app/src/main/java/com/zyyoona7/easypopup/easypop/EverywherePopup.java b/app/src/main/java/com/zyyoona7/easypopup/easypop/EverywherePopup.java
@@ -25,7 +25,7 @@ protected void initAttributes() {
     }
 
     @Override
-    protected void initViews(View view, BasePopup basePopup) {
+    protected void initViews(View view, EverywherePopup basePopup) {
 
 //        setOnRealWHAlreadyListener(new OnRealWHAlreadyListener() {
 //            @Override

diff --git a/app/src/main/java/com/zyyoona7/easypopup/easypop/GiftPopup.java b/app/src/main/java/com/zyyoona7/easypopup/easypop/GiftPopup.java
@@ -33,7 +33,7 @@ protected void initAttributes() {
     }
 
     @Override
-    protected void initViews(View view, BasePopup basePopup) {
+    protected void initViews(View view, GiftPopup basePopup) {
         mRecyclerView = findViewById(R.id.rv_gift);
         mRecyclerView.setLayoutManager(new GridLayoutManager(mRecyclerView.getContext(), 4, GridLayoutManager.VERTICAL, false));
         List<String> list = createList();

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

diff --git a/lib/src/main/java/com/zyyoona7/popup/BasePopup.java b/lib/src/main/java/com/zyyoona7/popup/BasePopup.java
@@ -241,7 +241,7 @@ protected void onPopupWindowDismiss() {
      *
      * @param view
      */
-    protected abstract void initViews(View view, BasePopup popup);
+    protected  abstract void initViews(View view, T popup);
 
     /**
      * 是否需要测量 contentView的大小

diff --git a/lib/src/main/java/com/zyyoona7/popup/EasyPopup.java b/lib/src/main/java/com/zyyoona7/popup/EasyPopup.java
@@ -30,7 +30,7 @@ protected void initAttributes() {
     }
 
     @Override
-    protected void initViews(View view, BasePopup popup) {
+    protected void initViews(View view, EasyPopup popup) {
         if (mOnViewListener != null) {
             mOnViewListener.initViews(view, popup);
         }