Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

publish 0.28.0-alpha-1 #77

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions inspector/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,24 @@ apply plugin: 'com.jfrog.bintray'

group = 'com.taobao.android'
description = """weex_inspector"""
version '0.28.0'
version '0.28.0-alpha-1'

buildscript {

repositories {
mavenCentral()
mavenCentral(){
url 'https://maven.aliyun.com/repository/central'
}
jcenter(){
url 'https://maven.aliyun.com/repository/jcenter'
}
google()
// google()
maven(){
url 'https://maven.aliyun.com/repository/google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath "com.github.dcendents:android-maven-gradle-plugin:1.4.1"
}
Expand All @@ -31,7 +36,9 @@ repositories {
maven(){
url 'https://maven.aliyun.com/repository/google'
}
mavenCentral()
mavenCentral(){
url 'https://maven.aliyun.com/repository/central'
}
jcenter(){
url 'https://maven.aliyun.com/repository/jcenter'
}
Expand Down Expand Up @@ -65,7 +72,7 @@ android {
dependencies {
// compile 'commons-cli:commons-cli:1.2'
compileOnly 'com.google.code.findbugs:jsr305:2.0.1'
implementation 'com.android.support:appcompat-v7:23.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
// optional
testImplementation 'junit:junit:4.12'
testImplementation('org.robolectric:robolectric:2.4') {
Expand All @@ -82,7 +89,7 @@ dependencies {

compileOnly 'com.squareup.okhttp:okhttp:2.7.5'
compileOnly 'com.squareup.okhttp:okhttp-ws:2.7.5'
compileOnly 'com.android.support:recyclerview-v7:23.1.1'
compileOnly 'com.android.support:recyclerview-v7:28.0.0'
}

//apply from: rootProject.file('release.gradle')
Expand Down
3 changes: 2 additions & 1 deletion inspector/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
Original file line number Diff line number Diff line change
Expand Up @@ -338,22 +338,22 @@ public int callUpdateAttrs(String instanceId, String ref, HashMap<String, String

@Override
public int callAddChildToRichtext(String s, String s1, String s2, String s3, String s4, HashMap<String, String> hashMap, HashMap<String, String> hashMap1) {
return 0;
return mOriginBridge.callAddChildToRichtext(s,s1,s2,s3,s4,hashMap,hashMap1);
}

@Override
public int callRemoveChildFromRichtext(String s, String s1, String s2, String s3) {
return 0;
return mOriginBridge.callRemoveChildFromRichtext(s,s1,s2,s3);
}

@Override
public int callUpdateRichtextStyle(String s, String s1, HashMap<String, String> hashMap, String s2, String s3) {
return 0;
return mOriginBridge.callUpdateRichtextStyle(s,s1,hashMap,s2,s3);
}

@Override
public int callUpdateRichtextChildAttr(String s, String s1, HashMap<String, String> hashMap, String s2, String s3) {
return 0;
return mOriginBridge.callUpdateRichtextChildAttr(s,s1,hashMap,s2,s3);
}

@Override
Expand Down Expand Up @@ -514,7 +514,7 @@ public void markDirty(String instanceId, String ref, boolean dirty) {

@Override
public void setDeviceDisplay(String s, float v, float v1, float v2) {

mOriginBridge.setDeviceDisplay(s,v,v1,v2);
}

@Override
Expand Down Expand Up @@ -545,32 +545,32 @@ public void resetWXBridge(boolean remoteDebug) {

@Override
public void setInstanceRenderType(String s, String s1) {

mOriginBridge.setInstanceRenderType(s,s1);
}

@Override
public void removeInstanceRenderType(String s) {

mOriginBridge.removeInstanceRenderType(s);
}

@Override
public void setPageArgument(String s, String s1, String s2) {

mOriginBridge.setPageArgument(s,s1,s2);
}

@Override
public void setViewPortWidth(String s, float v) {

mOriginBridge.setViewPortWidth(s,v);
}

@Override
public void reloadPageLayout(String s) {

mOriginBridge.reloadPageLayout(s);
}

@Override
public void setDeviceDisplayOfPage(String s, float v, float v1) {

mOriginBridge.setDeviceDisplayOfPage(s,v,v1);
}

public void setSession(SimpleSession session) {
Expand Down Expand Up @@ -675,12 +675,12 @@ public WXDebugJsBridge getWXDebugJsBridge() {

@Override
public void updateInitFrameworkParams(String s, String s1, String s2) {

mOriginBridge.updateInitFrameworkParams(s,s1,s2);
}

@Override
public void setLogType(float v, boolean b) {

mOriginBridge.setLogType(v,b);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
//import android.support.v7.app.ActionBarActivity;
import android.view.Gravity;
import android.view.MenuItem;
import android.view.View;
Expand All @@ -17,7 +18,7 @@

import com.taobao.weex.inspector.R;

public class PerformanceActivity extends ActionBarActivity {
public class PerformanceActivity extends AppCompatActivity {

private LinearLayout segmentHost;

Expand Down