Skip to content

Commit f0e923d

Browse files
author
zhangqinghua.wanjian
committed
支持Android 9.0
1 parent 07172aa commit f0e923d

22 files changed

+251
-396
lines changed

.idea/misc.xml

+14-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Main.dex

74.2 KB
Binary file not shown.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public interface IRotationWatcher {
210210

211211

212212
### 打包dex方式:
213-
首先命令窗口切换到 `androidScreenShareAndControl/shareandcontrollib/build/intermediates/classes/debug` 目录下,可以看到
213+
首先命令窗口切换到 `/androidScreenShareAndControl/shareandcontrollib/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes` 目录下,可以看到
214214
所有编译生成的class文件,如果没有先执行上面步骤生成class文件。
215215

216216
然后使用 `dx --dex --output=Main.dex ./`命令生成dex文件。dx命令文件在 `sdk/build-tools/版本号`

build.gradle

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
maven {
7+
url 'https://maven.google.com/'
8+
name 'Google'
9+
}
610
}
711
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.0'
12+
classpath 'com.android.tools.build:gradle:3.2.1'
913

1014
// NOTE: Do not place your application dependencies here; they belong
1115
}
@@ -14,6 +18,10 @@ buildscript {
1418
allprojects {
1519
repositories {
1620
jcenter()
21+
maven {
22+
url 'https://maven.google.com/'
23+
name 'Google'
24+
}
1725
}
1826
}
1927

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 28 10:00:20 PST 2015
1+
#Tue Jun 18 14:49:50 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

shareandcontrollib/build.gradle

+6-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
4+
compileSdkVersion 28
5+
buildToolsVersion "28.0.3"
66

77
defaultConfig {
8-
minSdkVersion 9
9-
targetSdkVersion 25
8+
minSdkVersion 16
9+
targetSdkVersion 28
1010
versionCode 1
1111
versionName "1.0"
1212

13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1413

1514
}
16-
buildTypes {
17-
release {
18-
minifyEnabled false
19-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
20-
}
21-
}
15+
2216
}
2317

2418
dependencies {
2519
compile fileTree(dir: 'libs', include: ['*.jar'])
26-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
27-
exclude group: 'com.android.support', module: 'support-annotations'
28-
})
29-
compile 'com.android.support:appcompat-v7:25.2.0'
30-
testCompile 'junit:junit:4.12'
20+
compile 'com.android.support:appcompat-v7:28.0.0'
3121
}

shareandcontrollib/src/androidTest/java/com/wanjian/puppet/ExampleInstrumentedTest.java

-26
This file was deleted.

shareandcontrollib/src/main/AndroidManifest.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.wanjian.puppet">
1+
<manifest package="com.wanjian.puppet"
2+
xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<application android:allowBackup="true"
5-
android:label="@string/app_name"
6-
android:supportsRtl="true"
4+
<application
75
>
86

97
</application>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package android.os;
2+
3+
public class ServiceManager {
4+
public static IBinder getService(String s) {
5+
return null;
6+
}
7+
}

shareandcontrollib/src/main/java/android/view/DisplayInfo.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
* Created by wanjian on 2017/4/4.
55
*/
66

7-
public interface DisplayInfo {
7+
public final class DisplayInfo {
8+
9+
public int logicalWidth;
10+
public int logicalHeight;
811
}

shareandcontrollib/src/main/java/android/view/IWindowManager.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public interface IWindowManager {
1616

1717
abstract class Stub {
1818

19-
public static IWindowManager asInterface(IBinder invoke) {
20-
return null;
21-
}
22-
}
19+
public static IWindowManager asInterface(IBinder invoke) {
20+
return null;
21+
}
22+
}
2323
}

shareandcontrollib/src/main/java/android/view/Surface.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
public class Surface {
10-
public static Bitmap screenshot(int x, int y){
10+
public static Bitmap screenshot(int x, int y) {
1111
return null;
1212
}
1313
}
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
package android.view;
22

33
import android.graphics.Bitmap;
4+
import android.graphics.Rect;
45

56
/**
67
* Created by wanjian on 2017/4/5.
78
*/
89

910
public class SurfaceControl {
10-
public static Bitmap screenshot(int x,int y){
11+
public static Bitmap screenshot(int x, int y) {
12+
return null;
13+
}
14+
15+
public static Bitmap screenshot(Rect sourceCrop, int width, int height, int rotation) {
1116
return null;
1217
}
1318
}

0 commit comments

Comments
 (0)