模块的创建 字体的文件导入

app/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'app-joint'
 
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'dagger.hilt.android.plugin'
 
 //apply plugin: 'com.didiglobal.booster'
 
@@ -43,10 +43,12 @@ android {
             //移除无用的resource文件
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            multiDexKeepProguard file('multidex-config.pro')
         }
 
         debug {
             debuggable true
+            multiDexKeepProguard file('multidex-config.pro')
         }
 
     }
@@ -81,13 +83,14 @@ dependencies {
     androidTestImplementation deps.android.test_junit
     androidTestImplementation deps.android.test_espresso
     //依赖注入
-//    implementation deps.support.hilt
-//    kapt deps.support.hilt_kapt
-//    implementation deps.support.hilt_vm
-//    kapt deps.support.hilt_vm_kapt
+    implementation deps.support.hilt
+    kapt deps.support.hilt_kapt
+    implementation deps.support.hilt_vm
+    kapt deps.support.hilt_vm_kapt
 
 
-    implementation project(':cpt_auth')
+    implementation project(':cpt_auths')
     implementation project(':cpt_business')
-//    implementation project(':cpt_personal')
+    implementation project(':cpt_pensonal')
+
 }

app/multidex-config.pro

@@ -0,0 +1,4 @@
+#Dex的自定义规则
+-keep class io.github.prototypez.appjoint.AppJoint
+-keep class com.guadou.lib_baselib.base.BaseApplication
+-keep class com.hongyegroup.nucleicacidtest.MyApplication

app/src/main/java/com/hongyegroup/nucleicacidtest/MainActivity.kt

@@ -1,4 +1,5 @@
 package com.hongyegroup.nucleicacidtest
+
 import com.guadou.cs_router.YYRouterService
 import com.guadou.lib_baselib.base.activity.BaseVMActivity
 import com.guadou.lib_baselib.base.vm.EmptyViewModel
