diff --git a/.gitignore b/.gitignore index 6b04ae92..1bed7cda 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /.idea/libraries .DS_Store /build +/release /captures .externalNativeBuild *.apk diff --git a/app/build.gradle b/app/build.gradle index 00b608e1..c5f62dc3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 17 targetSdkVersion 23 - versionCode 213 - versionName "3.0.0 Alpha14" + versionCode 214 + versionName "3.0.0 Alpha15" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true ndk { diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/widget/EWebView.java b/app/src/main/java/com/stardust/scriptdroid/ui/widget/EWebView.java index 82cd5226..2088033a 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/widget/EWebView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/widget/EWebView.java @@ -40,13 +40,14 @@ import io.reactivex.android.schedulers.AndroidSchedulers; * Created by Stardust on 2017/8/22. */ -public class EWebView extends SwipeRefreshLayout implements SwipeRefreshLayout.OnRefreshListener, OnActivityResultDelegate { +public class EWebView extends FrameLayout implements SwipeRefreshLayout.OnRefreshListener, OnActivityResultDelegate { private static final List IMAGE_TYPES = Arrays.asList("png", "jpg", "bmp"); private static final int CHOOSE_IMAGE = 42222; private WebView mWebView; private ProgressBar mProgressBar; + private SwipeRefreshLayout mSwipeRefreshLayout; public EWebView(Context context) { super(context); @@ -62,8 +63,9 @@ public class EWebView extends SwipeRefreshLayout implements SwipeRefreshLayout.O private void init() { inflate(getContext(), R.layout.ewebview, this); mWebView = (WebView) findViewById(R.id.web_view); + mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_refresh_layout); mProgressBar = (ProgressBar) findViewById(R.id.progress_bar); - setOnRefreshListener(this); + mSwipeRefreshLayout.setOnRefreshListener(this); setUpWebView(); } @@ -97,7 +99,7 @@ public class EWebView extends SwipeRefreshLayout implements SwipeRefreshLayout.O mWebView.reload(); Observable.timer(2, TimeUnit.SECONDS) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(t -> setRefreshing(false)); + .subscribe(t -> mSwipeRefreshLayout.setRefreshing(false)); } @@ -189,7 +191,7 @@ public class EWebView extends SwipeRefreshLayout implements SwipeRefreshLayout.O public void onPageFinished(WebView view, String url) { super.onPageFinished(view, url); mProgressBar.setVisibility(GONE); - setRefreshing(false); + mSwipeRefreshLayout.setRefreshing(false); } @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) diff --git a/app/src/main/res/layout/ewebview.xml b/app/src/main/res/layout/ewebview.xml index a3892c8c..a429510d 100644 --- a/app/src/main/res/layout/ewebview.xml +++ b/app/src/main/res/layout/ewebview.xml @@ -1,11 +1,12 @@ - @@ -13,13 +14,13 @@ android:id="@+id/web_view" android:layout_width="match_parent" android:layout_height="match_parent"/> + - - + \ No newline at end of file