修改课件显示的文件夹规则

README.MD

@@ -1,7 +1,7 @@
 # 幼儿园项目创想天地幼儿课件
 
-![Version](https://img.shields.io/badge/Version-1.0.0-brightgreen.svg?style=flat)
-![VersionCode](https://img.shields.io/badge/VersionCode-1-brightgreen.svg?style=flat)
+![Version](https://img.shields.io/badge/Version-1.1.6-brightgreen.svg?style=flat)
+![VersionCode](https://img.shields.io/badge/VersionCode-234-brightgreen.svg?style=flat)
 ![数据库版本](https://img.shields.io/badge/DatabaseVersion-1-brightgreen.svg?style=flat)
 ![AndroidAPI](https://img.shields.io/badge/AndroidAPI-21+-brightgreen.svg?style=flat)
 
@@ -11,4 +11,38 @@
 
 #### 工程构建模块 ： include ':app'
 
-#### v-X.Y.Z.B : X 主版本号 , Y 小版本号 , Z bug修复版本号 , B 编译版本号
+#### v-X.Y.Z.B : X 主版本号 , Y 小版本号 , Z bug修复版本号 , B 编译版本号
+
+## 关于项目工程
+
+- 项目使用kotlin + Coroutines
+
+- 项目是基于AndroidX和AndroidJetpack构建
+
+- 项目使用单activity+多Fragment，没有封装基类等，均使用AndroidX的兼容类，避免封装的基类带来的不便。如果需要基类的基本需求，使用Kotlin的类扩展语法糖
+
+- **集成框架基础 ：** androidx.leanback + andoridx.core + KTX + Lifecycle + ViewModel + LiveData + Coroutines + DataBinding + Room + Paging + Navigation + Constraintlayout + WorkManager + Viewpager2
+
+- **以andoridxd的Fragment为标准新页面的基类，不重写基础类**
+
+- **(重要)(重要)(重要) 日志信息记录：约定日志记录必须使用Logger的日志记录框架**
+
+- **(重要) (重要) 项目不修改versionCode（编译自动更新），只需要修改version版本即可**
+
+- **(重要) 工具扩展方法在library包中定义**
+
+- **(重要) (重要) 图片放置位置与drawable下,mipmap 是放置应用图标的文件夹**
+
+- **(重要) 数据的获取不要再Activity/Fragment中去做，需要在data/repository 或者是在ViewModel中完成**
+
+- **(重要) API接口统一写在data/component中,接口信息是使用新的Retrofit2.6以上版本，代码可以简化请求，注意异常的捕获**
+
+
+- **(重要) (重要) Room数据库升级可在AppDatabase中添加迁移信息，迁移信息可以在com.bearya.data.migrations中定义，预打包的数据库文件在assets/database/manual.db**
+
+## 关于课件文件夹目录添加
+
+- 1.  **课件的文件夹的名称就是课程的名称。**
+- 2.  **课件的封面放在课件的文件夹 assets/chapter/课程名称/ 下，命名统一为cover.webp。**
+- 3.  **课件的实际内容放在课件文件夹下，新建一个的 assets/chapter/课程名称/resource/ 文件夹中，命名需要以阿拉伯数字定义顺序。**
+- 4.  **课件可以使用webp格式文件**

app/src/main/java/com/bearya/kids/chapter/ChapterAdapter.kt

@@ -36,7 +36,7 @@ class ChapterAdapter : PagedListAdapter<Chapter, UnitViewHolder>(object : DiffUt
     override fun onBindViewHolder(holder: UnitViewHolder, position: Int) {
         val item = getItem(position)
         holder.bindView?.name = item?.name
-        holder.bindView?.cover = "chapter/${item?.name}/${item?.name}.webp".assetsPath()
+        holder.bindView?.cover = "chapter/${item?.name}/cover.webp".assetsPath()
         holder.itemView.apply {
 
             setOnClickListener {

app/src/main/java/com/bearya/kids/chapter/ChapterFragment.kt

@@ -18,10 +18,6 @@ import library.ext.setData
 
 class ChapterFragment : Fragment() {
 
-    private val gradeLevelPrimary = 1 // 小班
-    private val gradeLevelMiddle = 2 // 中班
-    private val gradeLevelLarge = 3 // 大班
-
     private lateinit var bindView: FragmentChapterBinding
     private val viewModel: ChapterViewModel by viewModels()
     private val args: ChapterFragmentArgs by navArgs()
@@ -30,10 +26,7 @@ class ChapterFragment : Fragment() {
         ChapterAdapter().apply {
             onItemClickListener = { view: View, item: Chapter?, _: Int ->
                 view.findNavController().navigate(
-                    ChapterFragmentDirections.actionChapterFragmentToSectionFragment(
-                        item?.id
-                            ?: 1, item?.name
-                    )
+                    ChapterFragmentDirections.actionChapterFragmentToSectionFragment(item?.id ?: 1)
                 )
             }
         }
@@ -53,12 +46,7 @@ class ChapterFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        bindView.gradeName.text = when (args.grade) {
-            gradeLevelPrimary -> "小班"
-            gradeLevelMiddle -> "中班"
-            gradeLevelLarge -> "大班"
-            else -> "幼儿园"
-        }
+        bindView.viewModel = viewModel
 
         bindView.back.setOnClickListener { v -> v.findNavController().navigateUp() }
         bindView.chapter.layoutManager =

app/src/main/java/com/bearya/kids/chapter/ChapterViewModel.kt

@@ -1,9 +1,6 @@
 package com.bearya.kids.chapter
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.switchMap
+import androidx.lifecycle.*
 import androidx.paging.PagedList
 import com.bearya.data.entity.Chapter
 import com.bearya.data.repository.ChapterRepository
@@ -11,6 +8,10 @@ import library.ext.toLiveData
 
 class ChapterViewModel : ViewModel() {
 
+    private val gradeLevelPrimary = 1 // 小班
+    private val gradeLevelMiddle = 2 // 中班
+    private val gradeLevelLarge = 3 // 大班
+
     private val chapterRepository: ChapterRepository by lazy { ChapterRepository() }
 
     val gradeLevel : MutableLiveData<Int> by lazy { MutableLiveData<Int>() }
@@ -18,4 +19,14 @@ class ChapterViewModel : ViewModel() {
     val chapters: LiveData<PagedList<Chapter>>  = gradeLevel.switchMap {
         chapterRepository.findChaptersByGradeLevel(it).toLiveData()
     }
+
+    val gradeName: LiveData<String> = gradeLevel.map {
+        when(it) {
+            gradeLevelPrimary -> "小班"
+            gradeLevelMiddle -> "中班"
+            gradeLevelLarge -> "大班"
+            else -> "幼儿园"
+        }
+    }
+
 }

app/src/main/java/com/bearya/kids/grade/GradeFragment.kt

@@ -28,13 +28,16 @@ class GradeFragment : Fragment(), View.OnClickListener, View.OnFocusChangeListen
         super.onViewCreated(view, savedInstanceState)
         val versionName = "当前版本 : v ${BuildConfig.VERSION_NAME}.${BuildConfig.VERSION_CODE}"
         bindView.version.text = versionName
+
         bindView.gradePrimary.setOnClickListener(this)
-        bindView.gradePrimary.onFocusChangeListener = this
         bindView.gradeMiddle.setOnClickListener(this)
-        bindView.gradeMiddle.onFocusChangeListener = this
         bindView.gradeLarge.setOnClickListener(this)
-        bindView.gradeLarge.onFocusChangeListener = this
         bindView.back.setOnClickListener(this)
+
+        bindView.gradePrimary.onFocusChangeListener = this
+        bindView.gradeMiddle.onFocusChangeListener = this
+        bindView.gradeLarge.onFocusChangeListener = this
+
     }
 
     override fun onClick(v: View?) {

app/src/main/java/com/bearya/kids/section/SectionAdapter.kt

@@ -16,28 +16,31 @@ import com.bearya.kids.databinding.ItemSectionPreviewBinding
 import library.OnItemClickListener
 import library.ext.assetsPath
 
-class SectionPagerAdapter(private val dirName: String?) : PagedListAdapter<Section, SectionPagerViewHolder>(object : DiffUtil.ItemCallback<Section>() {
+class SectionPagerAdapter :
+    PagedListAdapter<Section, SectionPagerViewHolder>(object : DiffUtil.ItemCallback<Section>() {
 
-    override fun areItemsTheSame(oldItem: Section, newItem: Section): Boolean = oldItem.id == newItem.id
+        override fun areItemsTheSame(oldItem: Section, newItem: Section): Boolean =
+            oldItem.id == newItem.id
 
-    override fun areContentsTheSame(oldItem: Section, newItem: Section): Boolean =
+        override fun areContentsTheSame(oldItem: Section, newItem: Section): Boolean =
             TextUtils.equals(oldItem.name, newItem.name) && oldItem.lock == newItem.lock
 
-}) {
+    }) {
 
     var onItemClickListener: OnItemClickListener<Section>? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SectionPagerViewHolder = SectionPagerViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SectionPagerViewHolder =
+        SectionPagerViewHolder(
             ItemSectionBinding.inflate(LayoutInflater.from(parent.context), parent, false).root
-    )
+        )
 
     override fun onBindViewHolder(holder: SectionPagerViewHolder, position: Int) {
         val item = getItem(position)
-        holder.bindView?.image = "chapter/${dirName}/${item?.name}.webp".assetsPath()
+        holder.bindView?.image = "chapter/${item?.name}/resources/${position + 1}.webp".assetsPath()
         holder.itemView.setOnClickListener { onItemClickListener?.invoke(it, item, position) }
     }
 
-    fun getItemData(position:Int) = getItem(position)
+    fun getItemData(position: Int) = getItem(position)
 
 }
 
@@ -45,23 +48,26 @@ class SectionPagerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
     val bindView: ItemSectionBinding? = DataBindingUtil.bind(itemView)
 }
 
-class SectionPreviewAdapter(private val dirName: String?) : PagedListAdapter<Section, SectionPreviewViewHolder>(object : DiffUtil.ItemCallback<Section>() {
+class SectionPreviewAdapter :
+    PagedListAdapter<Section, SectionPreviewViewHolder>(object : DiffUtil.ItemCallback<Section>() {
 
-    override fun areItemsTheSame(oldItem: Section, newItem: Section): Boolean = oldItem.id == newItem.id
+        override fun areItemsTheSame(oldItem: Section, newItem: Section): Boolean =
+            oldItem.id == newItem.id
 
-    override fun areContentsTheSame(oldItem: Section, newItem: Section): Boolean =
+        override fun areContentsTheSame(oldItem: Section, newItem: Section): Boolean =
             TextUtils.equals(oldItem.name, newItem.name) && oldItem.lock == newItem.lock
 
-}) {
+    }) {
 
     var onItemClickListener: OnItemClickListener<Section>? = null
 
     private var currentFocusItemIndex = 0
     private var recyclerView: RecyclerView? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SectionPreviewViewHolder = SectionPreviewViewHolder(
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SectionPreviewViewHolder =
+        SectionPreviewViewHolder(
             ItemSectionPreviewBinding.inflate(LayoutInflater.from(parent.context), parent, false).root
-    )
+        )
 
     override fun onBindViewHolder(holder: SectionPreviewViewHolder, position: Int) {
         val item = getItem(position)
@@ -69,10 +75,15 @@ class SectionPreviewAdapter(private val dirName: String?) : PagedListAdapter<Sec
         val index = position + 1
         holder.bindView?.index = "$index"
 
-        holder.bindView?.image = "chapter/${dirName}/${item?.name}.webp".assetsPath()
+        holder.bindView?.image = "chapter/${item?.name}/resources/$index.webp".assetsPath()
 
-        holder.bindView?.cover?.setBorderColor(ResourcesCompat.getColor(holder.itemView.context.resources,
-                if (position == currentFocusItemIndex) R.color.colorBlue else R.color.colorWhite, null))
+        holder.bindView?.cover?.setBorderColor(
+            ResourcesCompat.getColor(
+                holder.itemView.context.resources,
+                if (position == currentFocusItemIndex) R.color.colorBlue else R.color.colorWhite,
+                null
+            )
+        )
 
         holder.itemView.setOnClickListener { v -> onItemClickListener?.invoke(v, item, position) }
     }
@@ -94,7 +105,6 @@ class SectionPreviewAdapter(private val dirName: String?) : PagedListAdapter<Sec
         recyclerView = null
     }
 
-
 }
 
 class SectionPreviewViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

app/src/main/java/com/bearya/kids/section/SectionFragment.kt

@@ -26,8 +26,8 @@ class SectionFragment : Fragment() {
     private val viewModel: SectionViewModel by viewModels()
     private val args: SectionFragmentArgs by navArgs()
 
-    private val pagerAdapter: SectionPagerAdapter by lazy { SectionPagerAdapter(args.chapterName) }
-    private val previewAdapter: SectionPreviewAdapter by lazy { SectionPreviewAdapter(args.chapterName) }
+    private val pagerAdapter: SectionPagerAdapter by lazy { SectionPagerAdapter() }
+    private val previewAdapter: SectionPreviewAdapter by lazy { SectionPreviewAdapter() }
 
     private val pageChangeCallback by lazy {
         object : ViewPager2.OnPageChangeCallback() {
@@ -103,7 +103,7 @@ class SectionFragment : Fragment() {
             val itemData = pagerAdapter.getItemData(bindView.playPager.currentItem)
 
             if (itemData?.hasAnalysis == true) {
-                val action = SectionFragmentDirections.actionSectionFragmentToAnalysisFragment(itemData.id ?: 1 , args.chapterName)
+                val action = SectionFragmentDirections.actionSectionFragmentToAnalysisFragment(itemData.id ?: 1 , itemData.name)
                 it.findNavController().navigate(action)
             } else {
                 Toast.makeText(context, "暂无该答案", Toast.LENGTH_LONG).show()

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

@@ -3,6 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <data>
+        <variable
+            name="viewModel"
+            type="com.bearya.kids.chapter.ChapterViewModel" />
+    </data>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -29,6 +35,7 @@
             android:gravity="center"
             android:textColor="@color/colorWhite"
             android:textStyle="bold"
+            android:text="@{viewModel.gradeName}"
             app:autoSizeTextType="uniform"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/navigation/main_navigation.xml

@@ -54,18 +54,13 @@
         android:id="@+id/sectionFragment"
         android:name="com.bearya.kids.section.SectionFragment"
         tools:layout="@layout/fragment_section">
+
         <argument
             android:name="chapterId"
             android:defaultValue="1"
             app:argType="integer"
             app:nullable="false" />
 
-        <argument
-            android:name="chapterName"
-            android:defaultValue="none"
-            app:argType="string"
-            app:nullable="true" />
-
         <action
             android:id="@+id/action_sectionFragment_to_analysisFragment"
             app:destination="@+id/analysisFragment"

app/version.properties

@@ -1,3 +1,3 @@
-#Mon Apr 27 15:13:46 CST 2020
-VERSION_NAME=1.1.4
-VERSION_CODE=222
+#Mon May 11 11:30:42 CST 2020
+VERSION_NAME=1.1.6
+VERSION_CODE=234

数据库更新版本.md

@@ -0,0 +1,30 @@
+# 幼儿园项目创想天地幼儿课件  数据库版本设置详细
+
+# 更新版本信息
+| 版本 | 修改信息 | 备注 |
+|---|---|---|
+
+
+# 表检索
+| 名称 | 表名 | 添加版本 |
+|---|---|---|
+
+
+# <a id="" name="">表 </a>
+
+```
+
+```
+
+| 名称 | 类型 | 详细 | 版本 |
+|---|---|---|---|
+
+
+# <a id="" name="">表</a>
+
+```
+
+```
+
+| 名称 | 类型 | 详细 | 版本 |
+|---|---|---|---|

更新日志.md

@@ -0,0 +1,9 @@
+# 幼儿园项目创想天地幼儿课件
+
+### v1.1.6.234 2020年05月11日
+
+- 修改课件显示的文件夹规则
+
+### v1.1.3.219 2020年04月26日
+
+- 创建初始版本，显示幼儿使用课件，可以在贝之星和小贝两种设备上使用。