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

解决Nexus手机出现空指针的问题 #11

Open
wants to merge 3 commits into
base: master
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
14 changes: 13 additions & 1 deletion README-CHN.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,19 @@ Android 加载控件库,简洁、易用、可定制性强。用于快速实现
* 1.2.1

## 使用方式
* gradle: `compile 'cc.cloudist.acplibrary:library:1.2.1'`
1. 在工程目录下添加maven
```
allprojects {
repositories {
maven { url "https://jitpack.io" }
...
}
}
```
2. module下添加gradle依赖
```
implementation 'com.github.chenzhenlindx:ACProgressLite:1.2.2'
```

## 示例代码
* 花瓣类型
Expand Down
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,17 @@ Similar to iOS [MBProgressHUD](https://github.com/jdg/MBProgressHUD)
* 1.2.1

## Usage
* gradle: `compile 'cc.cloudist.acplibrary:library:1.2.1'`
```
allprojects {
repositories {
maven { url "https://jitpack.io" }
...
}
}
```
```
implementation 'com.github.chenzhenlindx:ACProgressLite:1.2.2'
```

## Sample Code
* Flower
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

buildscript {
repositories {
google()
jcenter()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.github.dcendents:android-maven-plugin:1.2'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -18,6 +19,7 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Wed Oct 10 08:43:27 CST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = "1.2.1"

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion '28.0.2'

defaultConfig {
minSdkVersion 9
Expand All @@ -23,7 +23,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])
}

//def siteUrl = 'https://github.com/Cloudist/ACProgressLite'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,13 @@ public void show() {
public void run() {
int result = mSpinCount % mBuilder.mPetalCount;
if (mBuilder.mDirection == ACProgressConstant.DIRECT_CLOCKWISE) {
mFlowerView.updateFocusIndex(result);
if (null != mFlowerView) {
mFlowerView.updateFocusIndex(result);
}
} else {
mFlowerView.updateFocusIndex(mBuilder.mPetalCount - 1 - result);
if (null != mFlowerView) {
mFlowerView.updateFocusIndex(mBuilder.mPetalCount - 1 - result);
}
}
if (result == 0) {
mSpinCount = 1;
Expand Down
6 changes: 3 additions & 3 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion '28.0.2'

defaultConfig {
applicationId "cc.cloudist.acpsample"
Expand All @@ -20,6 +20,6 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':library')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':library')
}