Modified hot fragment, add loadingview

Author: code4a

README.md

@@ -6,6 +6,7 @@
 * 新增bugly的bug上报和应用更新！通过JbuglyManger修改appid和appkey 并初始化bugly
 * 添加支持设置系统状态栏颜色，兼容Android 4.4.2(API 19)以上
 * library 加入Butterknife 8.4.0 提供注解支持
+* 新增LoadingDrawable加载动画，具体用法可参考[dinuscxj的README](https://github.com/dinuscxj/LoadingDrawable/blob/master/README.md)
 
 ##### 使用CrashHandler收集crash日志，并重启应用
 
@@ -95,7 +96,7 @@
 #### Gradle
 ```
 dependencies {
-  compile 'com.code4a:jlibrary:1.0.6'
+  compile 'com.code4a:jlibrary:1.0.7'
 }
 ```
 
@@ -104,7 +105,7 @@ dependencies {
 <dependency>
   <groupId>com.code4a</groupId>
   <artifactId>jlibrary</artifactId>
-  <version>1.0.6</version>
+  <version>1.0.7</version>
   <type>pom</type>
 </dependency>
 ```
@@ -117,6 +118,7 @@ This project use this libraries ~ Thanks to them.
   [Gson](https://github.com/google/gson)  <br>
   [Bugly](https://github.com/BuglyDevTeam/Bugly-Android-Demo)  <br>
   [status-bar-compat](https://github.com/msdx/status-bar-compat)  <br>
+  [LoadingDrawable](https://github.com/dinuscxj/LoadingDrawable)  <br>
 
 
 License

app/src/main/java/com/code4a/jlibrarydemo/JLibraryApp.java

@@ -16,7 +16,7 @@ public class JLibraryApp extends Application {
 
     private static JLibraryApp mApp;
 
-    public static String currentGirl = "http://ww2.sinaimg.cn/large/610dc034jw1f5k1k4azguj20u00u0421.jpg";
+    public static String currentGirl = "http://ww4.sinaimg.cn/large/610dc034jw1fbeerrs7aqj20u011htec.jpg";
 
     @Override
     public void onCreate() {

app/src/main/java/com/code4a/jlibrarydemo/home/frag/home/two/girls/GirlsFragment.java

@@ -37,7 +37,7 @@ public class GirlsFragment extends BaseFragment implements GirlsView, SwipeRefre
     private GirlsAdapter mAdapter;
 
     private GirlsPresenter mPresenter;
-    private int page = 1;
+    private int page = 20;
     private int size = 20;
 
 //    private Unbinder unbinder;

app/src/main/java/com/code4a/jlibrarydemo/home/frag/hot/HotFragment.java

@@ -7,6 +7,7 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.code4a.jlibrary.loading.LoadingView;
 import com.code4a.jlibrarydemo.R;
 import com.code4a.jlibrarydemo.data.GirlsBean;
 import com.code4a.jlibrarydemo.home.frag.HomeBaseFragment;
@@ -19,13 +20,16 @@
 import butterknife.BindViews;
 
 
-public class HotFragment extends HomeBaseFragment implements HotView{
+public class HotFragment extends HomeBaseFragment implements HotView {
 
     @BindView(R.id.mLoopRotarySwitchView)
     LoopRotarySwitchView mLoopRotarySwitchView;
     @BindView(R.id.current_hot_name)
     TextView hotName;
 
+    @BindView(R.id.collision_loadingview)
+    LoadingView mLoadView;
+
     @BindViews({R.id.hot_movie1, R.id.hot_movie2, R.id.hot_movie3, R.id.hot_movie4, R.id.hot_movie5, R.id.hot_movie6})
     List<ImageView> imageViews;
 
@@ -37,19 +41,21 @@ protected void initView(View view, Bundle savedInstanceState) {
 
         mHotPresenter = new HotPresenterImpl(this);
 
-        mLoopRotarySwitchView.setR(700);
+        mLoopRotarySwitchView.setR(650);
         mLoopRotarySwitchView.setOnItemSelectedListener(new OnItemSelectedListener() {
             @Override
             public void selected(int item, View view) {
                 hotName.setText("当前第" + item + "页");
             }
         });
+
+        loadDefaultImg();
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        mHotPresenter.start(1, imageViews.size());
+        mHotPresenter.start(imageViews.size(), imageViews.size());
     }
 
     @Override
@@ -63,9 +69,19 @@ protected int getLayoutId() {
         return R.layout.fragment_hot;
     }
 
+    @Override
+    public void showLoadingView() {
+        mLoadView.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void hideLoadingView() {
+        mLoadView.setVisibility(View.GONE);
+    }
+
     @Override
     public void showGirl(List<GirlsBean.ResultsEntity> datas) {
-        for (int i = 0; i< imageViews.size(); i++){
+        for (int i = 0; i < imageViews.size(); i++) {
             Glide.with(getActivity())
                     .load(datas.get(i).getUrl())
                     .into(imageViews.get(i));
@@ -74,9 +90,13 @@ public void showGirl(List<GirlsBean.ResultsEntity> datas) {
 
     @Override
     public void showGirl() {
-        for (int i = 0; i< imageViews.size(); i++){
+        loadDefaultImg();
+    }
+
+    private void loadDefaultImg() {
+        for (int i = 0; i < imageViews.size(); i++) {
             Glide.with(getActivity())
-                    .load(R.drawable.login_bg)
+                    .load(R.drawable.default_error)
                     .diskCacheStrategy(DiskCacheStrategy.SOURCE)
                     .into(imageViews.get(i));
         }

app/src/main/java/com/code4a/jlibrarydemo/home/frag/hot/HotPresenterImpl.java

@@ -19,15 +19,18 @@ protected HotPresenterImpl(HotView view) {
 
     @Override
     public void start(int page, int size) {
+        getView().showLoadingView();
         girlsCommonInteractor.getRes(page, size, new GirlsCommonInteractor.LoadSplashResListener() {
             @Override
             public void onResLoaded(GirlsBean girlsBean) {
                 getView().showGirl(girlsBean.getResults());
+                getView().hideLoadingView();
             }
 
             @Override
             public void onDataNotAvailable() {
                 getView().showGirl();
+                getView().hideLoadingView();
             }
         });
     }

app/src/main/java/com/code4a/jlibrarydemo/home/frag/hot/HotView.java

@@ -11,6 +11,10 @@
 
 public interface HotView extends BasePresenterView {
 
+    void showLoadingView();
+
+    void hideLoadingView();
+
     void showGirl(List<GirlsBean.ResultsEntity> datas);
 
     void showGirl();

app/src/main/res/drawable/default_error.jpg

@@ -1,70 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/light_gray"
-    android:orientation="vertical">
+    android:background="@color/light_gray">
 
-    <include layout="@layout/fragment_toolbar" />
+    <include
+        android:id="@+id/hot_toolbar"
+        layout="@layout/fragment_toolbar" />
 
     <com.dalong.library.view.LoopRotarySwitchView
         android:id="@+id/mLoopRotarySwitchView"
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:paddingTop="20dp"
+        android:layout_below="@id/hot_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="10dp"
         android:paddingBottom="20dp"
-        android:layout_weight="1"
         android:gravity="center"
         app:direction="right">
 
         <ImageView
             android:id="@+id/hot_movie1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="fitCenter"/>
+            android:scaleType="center"/>
 
         <ImageView
             android:id="@+id/hot_movie2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="fitCenter" />
+            android:scaleType="center" />
 
         <ImageView
             android:id="@+id/hot_movie3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="fitCenter" />
+            android:scaleType="center" />
 
         <ImageView
             android:id="@+id/hot_movie4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="fitCenter" />
+            android:scaleType="center" />
 
         <ImageView
             android:id="@+id/hot_movie5"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="fitCenter" />
+            android:scaleType="center" />
 
         <ImageView
             android:id="@+id/hot_movie6"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="fitCenter" />
+            android:scaleType="center" />
     </com.dalong.library.view.LoopRotarySwitchView>
 
     <TextView
         android:id="@+id/current_hot_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|bottom"
-        android:layout_marginBottom="30dp"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="25dp"
         android:gravity="center"
         android:lineSpacingMultiplier="1.2"
         android:text="@string/app_name"
-        android:textColor="@color/white"
+        android:textColor="@color/colorToolBar"
         android:textSize="18sp" />
 
-</LinearLayout>
+    <com.code4a.jlibrary.loading.LoadingView
+        android:id="@+id/collision_loadingview"
+        android:layout_width="120dp"
+        android:layout_height="160dp"
+        android:layout_centerInParent="true"
+        android:background="@color/transparent"
+        app:loading_renderer="CollisionLoadingRenderer" />
+
+</RelativeLayout>

app/src/main/res/layout/fragment_hot.xml

@@ -8,7 +8,8 @@
         android:id="@+id/splash"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"/>
+        android:src="@drawable/default_error"
+        android:scaleType="center"/>
 
     <TextView
         android:id="@+id/splash_msg"

app/src/main/res/layout/fragment_splash.xml

@@ -13,6 +13,7 @@
     <color name="font_bar_color">#3F51B5</color>
     <color name="font_white">#FFFFFF</color>
     <color name="main_color">#5CB85C</color>
+    <color name="transparent">#00000000</color>
 
     <color name="swipe_background_color">#ffffff</color>
 </resources>

app/src/main/res/values/colors.xml

@@ -45,7 +45,7 @@ ext{
     siteUrl = 'https://github.com/code4a/JLibraryDemo'
     gitUrl = 'https://github.com/code4a/JLibraryDemo.git'
 
-    libraryVersion = '1.0.6'
+    libraryVersion = '1.0.7'
 
     developerId = 'code4a'
     developerName = 'code4a'

jlibrary/build.gradle

@@ -0,0 +1,11 @@
+package com.code4a.jlibrary.loading;
+
+import android.content.Context;
+
+public class DensityUtil {
+
+    public static float dip2px(Context context, float dpValue) {
+        float scale = context.getResources().getDisplayMetrics().density;
+        return dpValue * scale;
+    }  
+}

jlibrary/src/main/java/com/code4a/jlibrary/loading/DensityUtil.java

@@ -0,0 +1,79 @@
+package com.code4a.jlibrary.loading;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.code4a.jlibrary.R;
+import com.code4a.jlibrary.loading.render.LoadingDrawable;
+import com.code4a.jlibrary.loading.render.LoadingRenderer;
+import com.code4a.jlibrary.loading.render.LoadingRendererFactory;
+
+
+public class LoadingView extends ImageView {
+    private LoadingDrawable mLoadingDrawable;
+
+    public LoadingView(Context context) {
+        super(context);
+    }
+
+    public LoadingView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initAttrs(context, attrs);
+    }
+
+    private void initAttrs(Context context, AttributeSet attrs) {
+        try {
+            TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.LoadingView);
+            int loadingRendererId = ta.getInt(R.styleable.LoadingView_loading_renderer, 0);
+            LoadingRenderer loadingRenderer = LoadingRendererFactory.createLoadingRenderer(context, loadingRendererId);
+            setLoadingRenderer(loadingRenderer);
+            ta.recycle();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setLoadingRenderer(LoadingRenderer loadingRenderer) {
+        mLoadingDrawable = new LoadingDrawable(loadingRenderer);
+        setImageDrawable(mLoadingDrawable);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        startAnimation();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        stopAnimation();
+    }
+
+    @Override
+    protected void onVisibilityChanged(View changedView, int visibility) {
+        super.onVisibilityChanged(changedView, visibility);
+
+        final boolean visible = visibility == VISIBLE && getVisibility() == VISIBLE;
+        if (visible) {
+            startAnimation();
+        } else {
+            stopAnimation();
+        }
+    }
+
+    private void startAnimation() {
+        if (mLoadingDrawable != null) {
+            mLoadingDrawable.start();
+        }
+    }
+
+    private void stopAnimation() {
+        if (mLoadingDrawable != null) {
+            mLoadingDrawable.stop();
+        }
+    }
+}