修改部分模块http为https

android/src/main/java/com/ycbjie/android/base/AndroidApp.kt

@@ -1,5 +1,6 @@
 package com.ycbjie.android.base
 
+import android.content.Context
 import com.ycbjie.library.base.app.InitializeService
 import com.ycbjie.library.base.app.LibApplication
 import com.ycbjie.library.base.config.AppConfig
@@ -17,11 +18,10 @@ class AndroidApp : LibApplication() {
 
     override fun onCreate() {
         super.onCreate()
-        AppConfig.INSTANCE.initConfig(this)
-        //在子线程中初始化
-        InitializeService.start(this)
     }
 
-
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base)
+    }
 
 }

android/src/main/java/com/ycbjie/android/contract/AndroidContract.kt

@@ -3,3 +3,6 @@ package com.ycbjie.android.contract
 import com.ycbjie.android.view.activity.AndroidActivity
 import com.ycbjie.library.base.mvp.BaseActivity
 
+interface AndroidContract{
+
+}

android/src/main/java/com/ycbjie/android/network/RequestApi.kt

@@ -22,7 +22,7 @@ import retrofit2.http.Query
 interface RequestApi {
 
     companion object {
-        var HOST: String = "http://www.wanandroid.com/"
+        var HOST: String = "https://www.wanandroid.com/"
     }
 
     /**

android/src/main/java/com/ycbjie/android/view/activity/AndroidAboutActivity.kt

@@ -9,7 +9,7 @@ import com.blankj.utilcode.util.LogUtils
 import com.ycbjie.android.R
 import com.ycbjie.android.presenter.AndroidPresenter
 import com.ycbjie.library.base.mvp.BaseActivity
-import com.ycbjie.library.web.view.WebViewActivity
+import com.ycbjie.library.web.WebViewActivity
 import kotlinx.android.synthetic.main.activity_android_about.*
 import kotlinx.android.synthetic.main.base_android_bar.*
 

android/src/main/java/com/ycbjie/android/view/activity/AndroidActivity.kt

@@ -38,7 +38,7 @@ import com.ycbjie.library.base.adapter.BasePagerAdapter
 import com.ycbjie.library.base.mvp.BaseActivity
 import com.ycbjie.library.constant.Constant
 import com.ycbjie.library.model.entry.TabEntity
-import com.ycbjie.library.web.view.WebViewActivity
+import com.ycbjie.library.web.WebViewActivity
 import kotlinx.android.synthetic.main.base_android_bar.*
 import kotlinx.coroutines.*
 import java.lang.ref.WeakReference

android/src/main/java/com/ycbjie/android/view/activity/AndroidDetailActivity.kt

@@ -9,7 +9,7 @@ import com.ycbjie.android.base.KotlinConstant
 import com.ycbjie.android.contract.AndroidDetailContract
 import com.ycbjie.android.model.bean.HomeData
 import com.ycbjie.android.presenter.AndroidDetailPresenter
-import com.ycbjie.library.web.view.WebViewActivity
+import com.ycbjie.library.web.WebViewActivity
 
 
 /**

android/src/main/java/com/ycbjie/android/view/activity/AndroidLoginActivity.kt

@@ -9,7 +9,7 @@ import android.text.TextWatcher
 import android.view.View
 import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.SPUtils
-import com.pedaily.yc.ycdialoglib.loading.ViewLoading
+import com.pedaily.yc.ycdialoglib.dialog.loading.ViewLoading
 import com.pedaily.yc.ycdialoglib.toast.ToastUtils
 import com.ycbjie.android.R
 import com.ycbjie.android.base.KotlinConstant

android/src/main/java/com/ycbjie/android/view/activity/NavWebsiteActivity.kt

@@ -19,7 +19,7 @@ import cn.ycbjie.ycstatusbarlib.bar.StateAppBar
 import com.blankj.utilcode.util.LogUtils
 import com.ycbjie.android.R
 import com.ycbjie.library.base.mvp.BaseActivity
-import com.ycbjie.library.web.view.WebViewActivity
+import com.ycbjie.library.web.WebViewActivity
 import kotlinx.android.synthetic.main.activity_nav_website.*
 import com.ycbjie.android.network.SchedulerProvider
 import kotlinx.android.synthetic.main.base_android_bar.*

android/src/main/java/com/ycbjie/android/view/adapter/AndroidProjectAdapter.kt

@@ -10,7 +10,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.ycbjie.android.R
 import com.ycbjie.android.model.bean.HomeData
-import com.ycbjie.library.utils.image.ImageUtils
+import com.ycbjie.library.glide.ImageUtils
 import org.yczbj.ycrefreshviewlib.adapter.RecyclerArrayAdapter
 import org.yczbj.ycrefreshviewlib.viewHolder.BaseViewHolder
 

android/src/main/java/com/ycbjie/android/view/adapter/BannerPagerAdapter.kt

@@ -9,7 +9,7 @@ import android.widget.ImageView
 import com.ycbjie.android.model.bean.BannerBean
 import com.yc.cn.ycbannerlib.banner.adapter.AbsStaticPagerAdapter
 import com.ycbjie.android.R
-import com.ycbjie.library.utils.image.ImageUtils
+import com.ycbjie.library.glide.ImageUtils
 
 
 class BannerPagerAdapter constructor(private val ctx: Activity?, private val list: MutableList<BannerBean>) : AbsStaticPagerAdapter() {

android/src/main/java/com/ycbjie/android/view/fragment/AndroidHomeFragment.kt

@@ -26,7 +26,7 @@ import com.ycbjie.android.view.adapter.AndroidHomeAdapter
 import com.ycbjie.android.view.adapter.BannerPagerAdapter
 import com.ycbjie.library.base.mvp.BaseFragment
 import com.ycbjie.library.utils.DoShareUtils
-import com.ycbjie.library.web.view.WebViewActivity
+import com.ycbjie.library.web.WebViewActivity
 import org.yczbj.ycrefreshviewlib.YCRefreshView
 import org.yczbj.ycrefreshviewlib.adapter.RecyclerArrayAdapter
 import org.yczbj.ycrefreshviewlib.item.RecycleViewItemLine
@@ -64,7 +64,7 @@ class AndroidHomeFragment : BaseFragment<AndroidHomePresenter>() , AndroidHomeCo
         super.onAttach(context)
         //as 是一个中缀操作符，as是不安全的转换操作符，如果as转换失败，会抛出一个异常，这就是不安全的。
         activity = context as AndroidActivity?
-        //activity = context as? Activity
+        //activity_test = context as? Activity
     }
 
     override fun onDetach() {

android/src/main/java/com/ycbjie/android/view/fragment/AndroidProfileFragment.kt

@@ -17,7 +17,7 @@ import com.ycbjie.android.view.activity.AndroidCollectActivity
 import com.ycbjie.android.view.activity.AndroidLoginActivity
 import com.ycbjie.library.base.mvp.BaseLazyFragment
 import com.ycbjie.library.constant.Constant
-import com.ycbjie.library.web.view.WebViewActivity
+import com.ycbjie.library.web.WebViewActivity
 import kotlinx.android.synthetic.main.fragment_android_profile.*
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.GlobalScope

android/src/main/res/layout/base_tab_layout.xml

@@ -7,6 +7,7 @@
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_behavior="com.ycbjie.library.weight.AppBarLayoutBehavior"
         android:background="@color/colorTheme">
 
         <android.support.v7.widget.Toolbar

app/src/main/java/com/ns/yc/lifehelper/base/adapter/BaseBannerPagerAdapter.java

@@ -7,7 +7,7 @@
 import android.widget.ImageView;
 
 import com.ns.yc.lifehelper.R;
-import com.ycbjie.library.utils.image.ImageUtils;
+import com.ycbjie.library.glide.ImageUtils;
 import com.yc.cn.ycbannerlib.banner.adapter.AbsStaticPagerAdapter;
 
 import java.util.List;

app/src/main/java/com/ns/yc/lifehelper/model/bean/ImageIconBean.java → app/src/main/java/com/ns/yc/lifehelper/bean/ImageIconBean.java

@@ -1,4 +1,4 @@
-package com.ns.yc.lifehelper.model.bean;
+package com.ns.yc.lifehelper.bean;
 
 import java.io.Serializable;
 

app/src/main/java/com/ns/yc/lifehelper/model/bean/ItemEntity.java → app/src/main/java/com/ns/yc/lifehelper/bean/ItemEntity.java

@@ -1,4 +1,4 @@
-package com.ns.yc.lifehelper.model.bean;
+package com.ns.yc.lifehelper.bean;
 
 import org.json.JSONObject;
 

app/src/main/java/com/ns/yc/lifehelper/model/bean/SelectPoint.java → app/src/main/java/com/ns/yc/lifehelper/bean/SelectPoint.java

@@ -1,4 +1,4 @@
-package com.ns.yc.lifehelper.model.bean;
+package com.ns.yc.lifehelper.bean;
 
 
 public class SelectPoint {

app/src/main/java/com/ns/yc/lifehelper/ui/data/contract/DataFragmentContract.java

@@ -1,7 +1,7 @@
 package com.ns.yc.lifehelper.ui.data.contract;
 
 
-import com.ns.yc.lifehelper.model.bean.ImageIconBean;
+import com.ns.yc.lifehelper.bean.ImageIconBean;
 import com.ycbjie.library.base.mvp.BasePresenter;
 import com.ycbjie.library.base.mvp.BaseView;
 

app/src/main/java/com/ns/yc/lifehelper/ui/data/presenter/DataFragmentPresenter.java

@@ -4,7 +4,7 @@
 
 import com.blankj.utilcode.util.Utils;
 import com.ns.yc.lifehelper.R;
-import com.ns.yc.lifehelper.model.bean.ImageIconBean;
+import com.ns.yc.lifehelper.bean.ImageIconBean;
 import com.ns.yc.lifehelper.ui.data.contract.DataFragmentContract;
 
 import java.util.ArrayList;

app/src/main/java/com/ns/yc/lifehelper/ui/data/view/adapter/ViewPagerGridAdapter.java

@@ -8,7 +8,7 @@
 import android.widget.TextView;
 
 import com.ns.yc.lifehelper.R;
-import com.ns.yc.lifehelper.model.bean.ImageIconBean;
+import com.ns.yc.lifehelper.bean.ImageIconBean;
 
 import java.util.List;
 

app/src/main/java/com/ns/yc/lifehelper/ui/data/view/fragment/DataFragment.java

@@ -9,6 +9,8 @@
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.GridView;
 import android.widget.ImageView;
@@ -19,18 +21,19 @@
 import com.blankj.utilcode.util.SizeUtils;
 import com.ns.yc.lifehelper.R;
 import com.ns.yc.lifehelper.base.adapter.BaseViewPagerRollAdapter;
-import com.ns.yc.lifehelper.model.bean.ImageIconBean;
+import com.ns.yc.lifehelper.bean.ImageIconBean;
 import com.ns.yc.lifehelper.ui.data.contract.DataFragmentContract;
 import com.ns.yc.lifehelper.ui.data.presenter.DataFragmentPresenter;
 import com.ns.yc.lifehelper.ui.data.view.adapter.DataToolAdapter;
 import com.ns.yc.lifehelper.ui.data.view.adapter.NarrowImageAdapter;
 import com.ns.yc.lifehelper.ui.data.view.adapter.ViewPagerGridAdapter;
 import com.ns.yc.lifehelper.ui.main.view.MainActivity;
-import com.ns.yc.lifehelper.weight.MyGridView;
+import com.yc.cn.ycbannerlib.snap.ScrollPageHelper;
 import com.ycbjie.library.arounter.ARouterConstant;
 import com.ycbjie.library.arounter.ARouterUtils;
 import com.ycbjie.library.base.mvp.BaseFragment;
 import com.ycbjie.library.constant.Constant;
+import com.ycbjie.library.weight.MyGridView;
 
 import org.yczbj.ycrefreshviewlib.YCRefreshView;
 import org.yczbj.ycrefreshviewlib.item.SpaceViewItemLine;
@@ -286,30 +289,29 @@ public void setRecycleView(final ArrayList<Integer> list) {
         mRecyclerView.setHorizontalScrollBarEnabled(false);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(
                 activity, LinearLayoutManager.HORIZONTAL, false));
-        //ScrollPageHelper snapHelper = new ScrollPageHelper(Gravity.START,false);
-        //snapHelper.attachToRecyclerView(mRecyclerView.getRecyclerView());
+        ScrollPageHelper snapHelper = new ScrollPageHelper(Gravity.START,false);
+        try {
+            //attachToRecyclerView源码上的方法可能会抛出IllegalStateException异常，这里手动捕获一下
+            RecyclerView.OnFlingListener onFlingListener = mRecyclerView.getRecyclerView().getOnFlingListener();
+            //源码中判断了，如果onFlingListener已经存在的话，再次设置就直接抛出异常，那么这里可以判断一下
+            if (onFlingListener==null){
+                snapHelper.attachToRecyclerView(mRecyclerView.getRecyclerView());
+            }
+        } catch (IllegalStateException e){
+            e.printStackTrace();
+        }
         mRecyclerView.addItemDecoration(new SpaceViewItemLine(SizeUtils.dp2px(8)));
         mRecyclerView.setRefreshListener(() -> {
             adapter.clear();
             adapter.addAll(list);
         });
         adapter.addAll(list);
         adapter.setOnItemClickListener(position -> {
-            //ToastUtils.showToast(position + "被点击呢");
             ARouterUtils.navigation(ARouterConstant.ACTIVITY_OTHER_GALLERY_ACTIVITY);
         });
-        mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-                super.onScrollStateChanged(recyclerView, newState);
-            }
+    }
+
 
-            @Override
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                super.onScrolled(recyclerView, dx, dy);
 
-            }
-        });
-    }
 
 }

app/src/main/java/com/ns/yc/lifehelper/ui/find/presenter/FindFragmentPresenter.java

@@ -21,7 +21,7 @@
 import com.ycbjie.library.model.HomeBlogEntity;
 import com.ns.yc.lifehelper.ui.find.contract.FindFragmentContract;
 import com.ns.yc.lifehelper.ui.main.view.MainActivity;
-import com.ycbjie.library.utils.image.ImageUtils;
+import com.ycbjie.library.glide.ImageUtils;
 import com.yc.cn.ycbannerlib.banner.BannerView;
 import com.yc.cn.ycbannerlib.marquee.MarqueeView;
 import com.yc.cn.ycbaseadapterlib.adapter.BaseViewHolder;
@@ -219,7 +219,7 @@ public BaseDelegateAdapter initList2() {
         linearLayoutHelper.setDividerHeight(5);
         linearLayoutHelper.setMargin(0, 0, 0, 0);
         linearLayoutHelper.setPadding(0, 0, 0, 10);
-        return new BaseDelegateAdapter(activity, linearLayoutHelper, R.layout.item_gold_news_list, 3, Constant.viewType.typeNews) {
+        return new BaseDelegateAdapter(activity, linearLayoutHelper, R.layout.item_news_base_view, 3, Constant.viewType.typeNews) {
             @Override
             public void onBindViewHolder(@NonNull BaseViewHolder holder, @SuppressLint("RecyclerView") final int position) {
                 super.onBindViewHolder(holder, position);

app/src/main/java/com/ns/yc/lifehelper/ui/find/view/activity/MyVideoActivity.java

@@ -115,7 +115,7 @@ private void initViewPager() {
         pageCount = (int) Math.ceil(iconData.size()*1.0 / pageSize);
         for(int a=0 ; a<pageCount ; a++){
             final GridView gridView = (GridView) inflater.inflate(R.layout.item_vp_grid_view,vpPager,false);
-            GridView gv = (GridView) gridView.findViewById(R.id.gridView);
+            GridView gv = gridView.findViewById(R.id.gridView);
             gv.setNumColumns(5);
             gridView.setAdapter(new VideoGridAdapter(MyVideoActivity.this, iconData, a, pageSize));
             gridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {

app/src/main/java/com/ns/yc/lifehelper/ui/guide/contract/SelectFollowContract.java

@@ -5,7 +5,7 @@
 
 import com.ycbjie.library.base.mvp.BasePresenter;
 import com.ycbjie.library.base.mvp.BaseView;
-import com.ns.yc.lifehelper.model.bean.SelectPoint;
+import com.ns.yc.lifehelper.bean.SelectPoint;
 
 import java.util.List;
 

app/src/main/java/com/ns/yc/lifehelper/ui/guide/presenter/GuidePresenter.java

@@ -4,7 +4,7 @@
 
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.Utils;
-import com.ns.yc.lifehelper.model.bean.ItemEntity;
+import com.ns.yc.lifehelper.bean.ItemEntity;
 import com.ns.yc.lifehelper.ui.guide.contract.GuideContract;
 import com.ycbjie.library.api.ConstantImageApi;
 import com.ycbjie.library.base.config.AppConfig;

app/src/main/java/com/ns/yc/lifehelper/ui/guide/presenter/SelectFollowPresenter.java

@@ -3,7 +3,7 @@
 import android.app.Activity;
 
 import com.ns.yc.lifehelper.R;
-import com.ns.yc.lifehelper.model.bean.SelectPoint;
+import com.ns.yc.lifehelper.bean.SelectPoint;
 import com.ns.yc.lifehelper.ui.guide.contract.SelectFollowContract;
 
 import java.util.ArrayList;

app/src/main/java/com/ns/yc/lifehelper/ui/guide/view/activity/GuideActivity.java

@@ -13,7 +13,7 @@
 import com.ns.yc.yccountdownviewlib.CountDownView;
 import com.squareup.picasso.Callback;
 import com.ycbjie.library.base.mvp.BaseActivity;
-import com.ycbjie.library.utils.image.ImageUtils;
+import com.ycbjie.library.glide.ImageUtils;
 
 import cn.ycbjie.ycstatusbarlib.bar.StateAppBar;