Skip to content

Commit

Permalink
update library
Browse files Browse the repository at this point in the history
  • Loading branch information
YiuChoi committed Oct 19, 2016
1 parent b380324 commit 143a4e7
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 248 deletions.
229 changes: 0 additions & 229 deletions .idea/codeStyleSettings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

3 changes: 2 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'com.neenbedankt.android-apt'

android {
compileSdkVersion 24
buildToolsVersion '24.0.2'
buildToolsVersion '24.0.3'
repositories {
maven { url "https://jitpack.io" }
}
Expand Down Expand Up @@ -60,7 +60,7 @@ dependencies {
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.google.code.gson:gson:2.7'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'io.reactivex:rxjava:1.1.9'
compile 'io.reactivex:rxjava:1.2.1'
compile 'io.reactivex:rxandroid:1.2.1'
compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
Expand All @@ -69,8 +69,8 @@ dependencies {
exclude module: 'stax-api'
exclude module: 'xpp3'
}
compile 'com.jakewharton:butterknife:8.2.1'
apt 'com.jakewharton:butterknife-compiler:8.2.1'
compile 'com.jakewharton:butterknife:8.4.0'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.bugtags.library:bugtags-lib:latest.integration'
compile 'com.umeng.analytics:analytics:latest.integration'
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/assets/info.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//判断图片是否加载完成
//?ж????????????
function IsImageLoaded()
{
var img=event.srcElement;
Expand All @@ -14,14 +14,14 @@
{
if(img.complete)
{
//ios 浏览图片使用
//ios ????????
var imagesrc = img.attributes['originsrc'].nodeValue;
//document.location = imagesrc.replace("http://","ruanmeipic://");
ProxyClickPicture.clickImg(imagesrc);
}
else
{
//未加载完成时,暂不放大图片,以后可以修改
//δ?????????????????????????????
//img.src = img.attributes['originsrc'].nodeValue;
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.2.1'
classpath 'com.bugtags.library:bugtags-gradle:latest.integration'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
// NOTE: Do not place your application dependencies here; they belong
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#Wed Sep 21 10:15:59 CST 2016
#Wed Oct 19 08:49:15 CST 2016
systemProp.http.proxyHost=127.0.0.1
systemProp.http.proxyPort=1081
systemProp.http.proxyPort=1080
4 changes: 2 additions & 2 deletions swipebackactivity/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion '24.0.2'
buildToolsVersion '24.0.3'

defaultConfig {
minSdkVersion 10
Expand All @@ -20,5 +20,5 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:appcompat-v7:24.2.1'
}

0 comments on commit 143a4e7

Please sign in to comment.