1.修复bug体系-广场中的列表数据没有显示作者

2.修复部分tab，标题，文本数据显示了网页标签bug
3.修改体系中tab位置起始位左侧显示

app/build.gradle

@@ -104,11 +104,9 @@ dependencies {
     testImplementation rootProject.ext.dependencies["canary-release"]
     //kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1"
     //项目用到的库大部分封装在里面 具体在 config.gradle
     implementation rootProject.ext.customLibs
-
-    implementation 'cn.simonlee.widget:swipeback:1.0.15'
 }
 repositories {
     mavenCentral()

app/src/main/java/me/hegj/wandroid/app/AppLifecyclesImpl.kt

@@ -101,7 +101,7 @@ class AppLifecyclesImpl : AppLifecycles {
         val strategy = UserStrategy(context)
         strategy.isUploadProcess = processName == null || processName == packageName
         // 初始化Bugly
-        Bugly.init(context, "5a5f6366fc", BuildConfig.DEBUG)
+        Bugly.init(context, "xxxx", BuildConfig.DEBUG)
 
         CaocConfig.Builder.create()
                 .backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT) //default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM

app/src/main/java/me/hegj/wandroid/app/utils/ShowUtils.kt

@@ -11,8 +11,6 @@ import android.view.Window
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.WhichButton
-import com.afollestad.materialdialogs.actions.getActionButton
 import me.hegj.wandroid.R
 
 object ShowUtils {
@@ -28,7 +26,7 @@ object ShowUtils {
             setCanceledOnTouchOutside(false)
             setProgressStyle(ProgressDialog.STYLE_SPINNER)
             setMessage("请求网络中...")
-            val d = ClipDrawable(ColorDrawable(SettingUtil.getColor(context)), Gravity.LEFT, ClipDrawable.HORIZONTAL)
+            val d = ClipDrawable(ColorDrawable(SettingUtil.getColor(context)), Gravity.START, ClipDrawable.HORIZONTAL)
             setProgressDrawable(d)
             show()
         }
@@ -109,9 +107,7 @@ object ShowUtils {
      * 隐藏toast
      */
     fun hide() {
-        toast?.let {
-            it.cancel()
-        }
+        toast?.cancel()
     }
 
 

app/src/main/java/me/hegj/wandroid/mvp/model/entity/AriticleResponse.kt

@@ -24,6 +24,7 @@ data class AriticleResponse(
         var publishTime: Long,
         var superChapterId: Int,
         var superChapterName: String,
+        var shareUser: String,
         var tags: List<TagsResponse>,
         var title: String,
         var type: Int,

app/src/main/java/me/hegj/wandroid/mvp/presenter/main/home/HomePresenter.kt

@@ -21,6 +21,7 @@ import javax.inject.Inject
 import me.hegj.wandroid.mvp.contract.main.home.HomeContract
 import me.hegj.wandroid.mvp.model.entity.*
 import me.hegj.wandroid.mvp.ui.activity.web.WebviewActivity
+import me.hegj.wandroid.mvp.ui.adapter.AriticleAdapter
 import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber
 import me.jessyan.rxerrorhandler.handler.RetryWithDelay
 
@@ -51,6 +52,9 @@ constructor(model: HomeContract.Model, rootView: HomeContract.View) :
     @Inject
     lateinit var mAppManager: AppManager
 
+    @Inject
+    lateinit var adapter: AriticleAdapter
+
     /**
      * 获取首页banner数据
      */

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/home/search/SearchActivity.kt

@@ -2,6 +2,7 @@ package me.hegj.wandroid.mvp.ui.activity.main.home.search
 
 import android.content.Intent
 import android.os.Bundle
+import android.text.Html
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.View
@@ -175,7 +176,7 @@ class SearchActivity : BaseActivity<SearchPresenter>(), SearchContract.View {
             override fun getView(parent: FlowLayout?, position: Int, hotSearchBean: SearchResponse?): View {
                 return LayoutInflater.from(parent?.context).inflate(R.layout.flow_layout, search_flowlayout, false)
                         .apply {
-                            flow_tag.text = hotSearchBean?.name
+                            flow_tag.text = Html.fromHtml(hotSearchBean?.name)
                             flow_tag.setTextColor(ColorUtil.randomColor())
                         }
             }

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/project/ProjectFragment.kt

@@ -3,6 +3,7 @@ package me.hegj.wandroid.mvp.ui.activity.main.project
 import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
+import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -93,7 +94,7 @@ class ProjectFragment : BaseFragment<ProjectPresenter>(), ProjectContract.View {
 
             override fun getTitleView(context: Context, index: Int): IPagerTitleView {
                 return ScaleTransitionPagerTitleView(context).apply {
-                    text = mDataList[index].name
+                    text = Html.fromHtml(mDataList[index].name)
                     textSize = 17f
                     normalColor = Color.WHITE
                     selectedColor = Color.WHITE

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/publicNumber/PublicFragment.kt

@@ -3,6 +3,7 @@ package me.hegj.wandroid.mvp.ui.activity.main.publicNumber
 import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
+import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -91,7 +92,7 @@ class PublicFragment : BaseFragment<PublicPresenter>(), PublicContract.View {
 
             override fun getTitleView(context: Context, index: Int): IPagerTitleView {
                 return ScaleTransitionPagerTitleView(context).apply {
-                    text = mDataList[index].name
+                    text = Html.fromHtml(mDataList[index].name)
                     textSize = 17f
                     normalColor = Color.WHITE
                     selectedColor = Color.WHITE

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/tree/treeinfo/TreeInfoActivity.kt

@@ -4,12 +4,13 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
+import android.text.Html
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import com.jess.arms.di.component.AppComponent
 import com.jess.arms.mvp.IPresenter
 import kotlinx.android.synthetic.main.include_toolbar.*
-import kotlinx.android.synthetic.main.include_viewpager.*
+import kotlinx.android.synthetic.main.include_viewpagerleft.*
 import me.hegj.wandroid.R
 import me.hegj.wandroid.app.utils.SettingUtil
 import me.hegj.wandroid.app.weight.ScaleTransitionPagerTitleView
@@ -72,7 +73,7 @@ class TreeInfoActivity : BaseActivity<IPresenter>() {
 
             override fun getTitleView(context: Context, index: Int): IPagerTitleView {
                 return ScaleTransitionPagerTitleView(context).apply {
-                    text = systemResponse.children[index].name
+                    text = Html.fromHtml(systemResponse.children[index].name)
                     textSize = 17f
                     normalColor = Color.WHITE
                     selectedColor = Color.WHITE

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/tree/treeinfo/TreeinfoFragment.kt

@@ -100,7 +100,7 @@ class TreeinfoFragment : BaseFragment<TreeinfoPresenter>(), TreeinfoContract.Vie
         }
 
         //初始化adapter
-        adapter = AriticleAdapter(arrayListOf()).apply {
+        adapter = AriticleAdapter(arrayListOf(),true).apply {
             if (SettingUtil.getListMode(_mActivity) != 0) {
                 openLoadAnimation(SettingUtil.getListMode(_mActivity))
             } else {

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/start/SplashActivity.kt

@@ -47,7 +47,6 @@ class SplashActivity : BaseActivity<IPresenter>() {
                 override fun onAnimationEnd(p0: Animation?) {
                     goToMainActivity()
                 }
-
                 override fun onAnimationStart(p0: Animation?) {}
             })
         }

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/web/WebviewActivity.kt

@@ -3,6 +3,7 @@ package me.hegj.wandroid.mvp.ui.activity.web
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.text.Html
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
@@ -66,8 +67,7 @@ class WebviewActivity : BaseActivity<WebviewPresenter>(), WebviewContract.View {
         intent.getSerializableExtra("data")?.let {
             it as AriticleResponse
             id = it.id
-            //替换掉部分数据可能包含的网页标签
-            showTitle = it.title.replace("<em class='highlight'>","").replace("</em>","")
+            showTitle = it.title
             collect = it.collect
             url = it.link
             collectTYpe = CollectType.Ariticle.type
@@ -76,7 +76,7 @@ class WebviewActivity : BaseActivity<WebviewPresenter>(), WebviewContract.View {
         intent.getSerializableExtra("bannerdata")?.let {
             it as BannerResponse
             id = it.id
-            showTitle = it.title.replace("<em class='highlight'>","").replace("</em>","")
+            showTitle = it.title
             collect = false //从首页轮播图 没法判断是否已经收藏过，所以直接默认没有收藏
             url = it.url
             collectTYpe = CollectType.Url.type
@@ -85,8 +85,7 @@ class WebviewActivity : BaseActivity<WebviewPresenter>(), WebviewContract.View {
         intent.getSerializableExtra("collect")?.let {
             it as CollectResponse
             id = it.originId
-            //替换掉部分数据可能包含的网页标签
-            showTitle = it.title.replace("<em class='highlight'>","").replace("</em>","")
+            showTitle = it.title
             collect = true //从收藏列表过来的，肯定 是 true 了
             url = it.link
             collectTYpe = CollectType.Ariticle.type
@@ -95,8 +94,7 @@ class WebviewActivity : BaseActivity<WebviewPresenter>(), WebviewContract.View {
         intent.getSerializableExtra("collectUrl")?.let {
             it as CollectUrlResponse
             id = it.id
-            //替换掉部分数据可能包含的网页标签
-            showTitle = it.name.replace("<em class='highlight'>","").replace("</em>","")
+            showTitle = it.name
             collect = true//从收藏列表过来的，肯定 是 true 了
             url = it.link
             collectTYpe = CollectType.Url.type
@@ -104,7 +102,7 @@ class WebviewActivity : BaseActivity<WebviewPresenter>(), WebviewContract.View {
 
         toolbar.run {
             setSupportActionBar(this)
-            title = showTitle
+            title = Html.fromHtml(showTitle)
             setNavigationIcon(R.drawable.ic_back)
             setNavigationOnClickListener { finish() }
         }

app/src/main/java/me/hegj/wandroid/mvp/ui/adapter/AriticleAdapter.kt

@@ -42,9 +42,9 @@ class AriticleAdapter(data: ArrayList<AriticleResponse>?) : BaseQuickAdapter<Ari
                 Ariticle -> {
                     //文章布局的赋值
                     item.run{
-                        helper.setText(R.id.item_home_author, author)
+                        helper.setText(R.id.item_home_author, if(author.isNotEmpty()) author else shareUser)
                         helper.setText(R.id.item_home_content, Html.fromHtml(title))
-                        helper.setText(R.id.item_home_type2, "$superChapterName·$chapterName")
+                        helper.setText(R.id.item_home_type2, Html.fromHtml("$superChapterName·$chapterName"))
                         helper.setText(R.id.item_home_date, niceDate)
                         helper.getView<CollectView>(R.id.item_home_collect).isChecked = collect
                         if (showTag) {
@@ -73,10 +73,10 @@ class AriticleAdapter(data: ArrayList<AriticleResponse>?) : BaseQuickAdapter<Ari
                 Project -> {
                     //项目布局的赋值
                     item.run{
-                        helper.setText(R.id.item_project_author, author)
+                        helper.setText(R.id.item_project_author, if(author.isNotEmpty()) author else shareUser)
                         helper.setText(R.id.item_project_title, Html.fromHtml(title))
                         helper.setText(R.id.item_project_content, Html.fromHtml(desc))
-                        helper.setText(R.id.item_project_type, "$superChapterName·$chapterName")
+                        helper.setText(R.id.item_project_type, Html.fromHtml("$superChapterName·$chapterName"))
                         helper.setText(R.id.item_project_date, niceDate)
                         if (showTag) {
                             //展示标签

app/src/main/java/me/hegj/wandroid/mvp/ui/adapter/CollectAdapter.kt

@@ -16,12 +16,6 @@ class CollectAdapter(data: ArrayList<CollectResponse>?) : BaseQuickAdapter<Colle
     private var mOnCollectViewClickListener: OnCollectViewClickListener? = null
     private val Ariticle = 1//文章类型
     private val Project = 2//项目类型 本来打算不区分文章和项目布局用统一布局的，但是布局完以后发现差异化蛮大的，所以还是分开吧
-    private var showTag = false//是否展示标签 tag 一般主页才用的到
-
-    constructor(data: ArrayList<CollectResponse>?, showTag: Boolean) : this(data) {
-        this.showTag = showTag
-    }
-
     init {
         //初始化
         multiTypeDelegate = object : MultiTypeDelegate<CollectResponse>() {
@@ -44,7 +38,7 @@ class CollectAdapter(data: ArrayList<CollectResponse>?) : BaseQuickAdapter<Colle
                     item.run{
                         helper.setText(R.id.item_home_author, author)
                         helper.setText(R.id.item_home_content, Html.fromHtml(title))
-                        helper.setText(R.id.item_home_type2, chapterName)
+                        helper.setText(R.id.item_home_type2, Html.fromHtml(chapterName))
                         helper.setText(R.id.item_home_date, niceDate)
                         helper.getView<CollectView>(R.id.item_home_collect).isChecked = true
                         //隐藏所有标签
@@ -64,7 +58,7 @@ class CollectAdapter(data: ArrayList<CollectResponse>?) : BaseQuickAdapter<Colle
                         helper.setText(R.id.item_project_author, author)
                         helper.setText(R.id.item_project_title, Html.fromHtml(title))
                         helper.setText(R.id.item_project_content, Html.fromHtml(desc))
-                        helper.setText(R.id.item_project_type, chapterName)
+                        helper.setText(R.id.item_project_type, Html.fromHtml(chapterName))
                         helper.setText(R.id.item_project_date, niceDate)
                         //隐藏所有标签
                         helper.setGone(R.id.item_project_top, false)

app/src/main/java/me/hegj/wandroid/mvp/ui/adapter/NavigationAdapter.kt

@@ -1,5 +1,6 @@
 package me.hegj.wandroid.mvp.ui.adapter
 
+import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import com.chad.library.adapter.base.BaseQuickAdapter
@@ -13,9 +14,13 @@ import me.hegj.wandroid.app.utils.ColorUtil
 import me.hegj.wandroid.mvp.model.entity.AriticleResponse
 import me.hegj.wandroid.mvp.model.entity.NavigationResponse
 
+/** 导航 adapter
+  * @Author:         hegaojian
+  * @CreateDate:     2019/9/21 20:55
+ */
 class NavigationAdapter(data: MutableList<NavigationResponse>?) : BaseQuickAdapter<NavigationResponse, BaseViewHolder>(R.layout.item_system, data) {
 
-    lateinit var tagClicklistener:TagClicklistener
+    var tagClicklistener:TagClicklistener? = null
     
     override fun convert(helper: BaseViewHolder?, item: NavigationResponse?) {
         item?.let {
@@ -25,7 +30,7 @@ class NavigationAdapter(data: MutableList<NavigationResponse>?) : BaseQuickAdapt
                     override fun getView(parent: FlowLayout?, position: Int, hotSearchBean: AriticleResponse?): View {
                         return LayoutInflater.from(parent?.context).inflate(R.layout.flow_layout, this@run, false)
                                 .apply {
-                                    flow_tag.text = hotSearchBean?.title
+                                    flow_tag.text = Html.fromHtml(hotSearchBean?.title)
                                     flow_tag.setTextColor(ColorUtil.randomColor())
                                 }
                     }

app/src/main/java/me/hegj/wandroid/mvp/ui/adapter/SystemAdapter.kt

@@ -1,5 +1,6 @@
 package me.hegj.wandroid.mvp.ui.adapter
 
+import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import com.chad.library.adapter.base.BaseQuickAdapter
@@ -7,45 +8,43 @@ import com.chad.library.adapter.base.BaseViewHolder
 import com.zhy.view.flowlayout.FlowLayout
 import com.zhy.view.flowlayout.TagAdapter
 import com.zhy.view.flowlayout.TagFlowLayout
-import kotlinx.android.synthetic.main.activity_search.*
 import kotlinx.android.synthetic.main.flow_layout.view.*
 import me.hegj.wandroid.R
 import me.hegj.wandroid.app.utils.ColorUtil
 import me.hegj.wandroid.mvp.model.entity.ClassifyResponse
-import me.hegj.wandroid.mvp.model.entity.SearchResponse
 import me.hegj.wandroid.mvp.model.entity.SystemResponse
 
 class SystemAdapter(data: MutableList<SystemResponse>?) : BaseQuickAdapter<SystemResponse, BaseViewHolder>(R.layout.item_system, data) {
-    lateinit var tagClicklistener:TagClicklistener
-    
+    var tagClicklistener: TagClicklistener? = null
+
     override fun convert(helper: BaseViewHolder?, item: SystemResponse?) {
         item?.let {
-            helper?.setText(R.id.item_system_title, it.name)
+            helper?.setText(R.id.item_system_title, Html.fromHtml(it.name))
             helper?.getView<TagFlowLayout>(R.id.item_system_flowlayout)?.run {
                 adapter = object : TagAdapter<ClassifyResponse>(it.children) {
                     override fun getView(parent: FlowLayout?, position: Int, hotSearchBean: ClassifyResponse?): View {
                         return LayoutInflater.from(parent?.context).inflate(R.layout.flow_layout, this@run, false)
                                 .apply {
-                                    flow_tag.text = hotSearchBean?.name
+                                    flow_tag.text = Html.fromHtml(hotSearchBean?.name)
                                     flow_tag.setTextColor(ColorUtil.randomColor())
                                 }
                     }
                 }
                 setOnTagClickListener { view, position, parent ->
-                    tagClicklistener?.onClick(helper.adapterPosition,position)
+                    tagClicklistener?.onClick(helper.adapterPosition, position)
                     false
                 }
             }
         }
     }
 
-    fun setTagClickListener(tagClicklistener:TagClicklistener) {
+    fun setTagClickListener(tagClicklistener: TagClicklistener) {
         this.tagClicklistener = tagClicklistener
     }
-    
-     interface TagClicklistener{
-         fun onClick(position:Int,childPosition:Int)
-     }
+
+    interface TagClicklistener {
+        fun onClick(position: Int, childPosition: Int)
+    }
 
 
 }

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

@@ -4,5 +4,5 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     <include layout="@layout/include_toolbar" />
-    <include layout="@layout/include_viewpager"/>
+    <include layout="@layout/include_viewpagerleft"/>
 </LinearLayout>

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

@@ -2,7 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/welcome_base"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/colorPrimary"
     android:layout_width="match_parent"
     android:layout_height="match_parent">

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/viewpager_linear"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/colorPrimary"
+        android:orientation="horizontal"
+        android:padding="2dp">
+
+        <net.lucode.hackware.magicindicator.MagicIndicator
+            android:id="@+id/magic_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp" />
+
+    </LinearLayout>
+
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</merge>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         //Gradle Android Maven plugin
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

config.gradle

@@ -5,8 +5,8 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 28,
-            versionCode      : 4,
-            versionName      : "1.0.3"
+            versionCode      : 5,
+            versionName      : "1.0.4"
     ]
 
     version = [
@@ -115,8 +115,8 @@ ext {
             "retrofit-url-manager"  : "me.jessyan:retrofit-url-manager:1.4.0",
             "progressmanager"       : "me.jessyan:progressmanager:1.5.0",
             //dialog
-            "dialogs-core"          : 'com.afollestad.material-dialogs:core:3.1.0',
-            "dialogs-color"         : 'com.afollestad.material-dialogs:color:3.1.0',
+            "dialogs-core"          : 'com.afollestad.material-dialogs:core:3.1.1',
+            "dialogs-color"         : 'com.afollestad.material-dialogs:color:3.1.1',
             "dialogs-datetime"      : 'com.afollestad.material-dialogs:datetime:3.1.1',
             //fragment管理库
             "fragmentationx"        : 'me.yokeyword:fragmentationx:1.0.1',