Skip to content

Commit

Permalink
移除ComponentProxy 以及相关代码
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanCheen committed Jul 28, 2022
1 parent ca9d97c commit 8c6d550
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* @since 2020/3/26 3:28 PM
* @since 1.0
*/
//@Proxy(layoutId = R.layout.flap_item_simple_databinding, useDataBinding = true)
//@Proxy(layoutName ="flap_item_simple_databinding", useDataBinding = true)
//@Delegate(layoutId = R.layout.flap_item_simple_databinding, useDataBinding = true)
//@Delegate(layoutName ="flap_item_simple_databinding", useDataBinding = true)
//public class SimpleDataBindingComponent extends Component<SimpleDataBindingModel> {
//
// private FlapItemSimpleDatabindingBinding binding;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import me.yifeiyuan.flapdev.components.base.BaseFlapComponent
/**
* Created by 程序亦非猿 on 2019/1/29.
*/
//@Proxy(layoutId = R.layout.flap_item_generic_type)
@Delegate(layoutName = "flap_item_generic_type")
class GenericFlapComponent(itemView: View) : BaseFlapComponent<GenericModel>(itemView) {
override fun onBind(model: GenericModel) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ public class FlapProcessor extends AbstractProcessor {

private final ClassName CLASS_KEEP = ClassName.bestGuess("androidx.annotation.Keep");
private final ClassName CLASS_FLAP = ClassName.bestGuess("me.yifeiyuan.flap.Flap");
private final ClassName CLASS_COMPONENT_PROXY = ClassName.bestGuess("me.yifeiyuan.flap.internal.ComponentProxy");

private final ClassName CLASS_OBJECT = ClassName.bestGuess("java.lang.Object");
private final ClassName CLASS_COMPONENT = ClassName.bestGuess("me.yifeiyuan.flap.Component");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/
class AutoRegister {

//需要被注入的 Proxy 的类名
//需要被注入的 AdapterDelegate 的类名
private List<String> classNames;

public AutoRegister(List<String> classNames) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
Expand All @@ -31,7 +30,7 @@
*/
public class FlapTransform extends Transform {

final String PROXY_PACKAGE_PATH_PREFIX = "me/yifeiyuan/flap/apt/delegates/";
final String DELEGATE_PACKAGE_PATH_PREFIX = "me/yifeiyuan/flap/apt/delegates/";

public static final String FLAP_CLASS_FILE_NAME = "me/yifeiyuan/flap/Flap.class";

Expand All @@ -42,7 +41,7 @@ public class FlapTransform extends Transform {

private Project project;

private List<String> proxyClassList = new ArrayList<>();
private List<String> delegateClassList = new ArrayList<>();

public FlapTransform(Project project) {
this.project = project;
Expand Down Expand Up @@ -89,15 +88,15 @@ public void transform(TransformInvocation transformInvocation) throws TransformE
List<TransformInput> inputs = (List<TransformInput>) transformInvocation.getInputs();

for (TransformInput input : inputs) {
//处理 jar 包中的 class 文件,找到 @Proxy 注解生成的文件
//处理 jar 包中的 class 文件,找到 @Delegate 注解生成的文件
handleJarInputs(outputProvider, input.getJarInputs());

// 处理文件夹目录中的 class 文件
handleDirectoryInputs(outputProvider, input.getDirectoryInputs());
}

if (flapFile != null) {
new AutoRegister(proxyClassList).registerFor(flapFile);
new AutoRegister(delegateClassList).registerFor(flapFile);
}

Log.println("===================== flap transform end ===================== ");
Expand All @@ -123,13 +122,13 @@ private void handleFiles(File file) {
handleFiles(file1);
}
} else {
if (file.getAbsolutePath().contains(PROXY_PACKAGE_PATH_PREFIX) && file.getName().endsWith("Delegate.class")) {
Log.println(">>>>>>>>>>>> 发现 proxy class :" + file.getName());
if (file.getAbsolutePath().contains(DELEGATE_PACKAGE_PATH_PREFIX) && file.getName().endsWith("Delegate.class")) {
Log.println(">>>>>>>>>>>> 发现 Delegate class :" + file.getName());
String fileName = file.getName();
int index = fileName.indexOf(".");
String className = PROXY_PACKAGE_PATH_PREFIX + fileName.substring(0, index);
String className = DELEGATE_PACKAGE_PATH_PREFIX + fileName.substring(0, index);
Log.println("className:" + className);
proxyClassList.add(className);
delegateClassList.add(className);
}
}
}
Expand Down Expand Up @@ -186,12 +185,12 @@ private void scanJarFile(File src, File dest) throws IOException {
Log.println(entryName);
Log.println(">>>>>>>>>>>> 发现 Flap class file <<<<<<<<<<<<");
flapFile = dest;
} else if (entryName.startsWith(PROXY_PACKAGE_PATH_PREFIX)) {
Log.println(">>>>>>>>> 发现 proxy class :" + entryName);
} else if (entryName.startsWith(DELEGATE_PACKAGE_PATH_PREFIX)) {
Log.println(">>>>>>>>> 发现 Delegate class :" + entryName);
int index = entryName.indexOf(".");
String className = entryName.substring(0, index);
Log.println("className:" + className);
proxyClassList.add(className);
delegateClassList.add(className);
}
}

Expand All @@ -201,6 +200,6 @@ private void scanJarFile(File src, File dest) throws IOException {
}

private boolean shouldProcessClass(String entryName) {
return entryName != null && entryName.startsWith(PROXY_PACKAGE_PATH_PREFIX);
return entryName != null && entryName.startsWith(DELEGATE_PACKAGE_PATH_PREFIX);
}
}
52 changes: 0 additions & 52 deletions flap/src/main/java/me/yifeiyuan/flap/ComponentProxy.java

This file was deleted.

0 comments on commit 8c6d550

Please sign in to comment.