@@ -16,7 +17,11 @@ class MainActivity : BaseVMActivity<EmptyViewModel>() {
     override fun init() {
 
         btn_jump_main.click {
-            YYRouterService.mainComponentServer?.startChooseRoleActivity()
+//            YYRouterService.mainComponentServer?.startChooseRoleActivity()
+
+//            YYRouterService.businessComponentServer?.startBusinessMainActivity()
+
+            YYRouterService.pensonalComponentServer.startPensonalMainActivity()
         }
 
 

app/src/main/java/com/hongyegroup/nucleicacidtest/MyApplication.kt

@@ -6,8 +6,9 @@ import android.os.Build
 import android.os.Process
 import android.webkit.WebView
 import com.guadou.lib_baselib.base.BaseApplication
+import dagger.hilt.android.HiltAndroidApp
 
-
+@HiltAndroidApp
 class MyApplication : BaseApplication() {
 
     override fun onCreate() {

cpt_auth/.gitignore

@@ -1 +0,0 @@
-/build

cpt_auth/src/main/AndroidManifest.xml

@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guadou.cpt_main" >
-
-    <application>
-
-        <activity android:name="com.hongyegroup.auth.ui.AuthActivity"/>
-
-    </application>
-
-</manifest>

cpt_auth/src/main/java/com/hongyegroup/auth/others/MemberDao.kt

@@ -1,12 +0,0 @@
-//package com.hongyegroup.auth.others
-//
-//import javax.inject.Inject
-//import javax.inject.Singleton
-//
-//@Singleton
-//class MemberDao @Inject constructor() {
-//
-//    fun printUser(): String {
-//        return "User Name"
-//    }
-//}

cpt_auth/src/main/java/com/hongyegroup/auth/others/MemberServer.kt

@@ -1,15 +0,0 @@
-//package com.hongyegroup.auth.others
-//
-//import com.guadou.lib_baselib.ext.toast
-//import com.guadou.lib_baselib.utils.Log.YYLogUtils
-//import dagger.hilt.android.scopes.ActivityScoped
-//import javax.inject.Inject
-//
-//@ActivityScoped
-//class MemberServer @Inject constructor(val userDao: MemberDao) {
-//
-//    fun testUser() {
-//        YYLogUtils.w(userDao.printUser() + userDao.toString())
-//        toast(userDao.printUser())
-//    }
-//}

cpt_auth/src/main/java/com/hongyegroup/auth/ui/AuthActivity.kt

@@ -1,40 +0,0 @@
-package com.hongyegroup.auth.ui
-
-import android.content.Intent
-import com.guadou.cpt_main.R
-import com.guadou.lib_baselib.base.activity.BaseVMActivity
-import com.guadou.lib_baselib.utils.CommUtils
-import com.hongyegroup.auth.mvvm.AuthViewModel
-
-class AuthActivity : BaseVMActivity<AuthViewModel>() {
-
-    companion object {
-        fun startInstance() {
-            val context = CommUtils.getContext()
-            val intent = Intent(context, AuthActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-
-    override fun startObserve() {
-
-    }
-
-    override fun getLayoutIdRes(): Int =
-        R.layout.activity_auth
-
-    override fun init() {
-
-        mViewModel.getServiceTime()
-
-//        YYLogUtils.e("viewmodel:" + mViewModel.toString())
-//        YYLogUtils.e("userServer:" + userServer.toString())
-//        userServer.testUser()
-//
-//        btn_login.setOnClickListener {
-//            mViewModel.getServiceTime()
-//        }
-    }
-
-}

cpt_auth/src/main/java/com/hongyegroup/auth/ui/LoginFragment.kt

@@ -1,19 +0,0 @@
-package com.hongyegroup.auth.ui
-
-import com.guadou.cpt_main.R
-import com.guadou.lib_baselib.base.fragment.BaseVMFragment
-import com.guadou.lib_baselib.base.vm.EmptyViewModel
-
-class LoginFragment : BaseVMFragment<EmptyViewModel>() {
-
-    override fun getLayoutIdRes(): Int = R.layout.fragment_login
-
-
-    override fun startObserve() {
-
-    }
-
-    override fun init() {
-
-    }
-}

cpt_auth/src/main/res/layout/activity_auth.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/d_45dp"
-        app:Easy_title="Main" />
-
-    <Button
-        android:id="@+id/btn_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="登录" />
-
-
-
-</LinearLayout>

cpt_auth/src/main/res/layout/fragment_login.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:Easy_title="Login" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/d_300dp"
-        android:gravity="center"
-        android:text="Login的页面" />
-
-
-    <Button
-        android:id="@+id/btn_back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:text="返回" />
-
-</LinearLayout>

cpt_auths/.gitignore

@@ -0,0 +1 @@
+/build

cpt_auth/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'dagger.hilt.android.plugin'
 
 android {
     compileSdkVersion versions.compileSdk
@@ -64,10 +64,10 @@ dependencies {
     androidTestImplementation deps.android.test_junit
     androidTestImplementation deps.android.test_espresso
     //依赖注入
-//    implementation deps.support.hilt
-//    kapt deps.support.hilt_kapt
-//    implementation deps.support.hilt_vm
-//    kapt deps.support.hilt_vm_kapt
+    implementation deps.support.hilt
+    kapt deps.support.hilt_kapt
+    implementation deps.support.hilt_vm
+    kapt deps.support.hilt_vm_kapt
 
 
     api project(':cs_cptServices')

cpt_personal/proguard-rules.pro

@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile

cpt_auth/src/androidTest/java/com/guadou/cpt_main/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.guadou.cpt_main
+package com.hongyegroup.cpt_auths
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.guadou.cpt_main.test", appContext.packageName)
+        assertEquals("com.hongyegroup.cpt_auths", appContext.packageName)
     }
-}
+}

cpt_auths/src/main/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.hongyegroup.cpt_auths">
+
+    <application android:allowBackup="true">
+
+        <activity android:name=".ui.ChooseAuthActivity" />
+
+
+    </application>
+
+</manifest>

cpt_auth/src/main/java/com/hongyegroup/auth/bean/ServerTimeBean.kt

@@ -1,3 +1,3 @@
-package com.hongyegroup.auth.bean
+package com.hongyegroup.cpt_auths.bean
 
 data class ServerTimeBean(val timestamps: Long)

cpt_auths/src/main/java/com/hongyegroup/cpt_auths/di/MemberDao.kt

@@ -0,0 +1,12 @@
+package com.hongyegroup.cpt_auths.di
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MemberDao @Inject constructor() {
+
+    fun printUser(): String {
+        return "User Name"
+    }
+}

cpt_auths/src/main/java/com/hongyegroup/cpt_auths/di/MemberServer.kt

@@ -0,0 +1,15 @@
+package com.hongyegroup.cpt_auths.di
+
+import com.guadou.lib_baselib.ext.toast
+import com.guadou.lib_baselib.utils.Log.YYLogUtils
+import dagger.hilt.android.scopes.ActivityScoped
+import javax.inject.Inject
+
+@ActivityScoped
+class MemberServer @Inject constructor(val userDao: MemberDao) {
+
+    fun testUser() {
+        YYLogUtils.w(userDao.printUser() + userDao.toString())
+        toast(userDao.printUser())
+    }
+}

cpt_auth/src/main/java/com/hongyegroup/auth/http/MainApiService.kt

@@ -1,7 +1,7 @@
-package com.hongyegroup.auth.http
+package com.hongyegroup.cpt_auths.http
 
 import com.guadou.testxiecheng.base.BaseBean
-import com.hongyegroup.auth.bean.ServerTimeBean
+import com.hongyegroup.cpt_auths.bean.ServerTimeBean
 import retrofit2.http.GET
 import retrofit2.http.Header
 

cpt_auth/src/main/java/com/hongyegroup/auth/http/MainRetrofit.kt

@@ -1,4 +1,4 @@
-package com.hongyegroup.auth.http
+package com.hongyegroup.cpt_auths.http
 
 import com.guadou.cs_cptservices.Constants
 import com.guadou.lib_baselib.base.BaseRetrofitClient

cpt_auth/src/main/java/com/hongyegroup/auth/mvvm/AuthRepository.kt

@@ -1,14 +1,15 @@
-package com.hongyegroup.auth.mvvm
+package com.hongyegroup.cpt_auths.mvvm
 
 import com.guadou.cs_cptservices.Constants
 import com.guadou.lib_baselib.base.vm.BaseRepository
 import com.guadou.testxiecheng.base.OkResult
-import com.hongyegroup.auth.bean.ServerTimeBean
-import com.hongyegroup.auth.http.MainRetrofit
+import com.hongyegroup.cpt_auths.bean.ServerTimeBean
+import com.hongyegroup.cpt_auths.http.MainRetrofit
+import javax.inject.Inject
+import javax.inject.Singleton
 
-
-
-class AuthRepository  constructor() : BaseRepository() {
+@Singleton
+class AuthRepository @Inject constructor() : BaseRepository() {
 
     suspend fun getServerTime(): OkResult<ServerTimeBean> {
         return handleErrorApiCall({

cpt_auth/src/main/java/com/hongyegroup/auth/mvvm/AuthViewModel.kt

@@ -1,11 +1,12 @@
-package com.hongyegroup.auth.mvvm
+package com.hongyegroup.cpt_auths.mvvm
 
+import androidx.hilt.lifecycle.ViewModelInject
 import com.guadou.lib_baselib.base.vm.BaseViewModel
 import com.guadou.lib_baselib.ext.toast
 
-class AuthViewModel constructor() : BaseViewModel() {
-
-    private val mAuthRepository: AuthRepository by lazy { AuthRepository() }
+class AuthViewModel @ViewModelInject constructor(
+    private val mAuthRepository: AuthRepository
+) : BaseViewModel() {
 
     fun getServiceTime() {
 

cpt_auth/src/main/java/com/hongyegroup/auth/router/AuthComponentImpl.kt

@@ -1,14 +1,14 @@
-package com.hongyegroup.auth.router
+package com.hongyegroup.cpt_auths.router
 
 import com.guadou.cs_router.auth.IAuthComponentServer
-import com.hongyegroup.auth.ui.AuthActivity
+import com.hongyegroup.cpt_auths.ui.ChooseAuthActivity
 import io.github.prototypez.appjoint.core.ServiceProvider
 
 @ServiceProvider
 class AuthComponentImpl : IAuthComponentServer {
 
     override fun startChooseRoleActivity() {
-        AuthActivity.startInstance()
+        ChooseAuthActivity.startInstance()
     }
 
 }

cpt_auths/src/main/java/com/hongyegroup/cpt_auths/ui/ChooseAuthActivity.kt

@@ -0,0 +1,50 @@
+package com.hongyegroup.cpt_auths.ui
+
+import android.content.Intent
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.ext.click
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_auths.BR
+import com.hongyegroup.cpt_auths.R
+import com.hongyegroup.cpt_auths.databinding.ActivityChooseAuthBinding
+import com.hongyegroup.cpt_auths.di.MemberServer
+import com.hongyegroup.cpt_auths.mvvm.AuthViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ChooseAuthActivity : BaseVDBActivity<AuthViewModel, ActivityChooseAuthBinding>() {
+
+    @Inject
+    lateinit var userServer: MemberServer
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, ChooseAuthActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+        return DataBindingConfig(R.layout.activity_choose_auth, BR.viewModel, mViewModel)
+    }
+
+    override fun startObserve() {
+
+    }
+
+    override fun init() {
+
+        userServer.testUser()
+
+        mBinding.btnLogin.click {
+            mViewModel.getServiceTime()
+        }
+
+    }
+
+
+}

cpt_auths/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

cpt_auths/src/main/res/layout/activity_choose_auth.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="RtlHardcoded">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.hongyegroup.cpt_auths.mvvm.AuthViewModel" />
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <com.guadou.lib_baselib.view.titlebar.EasyTitleBar
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_45dp"
+            app:Easy_title="Main" />
+
+        <Button
+            android:id="@+id/btn_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="登录" />
+
+
+    </LinearLayout>
+
+</layout>

cpt_auths/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+</resources>

cpt_auth/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
 
-</resources>
+</resources>

cpt_personal/src/test/java/com/guadou/cpt_main/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.guadou.cpt_main
+package com.hongyegroup.cpt_auths
 
 import org.junit.Test
 
@@ -14,4 +14,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}

cpt_business/.gitignore

@@ -1 +1 @@
-/build
+/build

cpt_business/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'dagger.hilt.android.plugin'
 
 android {
     compileSdkVersion versions.compileSdk
@@ -64,12 +64,12 @@ dependencies {
     androidTestImplementation deps.android.test_junit
     androidTestImplementation deps.android.test_espresso
     //依赖注入
-//    implementation deps.support.hilt
-//    kapt deps.support.hilt_kapt
-//    implementation deps.support.hilt_vm
-//    kapt deps.support.hilt_vm_kapt
+    implementation deps.support.hilt
+    kapt deps.support.hilt_kapt
+    implementation deps.support.hilt_vm
+    kapt deps.support.hilt_vm_kapt
 
 
-    api project(':cs_cptServices')
+    implementation project(':cs_cptServices')
 
 }

cpt_business/proguard-rules.pro

@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile

cpt_personal/src/androidTest/java/com/guadou/cpt_main/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.guadou.cpt_main
+package com.hongyegroup.cpt_business
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.guadou.cpt_main.test", appContext.packageName)
+        assertEquals("com.hongyegroup.cpt_business", appContext.packageName)
     }
-}
+}

cpt_business/src/main/AndroidManifest.xml

@@ -1,8 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guadou.cpt_main" >
+    package="com.hongyegroup.cpt_business">
 
-    <application>
+    <application android:allowBackup="true">
+
+        <activity android:name=".BusinessMainActivity" />
 
     </application>
 
-</manifest>
+</manifest>

cpt_business/src/main/java/com/hongyegroup/business/http/BusinessApiService.kt

@@ -1,6 +0,0 @@
-package com.hongyegroup.business.http
-
-interface BusinessApiService {
-
-
-}

cpt_business/src/main/java/com/hongyegroup/business/http/BusinessRetrofit.kt

@@ -1,12 +0,0 @@
-package com.hongyegroup.auth.http
-
-import com.guadou.cs_cptservices.Constants
-import com.guadou.lib_baselib.base.BaseRetrofitClient
-import com.hongyegroup.business.http.BusinessApiService
-
-object BusinessRetrofit : BaseRetrofitClient() {
-
-    //默认的ApiService
-    val apiService by lazy { getService(BusinessApiService::class.java, Constants.BASE_URL) }
-
-}

cpt_business/src/main/java/com/hongyegroup/cpt_business/BusinessMainActivity.kt

@@ -0,0 +1,37 @@
+package com.hongyegroup.cpt_business
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.EmptyViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_business.databinding.ActivityBusinessMainBinding
+
+class BusinessMainActivity : BaseVDBActivity<EmptyViewModel, ActivityBusinessMainBinding>() {
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, BusinessMainActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+        return DataBindingConfig(R.layout.activity_business_main)
+    }
+
+    override fun startObserve() {
+
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun init() {
+
+        mBinding.tvMainText.setText("Business Main Page")
+    }
+
+
+}

cpt_business/src/main/java/com/hongyegroup/cpt_business/router/BusinessComponentImpl.kt

@@ -0,0 +1,14 @@
+package com.hongyegroup.cpt_business.router
+
+import com.guadou.cs_router.business.IBusinessComponentServer
+import com.hongyegroup.cpt_business.BusinessMainActivity
+import io.github.prototypez.appjoint.core.ServiceProvider
+
+@ServiceProvider
+class BusinessComponentImpl : IBusinessComponentServer {
+
+    override fun startBusinessMainActivity() {
+        BusinessMainActivity.startInstance()
+    }
+
+}

cpt_business/src/main/res/layout/activity_business_main.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="RtlHardcoded">
+
+    <data>
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        tools:context=".BusinessMainActivity">
+
+        <TextView
+            android:id="@+id/tv_main_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Hello world"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

cpt_business/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+</resources>

cpt_business/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
 
-</resources>
+
+</resources>

cpt_auth/src/test/java/com/guadou/cpt_main/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.guadou.cpt_main
+package com.hongyegroup.cpt_business
 
 import org.junit.Test
 
@@ -14,4 +14,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}

cpt_pensonal/.gitignore

@@ -0,0 +1 @@
+/build

cpt_personal/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'dagger.hilt.android.plugin'
 
 android {
     compileSdkVersion versions.compileSdk
@@ -64,12 +64,12 @@ dependencies {
     androidTestImplementation deps.android.test_junit
     androidTestImplementation deps.android.test_espresso
     //依赖注入
-//    implementation deps.support.hilt
-//    kapt deps.support.hilt_kapt
-//    implementation deps.support.hilt_vm
-//    kapt deps.support.hilt_vm_kapt
+    implementation deps.support.hilt
+    kapt deps.support.hilt_kapt
+    implementation deps.support.hilt_vm
+    kapt deps.support.hilt_vm_kapt
 
 
-    api project(':cs_cptServices')
+    implementation project(':cs_cptServices')
 
 }

cpt_auth/proguard-rules.pro

@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile

cpt_business/src/androidTest/java/com/guadou/cpt_main/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.guadou.cpt_main
+package com.hongyegroup.cpt_pensonal
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.guadou.cpt_main.test", appContext.packageName)
+        assertEquals("com.hongyegroup.cpt_pensonal", appContext.packageName)
     }
-}
+}

cpt_pensonal/src/main/AndroidManifest.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.hongyegroup.cpt_pensonal">
+
+    <application android:allowBackup="true">
+
+        <activity android:name=".PensonalMainActivity" />
+
+    </application>
+
+</manifest>

cpt_pensonal/src/main/java/com/hongyegroup/cpt_pensonal/PensonalMainActivity.kt

@@ -0,0 +1,37 @@
+package com.hongyegroup.cpt_pensonal
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import com.guadou.lib_baselib.base.activity.BaseVDBActivity
+import com.guadou.lib_baselib.base.vm.EmptyViewModel
+import com.guadou.lib_baselib.bean.DataBindingConfig
+import com.guadou.lib_baselib.utils.CommUtils
+import com.hongyegroup.cpt_pensonal.databinding.ActivityPensonalMainBinding
+
+class PensonalMainActivity : BaseVDBActivity<EmptyViewModel, ActivityPensonalMainBinding>() {
+
+    companion object {
+        fun startInstance() {
+            val context = CommUtils.getContext()
+            val intent = Intent(context, PensonalMainActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun getDataBindingConfig(): DataBindingConfig {
+        return DataBindingConfig(R.layout.activity_pensonal_main)
+    }
+
+    override fun startObserve() {
+
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun init() {
+
+        mBinding.tvMainText.setText("Pensonal Main Page")
+    }
+
+
+}

cpt_pensonal/src/main/java/com/hongyegroup/cpt_pensonal/router/PensonalComponentImpl.kt

@@ -0,0 +1,15 @@
+package com.hongyegroup.cpt_pensonal.router
+
+import com.guadou.cs_router.pensonal.IPensonalComponentServer
+import com.hongyegroup.cpt_pensonal.PensonalMainActivity
+import io.github.prototypez.appjoint.core.ServiceProvider
+
+@ServiceProvider
+class PensonalComponentImpl : IPensonalComponentServer {
+
+    override fun startPensonalMainActivity() {
+
+        PensonalMainActivity.startInstance()
+    }
+
+}

cpt_pensonal/src/main/res/layout/activity_pensonal_main.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="RtlHardcoded">
+
+    <data>
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        tools:context=".BusinessMainActivity">
+
+        <TextView
+            android:id="@+id/tv_main_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Hello world"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

cpt_pensonal/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+</resources>

cpt_personal/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
 
-</resources>
+</resources>

cpt_business/src/test/java/com/guadou/cpt_main/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.guadou.cpt_main
+package com.hongyegroup.cpt_pensonal
 
 import org.junit.Test
 
@@ -14,4 +14,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}

cpt_personal/.gitignore

@@ -1 +0,0 @@
-/build

cpt_personal/src/main/AndroidManifest.xml

@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guadou.cpt_main" >
-
-    <application>
-
-    </application>
-
-</manifest>

cpt_personal/src/main/java/com/hongyegroup/personal/http/BusinessApiService.kt

@@ -1,6 +0,0 @@
-package com.hongyegroup.personal.http
-
-interface BusinessApiService {
-
-
-}

cpt_personal/src/main/java/com/hongyegroup/personal/http/BusinessRetrofit.kt

@@ -1,11 +0,0 @@
-package com.hongyegroup.personal.http
-
-import com.guadou.cs_cptservices.Constants
-import com.guadou.lib_baselib.base.BaseRetrofitClient
-
-object BusinessRetrofit : BaseRetrofitClient() {
-
-    //默认的ApiService
-    val apiService by lazy { getService(BusinessApiService::class.java, Constants.BASE_URL) }
-
-}

cs_baselib/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'dagger.hilt.android.plugin'
 
 android {
     compileSdkVersion versions.compileSdk
@@ -109,10 +109,10 @@ dependencies {
     kapt deps.support.glide_compiler
 
     //Hilt依赖与扩展
-//    implementation deps.support.hilt
-//    kapt deps.support.hilt_kapt
-//    implementation deps.support.hilt_vm
-//    kapt deps.support.hilt_vm_kapt
+    implementation deps.support.hilt
+    kapt deps.support.hilt_kapt
+    implementation deps.support.hilt_vm
+    kapt deps.support.hilt_vm_kapt
 
     //网络相关
     api deps.support.retrofit2

cs_baselib/src/main/java/com/guadou/lib_baselib/base/vm/EmptyViewModel.kt

@@ -1,6 +1,7 @@
 package com.guadou.lib_baselib.base.vm
 
+import androidx.hilt.lifecycle.ViewModelInject
+import javax.inject.Singleton
 
-
-
-class EmptyViewModel constructor() : BaseViewModel()
+@Singleton
+class EmptyViewModel @ViewModelInject constructor() : BaseViewModel()

cs_baselib/src/main/java/com/guadou/lib_baselib/font_text_view/FontCache.java

@@ -5,9 +5,6 @@ import android.graphics.Typeface;
 
 import java.util.HashMap;
 
-/**
- * Created by C02TVKSDHV27 on 02/08/2017.
- */
 
 public class FontCache {
 

cs_baselib/src/main/java/com/guadou/lib_baselib/font_text_view/TextViewFlower.java

@@ -8,7 +8,6 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 
 /**
- * Created by roselle.elefante on 02/08/2017.
  * 标题花体字
  */
 

cs_baselib/src/main/java/com/guadou/lib_baselib/font_text_view/TextViewLight.java

@@ -8,7 +8,6 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 
 /**
- * Created by roselle.elefante on 02/08/2017.
  * Custom TextView for Light
  */
 
@@ -30,7 +29,7 @@ public class TextViewLight extends TextView {
     }
 
     private void applyCustomFont(Context context) {
-        Typeface customFont = FontCache.getTypeface("SF-UI-Text-Light.otf", context);
+        Typeface customFont = FontCache.getTypeface("MyriadPro-Light.ttf", context);
         setTypeface(customFont);
     }
 }

cs_baselib/src/main/java/com/guadou/lib_baselib/font_text_view/TextViewRegular.java

@@ -8,8 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 
 /**
- * Created by roselle.elefante on 02/08/2017.
- * Custom TextView for Regular
+ * Custom TextView for Light
  */
 
 public class TextViewRegular extends TextView {
@@ -30,7 +29,7 @@ public class TextViewRegular extends TextView {
     }
 
     private void applyCustomFont(Context context) {
-        Typeface customFont = FontCache.getTypeface("San-Francisco-Display-Regular.ttf", context);
+        Typeface customFont = FontCache.getTypeface("MyriadPro-Regular.otf", context);
         setTypeface(customFont);
     }
 }

cs_baselib/src/main/java/com/guadou/lib_baselib/font_text_view/TextViewSemiBold.java

@@ -7,25 +7,29 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-public class TextViewSemiBold extends TextView {
+/**
+ * 加粗
+ */
 
-    public TextViewSemiBold(Context context) {
+public class TextViewSBold extends TextView {
+
+    public TextViewSBold(Context context) {
         super(context);
         applyCustomFont(context);
     }
 
-    public TextViewSemiBold(Context context, @Nullable AttributeSet attrs) {
+    public TextViewSBold(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         applyCustomFont(context);
     }
 
-    public TextViewSemiBold(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public TextViewSBold(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         applyCustomFont(context);
     }
 
     private void applyCustomFont(Context context) {
-        Typeface customFont = FontCache.getTypeface("SanFranciscoText-Semibold.otf", context);
+        Typeface customFont = FontCache.getTypeface("MyriadPro-Semibold.ttf", context);
         setTypeface(customFont);
     }
 }

cs_baselib/src/main/java/com/guadou/lib_baselib/font_text_view/TextViewMedium.java

@@ -8,29 +8,28 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 
 /**
- * Created by roselle.elefante on 02/08/2017.
- * Custom TextView for Medium
+ * 加粗斜体
  */
 
-public class TextViewMedium extends TextView {
+public class TextViewSBoldIt extends TextView {
 
-    public TextViewMedium(Context context) {
+    public TextViewSBoldIt(Context context) {
         super(context);
         applyCustomFont(context);
     }
 
-    public TextViewMedium(Context context, @Nullable AttributeSet attrs) {
+    public TextViewSBoldIt(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         applyCustomFont(context);
     }
 
-    public TextViewMedium(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public TextViewSBoldIt(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         applyCustomFont(context);
     }
 
     private void applyCustomFont(Context context) {
-        Typeface customFont = FontCache.getTypeface("San-Francisco-Display-Medium.ttf", context);
+        Typeface customFont = FontCache.getTypeface("MyriadPro-SemiboldIt.ttf", context);
         setTypeface(customFont);
     }
 }

cs_baselib/src/main/java/com/guadou/lib_baselib/font_text_view/TypefaceUtil.java

@@ -10,22 +10,23 @@ import android.graphics.Typeface;
 public class TypefaceUtil {
 
     public static Typeface getSFLight(Context context) {
-        return FontCache.getTypeface("SF-UI-Text-Light.otf", context);
-    }
-
-    public static Typeface getSFMedium(Context context) {
-        return FontCache.getTypeface("San-Francisco-Display-Medium.ttf", context);
+        return FontCache.getTypeface("MyriadPro-Light.ttf", context);
     }
 
     public static Typeface getSFRegular(Context context) {
-        return FontCache.getTypeface("San-Francisco-Display-Regular.ttf", context);
+        return FontCache.getTypeface("MyriadPro-Regular.otf", context);
     }
 
-    public static Typeface getSFFlower(Context context) {
+    public static Typeface getSFFollow(Context context) {
         return FontCache.getTypeface("IBMPlexSerif-Medium.ttf", context);
     }
 
-    public static Typeface getSFSemobold(Context context) {
-        return FontCache.getTypeface("SanFranciscoText-Semibold.otf", context);
+    public static Typeface getSFBold(Context context) {
+        return FontCache.getTypeface("MyriadPro-Semibold.ttf", context);
     }
+
+    public static Typeface getSFBoldItalics(Context context) {
+        return FontCache.getTypeface("MyriadPro-SemiboldIt.ttf", context);
+    }
+
 }

cs_cptServices/src/main/java/com/guadou/cs_cptservices/binding/BindingTextView.kt

@@ -46,6 +46,11 @@ fun isCenterLine(textView: TextView, isUnderline: Boolean) {
 /**
  * 设置字体
  */
+@BindingAdapter("typefaceFlower")
+fun TypefaceFlower(textView: TextView, boolean: Boolean) {
+    textView.typeface = TypefaceUtil.getSFFollow(textView.context)
+}
+
 @BindingAdapter("typefaceLight")
 fun TypefaceLight(textView: TextView, boolean: Boolean) {
     textView.typeface = TypefaceUtil.getSFLight(textView.context)
@@ -57,18 +62,13 @@ fun TypefaceRegular(textView: TextView, boolean: Boolean) {
 }
 
 @BindingAdapter("typefaceMedium")
-fun TypefaceMedium(textView: TextView, boolean: Boolean) {
-    textView.typeface = TypefaceUtil.getSFMedium(textView.context)
-}
-
-@BindingAdapter("typefaceFlower")
-fun TypefaceFlower(textView: TextView, boolean: Boolean) {
-    textView.typeface = TypefaceUtil.getSFFlower(textView.context)
+fun TypefaceSFBold(textView: TextView, boolean: Boolean) {
+    textView.typeface = TypefaceUtil.getSFBold(textView.context)
 }
 
 @BindingAdapter("typefaceSemiBold")
-fun TypefaceSemiBold(textView: TextView, boolean: Boolean) {
-    textView.typeface = TypefaceUtil.getSFSemobold(textView.context)
+fun TypefaceSFBoldItalics(textView: TextView, boolean: Boolean) {
+    textView.typeface = TypefaceUtil.getSFBoldItalics(textView.context)
 }
 
 @BindingAdapter("setRightDrawable")

cs_router/src/main/java/com/guadou/cs_router/YYRouterService.kt

@@ -3,6 +3,8 @@ package com.guadou.cs_router
 
 import com.guadou.cs_router.app.IAppComponentServer
 import com.guadou.cs_router.auth.IAuthComponentServer
+import com.guadou.cs_router.business.IBusinessComponentServer
+import com.guadou.cs_router.pensonal.IPensonalComponentServer
 
 import io.github.prototypez.appjoint.AppJoint
 
@@ -12,5 +14,9 @@ object YYRouterService {
 
     var mainComponentServer = AppJoint.service(IAuthComponentServer::class.java)
 
+    var businessComponentServer = AppJoint.service(IBusinessComponentServer::class.java)
+
+    var pensonalComponentServer = AppJoint.service(IPensonalComponentServer::class.java)
+
 
 }

cs_router/src/main/java/com/guadou/cs_router/business/IBusinessComponentServer.kt

@@ -0,0 +1,7 @@
+package com.guadou.cs_router.business
+
+interface IBusinessComponentServer {
+
+    fun startBusinessMainActivity()
+
+}

cs_router/src/main/java/com/guadou/cs_router/pensonal/IPensonalComponentServer.kt

@@ -0,0 +1,7 @@
+package com.guadou.cs_router.pensonal
+
+interface IPensonalComponentServer {
+
+    fun startPensonalMainActivity()
+
+}

settings.gradle

@@ -1,9 +1,8 @@
-
 include ':app',
         ':cs_router',
         ':cs_baselib',
         ':cs_cptServices',
 
-        ':cpt_auth',
+        ':cpt_auths',
         ':cpt_business',
-        ':cpt_personal'
+        ':cpt_pensonal'