修复找不到vm的bug

linxiangcheer · Mar 21, 2021 · 3e96058 · 3e96058
1 parent dbb0a84
commit 3e96058
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 7 deletions.
diff --git a/course/src/main/java/com/cniao5/course/ui/playvideo/PlayVideoActivity.kt b/course/src/main/java/com/cniao5/course/ui/playvideo/PlayVideoActivity.kt
@@ -53,7 +53,7 @@ class PlayVideoActivity : BaseActivity<FragmentPlayVideoBinding>() {
 
         //点击某个分组监听事件
         mBinding.listview.setOnGroupClickListener { parent, v, groupPosition, id ->
-            ToastUtils.showShort("你点击了${viewmodel.arrayLiveCourseDetails[groupPosition]}")
+            ToastUtils.showShort("你点击了${viewmodel.arrayLiveCourseDetails[groupPosition]?.title}")
             false //true 屏蔽一级列表点击
         }
 

diff --git a/login/build.gradle b/login/build.gradle
@@ -5,7 +5,6 @@ if (singleModule.toBoolean()){
     apply plugin: 'com.android.library'
 }
 apply from: '../dependencies.gradle'
-apply plugin: 'kotlin-android'
 
 android {
     //from dependencies.gradle

diff --git a/login/src/debug/AndroidManifest.xml b/login/src/debug/AndroidManifest.xml
@@ -12,7 +12,8 @@
         android:theme="@style/CommonTheme">
         <activity
             android:name=".ui.LoginActivity"
-            android:label="@string/modelu_name">
+            android:label="@string/modelu_name"
+            android:launchMode="singleTop">
 <!--            <intent-filter>-->
 <!--                <action android:name="android.intent.action.MAIN" />-->
 

diff --git a/login/src/debug/java/login/LibLogin.kt → login/src/main/java/login/LibLogin.kt b/login/src/debug/java/login/LibLogin.kt → login/src/main/java/login/LibLogin.kt
diff --git a/.../src/debug/java/login/LoginApplication.kt → ...n/src/main/java/login/LoginApplication.kt b/.../src/debug/java/login/LoginApplication.kt → ...n/src/main/java/login/LoginApplication.kt
diff --git a/login/src/debug/java/login/LoginViewModel.kt → login/src/main/java/login/LoginViewModel.kt b/login/src/debug/java/login/LoginViewModel.kt → login/src/main/java/login/LoginViewModel.kt
@@ -3,7 +3,6 @@ package login
 import android.content.Context
 import android.view.View
 import androidx.databinding.ObservableField
-import androidx.lifecycle.LiveData
 import com.blankj.utilcode.util.ToastUtils
 import com.cniao5.common.base.BaseViewModel
 import login.net.LoginReqBody

diff --git a/login/src/debug/java/login/net/LoginReq.kt → login/src/main/java/login/net/LoginReq.kt b/login/src/debug/java/login/net/LoginReq.kt → login/src/main/java/login/net/LoginReq.kt
diff --git a/login/src/debug/java/login/net/LoginRsp.kt → login/src/main/java/login/net/LoginRsp.kt b/login/src/debug/java/login/net/LoginRsp.kt → login/src/main/java/login/net/LoginRsp.kt
@@ -1,8 +1,6 @@
 package login.net
 
 import androidx.annotation.Keep
-import androidx.room.ColumnInfo
-import com.google.gson.annotations.SerializedName
 import com.test.service.repo.UserInfo
 
 /*

diff --git a/.../src/debug/java/login/net/LoginService.kt → ...n/src/main/java/login/net/LoginService.kt b/.../src/debug/java/login/net/LoginService.kt → ...n/src/main/java/login/net/LoginService.kt
diff --git a/...c/debug/java/login/repo/ILoginResource.kt → ...rc/main/java/login/repo/ILoginResource.kt b/...c/debug/java/login/repo/ILoginResource.kt → ...rc/main/java/login/repo/ILoginResource.kt
diff --git a/login/src/debug/java/login/repo/LoginRepo.kt → login/src/main/java/login/repo/LoginRepo.kt b/login/src/debug/java/login/repo/LoginRepo.kt → login/src/main/java/login/repo/LoginRepo.kt
diff --git a/.../src/debug/java/login/ui/LoginActivity.kt → ...n/src/main/java/login/ui/LoginActivity.kt b/.../src/debug/java/login/ui/LoginActivity.kt → ...n/src/main/java/login/ui/LoginActivity.kt
@@ -23,6 +23,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
 
     override fun initView() {
         super.initView()
+
         mBinding.apply {
             vm = viewModel
             //左上角退出按钮点击事件

diff --git a/login/src/main/res/layout/activity_login.xml b/login/src/main/res/layout/activity_login.xml
@@ -107,7 +107,7 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="请输入密码"
+                android:hint="任意8位或以上的密码"
                 android:inputType="textPassword"
                 android:maxLength="20"
                 android:text="@={vm.obPassword}"

diff --git a/study/src/main/java/com/cniao5/study/ui/StudiedAdapter.kt b/study/src/main/java/com/cniao5/study/ui/StudiedAdapter.kt
@@ -3,6 +3,7 @@ package com.cniao5.study.ui
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.blankj.utilcode.util.ToastUtils
 import com.cniao5.study.databinding.ItemCourseStudyBinding
 import com.cniao5.study.net.StudiedRsp
 
@@ -48,6 +49,11 @@ class StudiedVH(private val binding: ItemCourseStudyBinding) : RecyclerView.View
         binding.info = info
         //把获取到的progress进度条数据给进度条 也可以用扩展函数app:progress_current实现
         // binding.npbProgressItemStudy.progress = info.progress.toInt()
+
+        binding.card.setOnClickListener {
+            ToastUtils.showShort("点击了${info.name}")
+        }
+
         binding.executePendingBindings()
     }
 

diff --git a/study/src/main/java/com/cniao5/study/ui/StudyFragment.kt b/study/src/main/java/com/cniao5/study/ui/StudyFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.databinding.ViewDataBinding
+import com.blankj.utilcode.util.ToastUtils
 import com.cniao5.common.base.BaseFragment
 import com.cniao5.study.R
 import com.cniao5.study.StudyViewModel

diff --git a/study/src/main/res/layout/item_course_study.xml b/study/src/main/res/layout/item_course_study.xml
@@ -14,6 +14,7 @@
     </data>
 
     <androidx.cardview.widget.CardView
+        android:id="@+id/card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"