Merge branch 'v1.2.2-pre'

Author: KingJA

.idea/misc.xml

@@ -230,7 +230,11 @@ placeholder效果状态页类似[ShimmerRecyclerView](https://github.com/sharish
 * :point_right: [常见问题](docs/FAQ-cn.md)
 * 📌 [更新日志](docs/changelog.md)
 * [最佳实践](docs/BestPractice-cn.md)
+<<<<<<< HEAD
 * [下个版本开发计划](docs/NextVersion.md)
+=======
+* [Next Version](docs/NextVersion.md)
+>>>>>>> v1.2.2-pre
 
 ## 代码混淆
 

README-cn.md

@@ -230,7 +230,11 @@ amazing. :ghost:
 * :point_right: [FAQ](docs/FAQ.md)
 * 📌 [Versions](docs/changelog.md)
 * [Best Practice](docs/BestPractice.md)
+<<<<<<< HEAD
 * [What Next Version Will Include?](docs/NextVersion.md)
+=======
+* [What Will Next Version Include?](docs/NextVersion.md)
+>>>>>>> v1.2.2-pre
 
 ## ProGuard
 

README.md

@@ -33,4 +33,9 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
     compile project(':loadsir')
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    /*ButterKnife*/
+    compile 'com.jakewharton:butterknife:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }

app/build.gradle

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="sample.kingja.loadsir">
 
     <application
@@ -9,13 +10,18 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:label">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+<<<<<<< HEAD
+=======
+
+>>>>>>> v1.2.2-pre
         </activity>
         <activity android:name=".target.NormalActivity"/>
         <activity android:name=".target.ConvertorActivity"/>
@@ -24,6 +30,8 @@
         <activity android:name=".target.MultiFragmentWithViewPagerActivity"/>
         <activity android:name=".target.MultiFragmentActivity"/>
         <activity android:name=".target.PlaceholderActivity"/>
+        <activity android:name=".target.AnimateActivity"/>
+        <activity android:name=".target.KeepTitleActivity"/>
     </application>
 
 </manifest>

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.kingja.loadsir.core.LoadSir;
+import com.squareup.leakcanary.LeakCanary;
 
 import sample.kingja.loadsir.callback.CustomCallback;
 import sample.kingja.loadsir.callback.EmptyCallback;
@@ -21,6 +22,8 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        if (setupLeakCanary()) return;
+
         LoadSir.beginBuilder()
                 .addCallback(new ErrorCallback())
                 .addCallback(new EmptyCallback())
@@ -30,4 +33,14 @@ public void onCreate() {
                 .setDefaultCallback(LoadingCallback.class)
                 .commit();
     }
+
+    private boolean setupLeakCanary() {
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return true;
+        }
+        LeakCanary.install(this);
+        return false;
+    }
 }

app/src/main/java/sample/kingja/loadsir/App.java

@@ -5,6 +5,8 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import sample.kingja.loadsir.target.AnimateActivity;
+import sample.kingja.loadsir.target.KeepTitleActivity;
 import sample.kingja.loadsir.target.MultiFragmentActivity;
 import sample.kingja.loadsir.target.FragmentSingleActivity;
 import sample.kingja.loadsir.target.NormalActivity;
@@ -41,19 +43,27 @@ public void inFragment(View view) {
     }
 
     public void inView(View view) {
-        startActivity(new Intent(this,ViewTargetActivity.class));
+        startActivity(new Intent(this, ViewTargetActivity.class));
     }
 
     public void inFragmentViewSirPager(View view) {
-        startActivity(new Intent(this,MultiFragmentWithViewPagerActivity.class));
+        startActivity(new Intent(this, MultiFragmentWithViewPagerActivity.class));
     }
 
 
     public void inFragmentMutil(View view) {
-        startActivity(new Intent(this,MultiFragmentActivity.class));
+        startActivity(new Intent(this, MultiFragmentActivity.class));
     }
 
     public void showPlaceholder(View view) {
-        startActivity(new Intent(this,PlaceholderActivity.class));
+        startActivity(new Intent(this, PlaceholderActivity.class));
+    }
+
+    public void animatCallback(View view) {
+        startActivity(new Intent(this, AnimateActivity.class));
+    }
+
+    public void titleBarActivity(View view) {
+        startActivity(new Intent(this, KeepTitleActivity.class));
     }
 }

app/src/main/java/sample/kingja/loadsir/MainActivity.java

@@ -1,6 +1,7 @@
 package sample.kingja.loadsir;
 
 import android.os.Handler;
+import android.os.Looper;
 
 import com.kingja.loadsir.callback.Callback;
 import com.kingja.loadsir.core.LoadService;
@@ -15,20 +16,25 @@ public class PostUtil {
     public static final int DELAY_TIME = 1000;
 
     public static void postCallbackDelayed(final LoadService loadService, final Class<? extends Callback> clazz) {
-        new Handler().postDelayed(new Runnable() {
+        postCallbackDelayed(loadService, clazz, DELAY_TIME);
+    }
+
+    public static void postCallbackDelayed(final LoadService loadService, final Class<? extends Callback> clazz, long
+            delay) {
+        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
             @Override
             public void run() {
                 loadService.showCallback(clazz);
             }
-        }, DELAY_TIME);
+        }, delay);
     }
 
     public static void postSuccessDelayed(final LoadService loadService) {
         postSuccessDelayed(loadService, DELAY_TIME);
     }
 
     public static void postSuccessDelayed(final LoadService loadService, long delay) {
-        new Handler().postDelayed(new Runnable() {
+        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
             @Override
             public void run() {
                 loadService.showSuccess();

app/src/main/java/sample/kingja/loadsir/PostUtil.java

@@ -0,0 +1,62 @@
+package sample.kingja.loadsir.callback;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
+import android.widget.Toast;
+
+import com.kingja.loadsir.callback.Callback;
+
+import sample.kingja.loadsir.R;
+
+import static android.content.ContentValues.TAG;
+
+/**
+ * Description:TODO
+ * Create Time:2017/9/3 10:22
+ * Author:KingJA
+ * Email:kingjavip@gmail.com
+ */
+public class AnimateCallback extends Callback {
+
+    private Context context;
+    private View animateView;
+
+    @Override
+    protected int onCreateView() {
+        return R.layout.layout_animate;
+    }
+
+    @Override
+    protected void onViewCreate(Context context, View view) {
+        super.onViewCreate(context, view);
+        Log.e(TAG, "onViewCreate: ");
+    }
+
+    @Override
+    public void onAttach(Context context, View view) {
+        super.onAttach(context, view);
+        this.context = context;
+        animateView = view.findViewById(R.id.view_animate);
+        Animation animation = new RotateAnimation(0, 359, Animation.RELATIVE_TO_SELF,
+                0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
+        animation.setDuration(1000);
+        animation.setRepeatCount(Integer.MAX_VALUE);
+        animation.setFillAfter(true);
+        animation.setInterpolator(new LinearInterpolator());
+        animateView.startAnimation(animation);
+        Toast.makeText(context.getApplicationContext(), "start animation", Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        if (animateView != null) {
+            animateView.clearAnimation();
+        }
+        Toast.makeText(context.getApplicationContext(), "stop animation", Toast.LENGTH_SHORT).show();
+    }
+}

app/src/main/java/sample/kingja/loadsir/callback/AnimateCallback.java

@@ -17,4 +17,5 @@ public class EmptyCallback extends Callback {
     protected int onCreateView() {
         return R.layout.layout_empty;
     }
+
 }