tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of origin

Browse Source
This commit is contained in:
pengfei.zhou
2019-10-21 09:18:21 +08:00
parent a72bd3df37 7f50e02712
commit 241df68bbb
19 changed files with 2681 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Android/app/build.gradle
View File

@@ -1,14 +1,15 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 28
compileSdkVersion 29
buildToolsVersion '29.0.2'
defaultConfig {
applicationId "com.github.penfeizhou.doric"
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -20,11 +21,11 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation project(':doric')
implementation 'com.github.bumptech.glide:glide:4.8.0'
implementation 'com.github.bumptech.glide:annotations:4.8.0'
implementation 'com.github.bumptech.glide:glide:4.10.0'
implementation 'com.github.bumptech.glide:annotations:4.10.0'
implementation 'com.github.penfeizhou.android.animation:glide-plugin:1.0.1'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
}

2
Android/app/src/main/java/pub/doric/demo/MainActivity.java
View File

@@ -1,6 +1,6 @@
package pub.doric.demo;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.ViewGroup;
import android.widget.FrameLayout;

4
Android/app/src/main/res/layout/activity_main.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -9,4 +9,4 @@
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
Android/build.gradle
View File

@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.5.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

14
Android/doric/build.gradle
View File

@@ -1,16 +1,16 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 28
compileSdkVersion 29
buildToolsVersion '29.0.2'
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -46,10 +46,10 @@ task buildDebugger(type: Exec) {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
api 'com.github.pengfeizhou:jsc4a:0.1.0'
implementation "com.squareup.okhttp3:okhttp:3.11.0"
implementation 'com.github.penfeizhou.android.animation:glide-plugin:1.0.1'

6
Android/doric/src/main/java/pub/doric/DoricPanel.java
View File

@@ -2,9 +2,9 @@ package pub.doric;
import android.content.Context;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import android.util.AttributeSet;
import android.widget.FrameLayout;

2
Android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java
View File

@@ -51,7 +51,7 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
private void initJSExecutor() {
mDoricJSE = new DoricJSExecutor();
mDoricJSE = new DoricNativeJSExecutor();
mDoricJSE.injectGlobalJSFunction(DoricConstant.INJECT_LOG, new JavaFunction() {
@Override
public JavaValue exec(JSDecoder[] args) {

4
Android/doric/src/main/java/pub/doric/engine/DoricJSExecutor.java → Android/doric/src/main/java/pub/doric/engine/DoricNativeJSExecutor.java
View File

@@ -11,11 +11,11 @@ import com.github.pengfeizhou.jscore.JavaValue;
* @Author: pengfei.zhou
* @CreateDate: 2019-07-18
*/
public class DoricJSExecutor implements IDoricJSE {
public class DoricNativeJSExecutor implements IDoricJSE {
private final JSExecutor mJSExecutor;
public DoricJSExecutor() {
public DoricNativeJSExecutor() {
this.mJSExecutor = JSExecutor.create();
}

39
Android/doric/src/main/java/pub/doric/engine/DoricRemoteJSExecutor.java Normal file
View File

@@ -0,0 +1,39 @@
package pub.doric.engine;
import com.github.pengfeizhou.jscore.JSDecoder;
import com.github.pengfeizhou.jscore.JSRuntimeException;
import com.github.pengfeizhou.jscore.JavaFunction;
import com.github.pengfeizhou.jscore.JavaValue;
public class DoricRemoteJSExecutor implements IDoricJSE {
@Override
public String loadJS(String script, String source) throws JSRuntimeException {
return null;
}
@Override
public JSDecoder evaluateJS(String script, String source, boolean hashKey) throws JSRuntimeException {
return null;
}
@Override
public void injectGlobalJSFunction(String name, JavaFunction javaFunction) {
}
@Override
public void injectGlobalJSObject(String name, JavaValue javaValue) {
}
@Override
public JSDecoder invokeMethod(String objectName, String functionName, JavaValue[] javaValues, boolean hashKey) throws JSRuntimeException {
return null;
}
@Override
public void teardown() {
}
}

6
Android/doric/src/main/java/pub/doric/shader/DoricLayer.java
View File

@@ -7,9 +7,9 @@ import android.graphics.Path;
import android.graphics.RectF;
import android.graphics.Region;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;

2
Android/doric/src/main/java/pub/doric/shader/ImageNode.java
View File

@@ -1,7 +1,7 @@
package pub.doric.shader;
import android.graphics.drawable.Drawable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.view.ViewGroup;
import android.widget.ImageView;

2
Android/doric/src/main/java/pub/doric/utils/DoricUtils.java
View File

@@ -2,7 +2,7 @@ package pub.doric.utils;
import android.content.Context;
import android.content.res.AssetManager;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.WindowManager;

2
Android/gradle.properties
View File

@@ -6,6 +6,8 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit

4
Android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Jul 18 13:18:02 CST 2019
#Sat Oct 12 19:23:56 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip