Fix Click type conversion problem.

朱显松
1 parent f8fe5b61
Showing 7 changed files with 56 additions and 48 deletions
.idea/misc.xml
app/src/main/java/com/cnlive/libs/demo/mvptest/frame/presenter/LaunchPresenter.java
app/src/main/java/com/cnlive/libs/demo/mvptest/ui/activity/LaunchActivity.java
app/src/main/res/layout/listitem_main.xml
cnlive/build.gradle
cnlive/src/main/java/com/cnlive/libs/base/frame/ReflectUtil.java
cnlive/src/main/java/com/cnlive/libs/base/frame/adapter/DataBindingRecyclerAdapter.java
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
@@ -34,17 +31,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.Intent;
  
 import com.cnlive.libs.base.data.network.Subscriber;
-import com.cnlive.libs.base.util.LogUtil;
 import com.cnlive.libs.base.util.TimerUtil;
 import com.cnlive.libs.demo.Config;
 import com.cnlive.libs.demo.MainActivity;
@@ -62,24 +61,24 @@ public class LaunchPresenter extends MvpBasePresenter&lt;LaunchView&gt; {
     public void startTimer(long totalTime) {
         if (timerUtil != null) timerUtil.cancel();
  
-        timerUtil = new TimerUtil();
-        timerUtil.setTotalTime(totalTime);//设置毫秒数
-        timerUtil.setIntervalTime(1000);//设置间隔数
-        timerUtil.start();
-        timerUtil.setTimerLiener(new TimerUtil.TimeListener() {
-            @Override
-            public void onFinish() {
-                ILaunchView view = getView();
-                if (view != null) view.onTimerFinish();
-            }
-
-            @Override
-            public void onInterval(long remainTime) {
-                ILaunchView view = getView();
-                if (view != null) view.onTimerInterval(remainTime / 1000);
-                LogUtil.d("LaunchView", "剩余时间" + remainTime);
-            }
-        });
+//        timerUtil = new TimerUtil();
+//        timerUtil.setTotalTime(totalTime);//设置毫秒数
+//        timerUtil.setIntervalTime(1000);//设置间隔数
+//        timerUtil.start();
+//        timerUtil.setTimerLiener(new TimerUtil.TimeListener() {
+//            @Override
+//            public void onFinish() {
+//                ILaunchView view = getView();
+//                if (view != null) view.onTimerFinish();
+//            }
+//
+//            @Override
+//            public void onInterval(long remainTime) {
+//                ILaunchView view = getView();
+//                if (view != null) view.onTimerInterval(remainTime / 1000);
+//                LogUtil.d("LaunchView", "剩余时间" + remainTime);
+//            }
+//        });
     }
  
     public void startMainPage(Activity activity) {
@@ -3,16 +3,16 @@ package com.cnlive.libs.demo.mvptest.ui.activity;
  
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
  
 import com.cnlive.libs.base.frame.activity.MvpViewStateBindingActivity;
-import com.cnlive.libs.base.frame.adapter.DataBindingRecyclerAdapter;
-import com.cnlive.libs.demo.mvptest.model.LaunchListItemData;
 import com.cnlive.libs.demo.R;
 import com.cnlive.libs.demo.ToastTest;
 import com.cnlive.libs.demo.databinding.ActivityLaunchBinding;
 import com.cnlive.libs.demo.mvptest.frame.presenter.LaunchPresenter;
 import com.cnlive.libs.demo.mvptest.frame.view.LaunchView;
+import com.cnlive.libs.demo.mvptest.model.LaunchListItemData;
 import com.cnlive.libs.demo.mvptest.model.LaunchPage;
  
 public class LaunchActivity extends MvpViewStateBindingActivity<LaunchView, LaunchPresenter, LaunchPage, ActivityLaunchBinding> {
@@ -30,11 +30,8 @@ public class LaunchActivity extends MvpViewStateBindingActivity&lt;LaunchView, Laun
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        getViewData().getAdapter().setItemClickListener(new DataBindingRecyclerAdapter.OnItemClickListener<LaunchListItemData>() {
-            @Override
-            public void onItemClick(LaunchListItemData item) {
-
-            }
+        getViewData().getAdapter().setItemClickListener(item -> {
+            Log.e("DemoView", "Click " + item.getName());
         });
     }
  
@@ -7,6 +7,10 @@
         <variable
             name="data"
             type="com.cnlive.libs.demo.mvptest.model.LaunchListItemData" />
+
+        <variable
+            name="click"
+            type="android.view.View.OnClickListener" />
     </data>
  
     <RelativeLayout
@@ -17,11 +21,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:onClick="onMainItemClick"
             android:padding="8dp"
-
             android:text="@{data.name}"
-            app:tag="@{data}" />
+            app:tag="@{data}"
+            android:onClick="@{click}"/>
  
     </RelativeLayout>
  
@@ -78,7 +78,7 @@ ext {
     siteUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo'
     gitUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo.git'
  
-    libraryVersion = '0.2.8'
+    libraryVersion = '0.2.9'
  
     developerId = 'CNlive'
     developerName = 'Granzon'
 package com.cnlive.libs.base.frame;
  
  
+import android.util.Log;
+
 import com.cnlive.libs.base.util.LogUtil;
  
 import java.lang.reflect.Constructor;
@@ -11,9 +13,30 @@ public class ReflectUtil {
  
     private static final String TAG = "ReflectUtil";
  
+    public static Object invoke(Object obj, String methodName, Object data, Class clazz) {
+        Object result = null;
+        try {
+            Log.e("DemOView", "--------------------Test " + methodName + " : " + data.getClass());
+            for (Method method : obj.getClass().getMethods()) {
+                Log.e("DemOView", "Test " + method.getName() + " : " + method.getParameterAnnotations().toString());
+            }
+
+            Method method = obj.getClass().getMethod(methodName, clazz);
+            result = method.invoke(obj, data);
+        } catch (Exception e) {
+            LogUtil.e(TAG, "The page data type is not match ", e);
+        }
+        return result;
+    }
+
     public static Object invoke(Object obj, String methodName, Object data) {
         Object result = null;
         try {
+            Log.e("DemOView", "--------------------Test " + methodName + " : " + data.getClass());
+            for (Method method : obj.getClass().getMethods()) {
+                Log.e("DemOView", "Test " + method.getName() + " : " + method.getParameterAnnotations().toString());
+            }
+
             Method method = obj.getClass().getMethod(methodName, new Class[]{data.getClass()});
             result = method.invoke(obj, data);
         } catch (Exception e) {
@@ -63,14 +63,13 @@ public abstract class DataBindingRecyclerAdapter&lt;D, T extends ViewDataBinding&gt; e
  
     @Override
     public void onBindViewHolder(DataBindingViewHolder holder, int position) {
-        View.OnClickListener click = new Click(position) {
+        ReflectUtil.invoke(holder.binding, "setData", getList().get(position));
+        ReflectUtil.invoke(holder.binding, "setClick", new Click(position) {
             @Override
             public void onClick(View v) {
                 if (listener != null) listener.onItemClick(getList().get(position));
             }
-        };
-        ReflectUtil.invoke(holder.binding, "setData", getList().get(position));
-        ReflectUtil.invoke(holder.binding, "setClick", click);
+        }, View.OnClickListener.class);
         holder.binding.executePendingBindings();
     }