Victory-Over · chuckiefan · Jan 8, 2019 · Jan 8, 2019 · Jan 8, 2019 · Jan 8, 2019
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.fanneng.android.web.demo"
         multiDexEnabled true
-        minSdkVersion 15
-        targetSdkVersion 26
+        minSdkVersion 21
+        targetSdkVersion 28
         versionCode 2
         versionName "1.0.2"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -29,9 +29,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.nineoldandroids:library:2.4.0'
-    compile 'com.coolindicator.sdk:coolindicator:1.0.0-beta'
-    compile project(':superweb')
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'com.nineoldandroids:library:2.4.0'
+    implementation 'com.coolindicator.sdk:coolindicator:1.0.0-beta'
+    implementation project(':superweb')
 }
diff --git a/app/src/main/assets/file/test.pdf b/app/src/main/assets/file/test.pdf
diff --git a/app/src/main/java/com/fanneng/android/web/demo/CommonActivity.java b/app/src/main/java/com/fanneng/android/web/demo/CommonActivity.java
@@ -6,14 +6,15 @@
 import android.graphics.PixelFormat;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 
 import com.fanneng.android.web.demo.interactive.SlidingFragment;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 /**
  * describe：公共加载fragment类
  *

diff --git a/app/src/main/java/com/fanneng/android/web/demo/FileDisplayActivity.java b/app/src/main/java/com/fanneng/android/web/demo/FileDisplayActivity.java
@@ -3,11 +3,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 
 import com.fanneng.android.web.file.FileReaderView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * describe：文件阅读类
  *

diff --git a/app/src/main/java/com/fanneng/android/web/demo/FileListActivity.java b/app/src/main/java/com/fanneng/android/web/demo/FileListActivity.java
@@ -3,9 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,6 +14,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * describe：功能列表
  *
@@ -110,7 +111,7 @@ private String getFilePath(int position) {
                 break;
 
             case 3:
-                path = getFilesDir().getAbsolutePath() + File.separator +"test.pptx";
+                path = getFilesDir().getAbsolutePath() + File.separator +"demo.pptx";
                 break;
 
             case 4:

diff --git a/app/src/main/java/com/fanneng/android/web/demo/JsFragment.java b/app/src/main/java/com/fanneng/android/web/demo/JsFragment.java
@@ -2,8 +2,6 @@
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,6 +11,9 @@
 
 import org.json.JSONObject;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 /**
  * describe：公共加载fragment类
  *

diff --git a/app/src/main/java/com/fanneng/android/web/demo/MainActivity.java b/app/src/main/java/com/fanneng/android/web/demo/MainActivity.java
@@ -2,9 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +10,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import static com.fanneng.android.web.demo.CommonActivity.TYPE_KEY;
 
 /**

diff --git a/app/src/main/java/com/fanneng/android/web/demo/SuperWebX5Fragment.java b/app/src/main/java/com/fanneng/android/web/demo/SuperWebX5Fragment.java
@@ -4,8 +4,10 @@
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;

diff --git a/app/src/main/java/com/fanneng/android/web/demo/ToolbarActivity.java b/app/src/main/java/com/fanneng/android/web/demo/ToolbarActivity.java
@@ -3,10 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.TextView;
@@ -18,6 +14,11 @@
 import com.fanneng.android.web.demo.interactive.SlidingLayout;
 import com.fanneng.android.web.demo.interactive.WebLayout;
 import com.fanneng.android.web.progress.BaseIndicatorView;
+import com.google.android.material.appbar.AppBarLayout;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 /**
  * describe：与Toolbar联动  需设置主题为AppTheme

diff --git a/app/src/main/java/com/fanneng/android/web/demo/VideoPlayActivity.java b/app/src/main/java/com/fanneng/android/web/demo/VideoPlayActivity.java
@@ -4,13 +4,14 @@
 import android.content.Intent;
 import android.graphics.PixelFormat;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
 import com.tencent.smtt.sdk.WebChromeClient;
 import com.tencent.smtt.sdk.WebView;
 import com.tencent.smtt.sdk.WebViewClient;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * describe：视频播放类
  *

diff --git a/app/src/main/java/com/fanneng/android/web/demo/interactive/BottomNavigationViewBehavior.java b/app/src/main/java/com/fanneng/android/web/demo/interactive/BottomNavigationViewBehavior.java
@@ -1,12 +1,14 @@
 package com.fanneng.android.web.demo.interactive;
 
 import android.content.Context;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.view.ViewCompat;
+
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 /**
  * 与toolbar联动隐藏底部菜单
  */

diff --git a/app/src/main/java/com/fanneng/android/web/demo/interactive/CoolIndicatorLayout.java b/app/src/main/java/com/fanneng/android/web/demo/interactive/CoolIndicatorLayout.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -12,6 +11,8 @@
 import com.fanneng.android.web.demo.R;
 import com.fanneng.android.web.progress.BaseIndicatorView;
 
+import androidx.annotation.Nullable;
+
 public class CoolIndicatorLayout extends BaseIndicatorView {
 
 

diff --git a/app/src/main/java/com/fanneng/android/web/demo/interactive/SlidingLayout.java b/app/src/main/java/com/fanneng/android/web/demo/interactive/SlidingLayout.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;

diff --git a/app/src/main/java/com/fanneng/android/web/demo/interactive/WebLayout.java b/app/src/main/java/com/fanneng/android/web/demo/interactive/WebLayout.java
@@ -1,15 +1,16 @@
 package com.fanneng.android.web.demo.interactive;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import com.fanneng.android.web.IWebLayout;
 import com.fanneng.android.web.demo.R;
 import com.tencent.smtt.sdk.WebView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 
 public class WebLayout implements IWebLayout {
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.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"
-    tools:context="com.fanneng.android.web.demo.MainActivity">
+<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"
+                                                   tools:context="com.fanneng.android.web.demo.MainActivity">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/mRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_video.xml b/app/src/main/res/layout/activity_video.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="match_parent">
 
     <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="200dp"
         android:scrollbars="none" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_toolbar.xml b/app/src/main/res/layout/fragment_toolbar.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:titleTextColor="@color/white"
             app:layout_scrollFlags="scroll|enterAlways" />
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -62,4 +62,4 @@
             android:text="菜单"
             android:textColor="#fff" />
     </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/toorbar_main.xml b/app/src/main/res/layout/toorbar_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?android:actionBarSize"
@@ -55,5 +55,5 @@
     </RelativeLayout>
 
 
-</android.support.v7.widget.Toolbar>
+</androidx.appcompat.widget.Toolbar>
 
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.61"
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip