handle primitive type

CodingGay · Feb 16, 2022 · 740e207 · 740e207
1 parent 0dd8223
commit 740e207
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,6 +17,10 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,16 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-keep class top.niunaijun.blackreflection.** {*; }
+-keep @top.niunaijun.blackreflection.annotation.BClass class * {*;}
+-keep @top.niunaijun.blackreflection.annotation.BClassName class * {*;}
+-keep @top.niunaijun.blackreflection.annotation.BClassNameNotProcess class * {*;}
+-keepclasseswithmembernames class * {
+    @top.niunaijun.blackreflection.annotation.BField.* <methods>;
+    @top.niunaijun.blackreflection.annotation.BFieldNotProcess.* <methods>;
+    @top.niunaijun.blackreflection.annotation.BFieldSetNotProcess.* <methods>;
+    @top.niunaijun.blackreflection.annotation.BMethod.* <methods>;
+    @top.niunaijun.blackreflection.annotation.BStaticField.* <methods>;
+    @top.niunaijun.blackreflection.annotation.BStaticMethod.* <methods>;
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,21 +3,21 @@
     package="top.niunaijun.blackreflection">
 
     <application
-        android:name=".App"
+        android:name="top.niunaijun.app.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.BlackReflection">
-        <activity android:name=".MainActivity">
+        <activity android:name="top.niunaijun.app.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".SecondActivity"/>
+        <activity android:name="top.niunaijun.app.SecondActivity"/>
     </application>
 
 </manifest>
diff --git a/...va/top/niunaijun/blackreflection/App.java → app/src/main/java/top/niunaijun/app/App.java b/...va/top/niunaijun/blackreflection/App.java → app/src/main/java/top/niunaijun/app/App.java
@@ -1,4 +1,4 @@
-package top.niunaijun.blackreflection;
+package top.niunaijun.app;
 
 import android.app.Application;
 

diff --git a/...unaijun/blackreflection/MainActivity.java → .../java/top/niunaijun/app/MainActivity.java b/...unaijun/blackreflection/MainActivity.java → .../java/top/niunaijun/app/MainActivity.java
@@ -1,14 +1,15 @@
-package top.niunaijun.blackreflection;
+package top.niunaijun.app;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import top.niunaijun.blackreflection.ref.BRActivityThread;
-import top.niunaijun.blackreflection.ref.BRActivityThreadH;
-import top.niunaijun.blackreflection.ref.BRMainActivity;
+import top.niunaijun.app.ref.BRActivityThread;
+import top.niunaijun.app.ref.BRActivityThreadH;
+import top.niunaijun.app.ref.BRMainActivity;
+import top.niunaijun.blackreflection.R;
 
 
 public class MainActivity extends AppCompatActivity {

diff --git a/...aijun/blackreflection/SecondActivity.java → ...ava/top/niunaijun/app/SecondActivity.java b/...aijun/blackreflection/SecondActivity.java → ...ava/top/niunaijun/app/SecondActivity.java
@@ -1,15 +1,14 @@
-package top.niunaijun.blackreflection;
+package top.niunaijun.app;
 
 import android.os.Bundle;
-import android.util.Log;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
 import java.lang.reflect.Method;
 
-import top.niunaijun.blackreflection.ref.BRAppCompatActivity;
+import top.niunaijun.app.ref.BRAppCompatActivity;
 
 /**
  * Created by Milk on 2022/2/15.

diff --git a/...n/blackreflection/ref/ActivityThread.java → ...top/niunaijun/app/ref/ActivityThread.java b/...n/blackreflection/ref/ActivityThread.java → ...top/niunaijun/app/ref/ActivityThread.java
@@ -1,4 +1,4 @@
-package top.niunaijun.blackreflection.ref;
+package top.niunaijun.app.ref;
 
 import android.content.Intent;
 import android.os.IBinder;

diff --git a/...lackreflection/ref/AppCompatActivity.java → .../niunaijun/app/ref/AppCompatActivity.java b/...lackreflection/ref/AppCompatActivity.java → .../niunaijun/app/ref/AppCompatActivity.java
@@ -1,4 +1,4 @@
-package top.niunaijun.blackreflection.ref;
+package top.niunaijun.app.ref;
 
 import androidx.appcompat.app.ActionBar;
 

diff --git a/...jun/blackreflection/ref/MainActivity.java → ...a/top/niunaijun/app/ref/MainActivity.java b/...jun/blackreflection/ref/MainActivity.java → ...a/top/niunaijun/app/ref/MainActivity.java
@@ -1,4 +1,4 @@
-package top.niunaijun.blackreflection.ref;
+package top.niunaijun.app.ref;
 
 import top.niunaijun.blackreflection.annotation.BClass;
 import top.niunaijun.blackreflection.annotation.BField;
@@ -13,7 +13,7 @@
  * しーＪ
  * 此处无Bug
  */
-@BClass(top.niunaijun.blackreflection.MainActivity.class)
+@BClass(top.niunaijun.app.MainActivity.class)
 public interface MainActivity {
     @BStaticField
     String TAGStatic();

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context="top.niunaijun.app.MainActivity">
 
     <Button
         android:id="@+id/btn_start"

diff --git a/...iler/src/main/java/top/niunaijun/blackreflection/proxy/BlackReflectionInterfaceProxy.java b/...iler/src/main/java/top/niunaijun/blackreflection/proxy/BlackReflectionInterfaceProxy.java
@@ -139,6 +139,22 @@ private static Class<?> parseBaseClass(String className) {
                 return boolean.class;
             case "char":
                 return char.class;
+            case "int[]":
+                return int[].class;
+            case "byte[]":
+                return byte[].class;
+            case "short[]":
+                return short[].class;
+            case "long[]":
+                return long[].class;
+            case "float[]":
+                return float[].class;
+            case "double[]":
+                return double[].class;
+            case "boolean[]":
+                return boolean[].class;
+            case "char[]":
+                return char[].class;
         }
         return null;
     }

diff --git a/core/src/main/java/top/niunaijun/blackreflection/BlackNullPointerException.java b/core/src/main/java/top/niunaijun/blackreflection/BlackNullPointerException.java
@@ -0,0 +1,15 @@
+package top.niunaijun.blackreflection;
+
+/**
+ * Created by Milk on 2022/2/16.
+ * * ∧＿∧
+ * (`･ω･∥
+ * 丶　つ０
+ * しーＪ
+ * 此处无Bug
+ */
+public class BlackNullPointerException extends NullPointerException {
+    public BlackNullPointerException(String s) {
+        super(s);
+    }
+}
diff --git a/core/src/main/java/top/niunaijun/blackreflection/BlackReflection.java b/core/src/main/java/top/niunaijun/blackreflection/BlackReflection.java
@@ -63,12 +63,14 @@ public static <T> T create(Class<T> clazz, final Object caller, boolean withExce
             Object o = Proxy.newProxyInstance(clazz.getClassLoader(), new Class[]{clazz}, new InvocationHandler() {
                 @Override
                 public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                    String name = method.getName();
+                    Class<?> returnType = method.getReturnType();
+
                     try {
                         boolean isStatic = weakCaller == null;
 
                         Object callerByWeak = isStatic ? null : weakCaller.get();
 
-                        String name = method.getName();
                         // fidel
                         BField bField = method.getAnnotation(BField.class);
                         BFieldNotProcess bFieldNotProcess = method.getAnnotation(BFieldNotProcess.class);
@@ -79,12 +81,14 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                                 call = on.get(args);
                             } else {
                                 if (callerByWeak == null) {
-                                    return null;
+                                    return generateNullValue(returnType);
                                 }
                                 call = on.get(callerByWeak);
                             }
                             return call;
                         }
+
+                        // void
                         BFieldSetNotProcess bFieldSetNotProcess = method.getAnnotation(BFieldSetNotProcess.class);
                         if (bFieldSetNotProcess != null) {
                             // startsWith "set"
@@ -109,18 +113,22 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                             call = on.call(args);
                         } else {
                             if (callerByWeak == null) {
-                                return null;
+                                return generateNullValue(returnType);
                             }
                             call = on.callByCaller(callerByWeak, args);
                         }
                         return call;
                     } catch (Throwable throwable) {
                         throwable.printStackTrace();
+                        if (throwable instanceof BlackNullPointerException) {
+                            throw throwable;
+                        }
                         if (withException) {
                             throw throwable;
                         }
                     }
-                    return null;
+
+                    return generateNullValue(returnType);
                 }
             });
 
@@ -184,4 +192,14 @@ private static Class<?> getClassNameByBlackClass(Class<?> clazz) throws ClassNot
             return Class.forName(bClassNameNotProcess.value());
         }
     }
+
+    private static Object generateNullValue(Class<?> returnType) {
+        if (returnType == void.class) {
+            return 0;
+        }
+        if (returnType.isPrimitive()) {
+            throw new BlackNullPointerException("value is null!");
+        }
+        return null;
+    }
 }