update to 1.3.0

kyoucr · Jan 13, 2015 · 59c6213 · 59c6213
1 parent 85def15
commit 59c6213
Show file tree

Hide file tree

Showing 23 changed files with 182 additions and 296 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2013 Peng fei Pan <sky@xiaopan.me>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
diff --git a/README.md b/README.md
diff --git a/docs/device-2014-10-22-004320.png b/docs/device-2014-10-22-004320.png
diff --git a/docs/device-2014-10-22-004345.png b/docs/device-2014-10-22-004345.png
diff --git a/docs/device-2014-10-22-004413.png b/docs/device-2014-10-22-004413.png
diff --git a/docs/device-2014-10-22-004432.png b/docs/device-2014-10-22-004432.png
diff --git a/docs/device-2015-01-13-235248.png b/docs/device-2015-01-13-235248.png
diff --git a/docs/device-2015-01-13-235325.png b/docs/device-2015-01-13-235325.png
diff --git a/docs/device-2015-01-13-235423.png b/docs/device-2015-01-13-235423.png
diff --git a/docs/device-2015-01-13-235803.png b/docs/device-2015-01-13-235803.png
diff --git a/docs/sampe_debug_mode.jpeg b/docs/sampe_debug_mode.jpeg
diff --git a/docs/sample.jpg b/docs/sample.jpg
diff --git a/releases/SpearSample-2.4.1.apk b/releases/SpearSample-2.4.1.apk
diff --git a/releases/SpearSample-2.5.0.apk b/releases/SpearSample-2.5.0.apk
diff --git a/releases/sample_apk_download_url.png b/releases/sample_apk_download_url.png
diff --git a/releases/spear-1.2.0-sources.zip b/releases/spear-1.2.0-sources.zip
diff --git a/releases/spear-1.2.0.jar b/releases/spear-1.2.0.jar
diff --git a/releases/spear-1.3.0-sources.zip b/releases/spear-1.3.0-sources.zip
diff --git a/releases/spear-1.3.0.jar b/releases/spear-1.3.0.jar
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,98 +1,37 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21    // 编译版本为API 21（Android 5.0 Lollipop）
-    buildToolsVersion "21.1.1"  // 构建工具使用21.1版的
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
-        applicationId "me.xiaoapn.android.imageloader"  // 默认的APP ID
-        minSdkVersion 9 // 最小版本为API 9（Android 2.3 Gingerbread）
-        targetSdkVersion 21 // 目标版本为API 21（Android 5.0 Lollipop）
-        versionCode 241 // 版本号
-        versionName "2.4.1" // 版本名称
+        applicationId "me.xiaoapn.android.imageloader"
+        minSdkVersion 9
+        targetSdkVersion 21
+        versionCode 251
+        versionName "2.5.1"
     }
 
-    signingConfigs {
-        // 默认的签名
-        defaultSigning {
-            keyAlias 'android-imageloader'
-            keyPassword 'u2gHWYjiaUB022VV'
-            storeFile file('/Users/xiaopan/Workspace/Spear/sample/SpearSample.jks')
-            storePassword 'u2gHWYjiaUB022VV'
-        }
-    }
-
-    // 配置构建类型，在原有基础上增加国内版和国外版
     buildTypes {
-        // 默认就有的
-        debug{
-
-        }
-
-        // 默认就有的
         release {
-            minifyEnabled false // 不开启proguard
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.defaultSigning
-        }
-
-        // 国内版
-        internal {
-            minifyEnabled false // 不开启proguard
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.defaultSigning
-            applicationIdSuffix '.internal' // 修改APP ID，在默认ID的基础上追加.internal
-        }
-
-        // 国外版
-        external {
-            minifyEnabled false // 不开启proguard
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.defaultSigning
-            applicationIdSuffix '.external' // 修改APP ID，在默认ID的基础上追加.external
         }
     }
 
-    // 配置不同的渠道标识
-    productFlavors{
-        AppChina{
-            manifestPlaceholders = [UMENG_CHANNEL:"AppChina"]
-        }
-
-        YignYongBao{
-            manifestPlaceholders = [UMENG_CHANNEL:"YignYongBao"]
-        }
-
-        WanDouJia{
-            manifestPlaceholders = [UMENG_CHANNEL:"WanDouJia"]
-        }
-
-        BaiDu{
-            manifestPlaceholders = [UMENG_CHANNEL:"BaiDu"]
-        }
-
-        GooglePlay{
-            manifestPlaceholders = [UMENG_CHANNEL:"GooglePlay"]
-        }
-
-        QihooAppStore{
-            manifestPlaceholders = [UMENG_CHANNEL:"QihooAppStore"]
-        }
+    lintOptions {
+        abortOnError false
     }
 }
 
-// 配置依赖
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
-    compile 'com.android.support:appcompat-v7:21.0.2'
-    compile 'com.android.support:cardview-v7:21.0.0'
-    compile 'com.android.support:palette-v7:21.0.0'
+    compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:recyclerview-v7:21.0.0'
     compile(name: 'pager-sliding-strip-1.5.1', ext: 'aar')
 }
 
-// 将libs目录作为仓库
 repositories{
     flatDir{
         dirs 'libs'

diff --git a/sample/sample.iml b/sample/sample.iml
@@ -8,12 +8,12 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="AppChinaDebug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleAppChinaDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileAppChinaDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleAppChinaDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateAppChinaDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateAppChinaDebugTestSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,42 +23,21 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/AppChina/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/AppChina/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/AppChina/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/AppChina/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/AppChina/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/AppChina/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/AppChina/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChinaDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChinaDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChinaDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChinaDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChinaDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChinaDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChinaDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/AppChina/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/AppChina/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/AppChina/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/AppChina/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/AppChina/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/AppChina/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChina/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChina/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChina/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChina/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChina/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChina/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/AppChina/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAppChina/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAppChina/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAppChina/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAppChina/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAppChina/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAppChina/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestAppChina/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -104,18 +83,16 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="cardview-v7-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="pager-sliding-strip-1.5.1-" level="project" />
     <orderEntry type="library" exported="" name="photo-view" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
     <orderEntry type="library" exported="" name="android-happy-inject-1.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="android-pull-refresh-layout-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="go-http-1.1.3" level="project" />
-    <orderEntry type="library" exported="" name="palette-v7-21.0.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
     <orderEntry type="module" module-name="library" exported="" />
   </component>
 </module>

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -20,12 +20,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="me.xiaopan.android.spear.sample.activity.PhotoAlbumActivity" android:label="@string/app_name"/>
         <activity android:name="me.xiaopan.android.spear.sample.activity.DetailActivity" android:label="@string/app_name"/>
         <activity android:name="me.xiaopan.android.spear.sample.activity.StarHomeActivity" android:label="@string/app_name"/>
-        <activity android:name="me.xiaopan.android.spear.sample.activity.SearchActivity" android:label="@string/app_name"/>
-        <activity android:name="me.xiaopan.android.spear.sample.activity.IndexActivity" android:label="@string/app_name"/>
-
-        <meta-data android:name="UMENG_CHANNEL" android:value="${UMENG_CHANNEL}"/>
     </application>
 </manifest>
diff --git a/待办.txt b/待办.txt