瀏覽代碼

1.添加积分规则
2.添加分享文章提示
3.修复5.1手机打开webview报错bug
4.修复recyclerview在加载更多时,点击会调用多次接口bug
5.升级gradle版本至3.5.1,SDK提升至29

hegj 5 年之前
父節點
當前提交
657cf01fa8

+ 0 - 31
.github/ISSUE_TEMPLATE.md

@@ -1,34 +1,3 @@
-## Look at here
 
-- → Did you conform to the [Rules](https://github.com/JessYanCoding/MVPArms/issues/150)?
-- → Did you read the [Wiki](https://github.com/JessYanCoding/MVPArms/wiki) **Carefully**?
-- → Did you search in Google?
-- → Did you search in openned&closed Issues?
-- → **Receive only bugs and suggestions**
 
-### Environment
 
-- [x] MVPArms Version: <!-- like: v2.3.1 -->
-- [x] AndroidStudio Version: <!-- like: v3.0.0 -->
-- [x] Gradle Plugin Version: <!-- like: v3.0.0 -->
-- [x] Target Android Version: <!-- like: Android 5.0 -->
-- [x] Device Model: <!-- like: Nexus 6 -->
-
-
-### Bug Description:
-<!-- 不接受框架之外的任何问题, 比如说 Retrofit 怎么使用, 不接受基础的问题以及 Google 或者百度能搜索到的问题, 比如说 Gradle 怎么下载不了三方库, 不接受已经回答过的 issues, 比如说 DaggerAppComponent, DaggerUserComponent 文件怎么不存在, 提问前最好先看下 https://github.com/JessYanCoding/MVPArms/issues/150, 当发现此 issues 不符合要求, 会在未被告知的情况下直接被 close!-->
-
-
-### Related Code:
-```java
-  
-
-```
-
-### Bug Log:
-```log
-
-
-```
-
-### Others:

+ 10 - 8
app/src/main/java/me/hegj/wandroid/mvp/ui/adapter/AriticleAdapter.kt

@@ -20,15 +20,17 @@ class AriticleAdapter(data: MutableList<AriticleResponse>?) : BaseQuickAdapter<A
     private val Ariticle = 1//文章类型
     private val Project = 2//项目类型 本来打算不区分文章和项目布局用统一布局的,但是布局完以后发现差异化蛮大的,所以还是分开吧
     private var showTag = false//是否展示标签 tag 一般主页才用的到
-    private var clickable = true//点击作者是否能跳转
+    private var clickable = true//点击作者是否能跳转查看他的信息
 
     constructor(data: MutableList<AriticleResponse>?, showTag: Boolean) : this(data) {
         this.showTag = showTag
     }
-    constructor(data: MutableList<AriticleResponse>?, showTag: Boolean,clickable:Boolean) : this(data) {
+
+    constructor(data: MutableList<AriticleResponse>?, showTag: Boolean, clickable: Boolean) : this(data) {
         this.showTag = showTag
         this.clickable = clickable
     }
+
     init {
         //初始化
         multiTypeDelegate = object : MultiTypeDelegate<AriticleResponse>() {
@@ -76,9 +78,9 @@ class AriticleAdapter(data: MutableList<AriticleResponse>?) : BaseQuickAdapter<A
                     }
                 })
                 helper.getView<TextView>(R.id.item_home_author).setOnClickListener {
-                    if(clickable){
-                        mContext.startActivity(Intent(mContext,ShareByIdActivity::class.java).apply {
-                            putExtra("id",item?.userId)
+                    if (clickable) {
+                        mContext.startActivity(Intent(mContext, ShareByIdActivity::class.java).apply {
+                            putExtra("id", item?.userId)
                         })
                     }
                 }
@@ -125,9 +127,9 @@ class AriticleAdapter(data: MutableList<AriticleResponse>?) : BaseQuickAdapter<A
                     }
                 })
                 helper.getView<TextView>(R.id.item_project_author).setOnClickListener {
-                    if(clickable){
-                        mContext.startActivity(Intent(mContext,ShareByIdActivity::class.java).apply {
-                            putExtra("id",item?.userId)
+                    if (clickable) {
+                        mContext.startActivity(Intent(mContext, ShareByIdActivity::class.java).apply {
+                            putExtra("id", item?.userId)
                         })
                     }
                 }

+ 2 - 1
app/src/main/java/me/hegj/wandroid/mvp/ui/adapter/OpenProjectAdapter.kt

@@ -12,7 +12,8 @@ import me.hegj.wandroid.mvp.model.entity.OpenProject
  */
 class OpenProjectAdapter(data: ArrayList<OpenProject>?) : BaseQuickAdapter<OpenProject, BaseViewHolder>(R.layout.item_openproject, data) {
 
-    override fun convert(helper: BaseViewHolder, item: OpenProject?) {
+    override fun convert(helper: BaseViewHolder?, item: OpenProject?) {
+        helper?:return
         //赋值
         item?.run {
             helper.setText(R.id.item_openproject_name, name)

+ 0 - 1
config.gradle

@@ -123,7 +123,6 @@ ext {
             "fragmentationx"        : 'me.yokeyword:fragmentationx:1.0.1',
             //底部导航栏
             "BottomNavigationViewEx": 'com.github.ittianyu:BottomNavigationViewEx:2.0.4',
-            "MagicIndicator"        : 'com.github.hackware1993:MagicIndicator:1.6.0',
             //tablayout指示器
             "Magicindicator"        : 'com.github.hackware1993:MagicIndicator:1.6.0',
             //轮播图