diff --git a/app/app-release.apk b/app/app-release.apk index 941adc4..19a2c19 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/build.gradle b/app/build.gradle index bb11ab6..a97f164 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,13 @@ apply plugin: 'com.android.application' android { + signingConfigs { + release { + keyAlias 'weather_go' + keyPassword 'captainhuang1234' + storeFile file('E:/Android/release/weather_go.jks') + storePassword 'captainhuang1234' + } + } configurations.all { resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9' } @@ -17,13 +25,11 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } } dependencies { - - - compile fileTree(include: ['*.jar'], dir: 'libs') androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' @@ -39,38 +45,29 @@ dependencies { compile 'io.reactivex:rxandroid:1.1.0' compile 'com.tbruyelle.rxpermissions:rxpermissions:0.7.0@aar' compile 'com.trello:rxlifecycle:1.0' - -// If you want to bind to Android-specific lifecycles + // If you want to bind to Android-specific lifecycles compile 'com.trello:rxlifecycle-android:1.0' - -// If you want pre-written Activities and Fragments you can subclass as providers + // If you want pre-written Activities and Fragments you can subclass as providers compile 'com.trello:rxlifecycle-components:1.0' - -// If you want to use Navi for providers + // If you want to use Navi for providers compile 'com.trello:rxlifecycle-navi:1.0' - -// If you want to use Kotlin syntax + // If you want to use Kotlin syntax compile 'com.trello:rxlifecycle-kotlin:1.0' - // network compile 'com.google.code.gson:gson:2.4' // Retrofit & OkHttp compile 'com.squareup.retrofit2:retrofit:2.2.0' compile 'com.squareup.retrofit2:converter-gson:2.2.0' compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2' - compile 'com.squareup.okhttp3:okhttp:3.0.1' compile 'com.squareup.okhttp3:logging-interceptor:3.2.0' - compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar' //butterknife http://jakewharton.github.io/butterknife/ compile 'com.jakewharton:butterknife:8.5.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' - debugCompile 'com.github.moduth:blockcanary-android:1.2.1' releaseCompile 'com.github.moduth:blockcanary-no-op:1.2.1' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2' releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2' - } diff --git a/app/src/main/res/data/china_city.db b/app/src/main/res/data/china_city.db deleted file mode 100644 index 4e11872..0000000 Binary files a/app/src/main/res/data/china_city.db and /dev/null differ diff --git a/app/src/main/res/layout/main_weather.xml b/app/src/main/res/layout/main_weather.xml index 1e688dd..273cee0 100644 --- a/app/src/main/res/layout/main_weather.xml +++ b/app/src/main/res/layout/main_weather.xml @@ -109,7 +109,7 @@ android:layout_width="240dp" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_below="@id/weather_info" + android:layout_margin="16dp" android:ems="10" android:hint="城市" @@ -120,7 +120,7 @@ android:id="@+id/hsh_search_weather" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/weather_info" + android:layout_toRightOf="@id/hsh_weather_city_editview" android:text="@string/weather" android:visibility="gone" />