登陆页跳转主页

BaseLibrary/src/main/java/com/cooleshow/base/common/BaseApplication.kt

@@ -7,6 +7,7 @@ import com.cooleshow.base.injection.component.AppComponent
 import com.cooleshow.base.injection.component.DaggerAppComponent
 import com.cooleshow.base.injection.module.AppModule
 
+
 /*
     Application 基类
  */
@@ -23,10 +24,14 @@ open class BaseApplication : Application() {
         //ARouter初始化
         ARouter.openLog()    // 打印日志
         ARouter.openDebug()
+        ARouter.printStackTrace()
         ARouter.init(this)
+
     }
 
 
+
+
     /*
         Application Component初始化
      */

BaseLibrary/src/main/java/com/cooleshow/base/ext/CommonExt.kt

@@ -1,7 +1,6 @@
 package com.cooleshow.base.ext
 
 import android.content.Context
-import android.graphics.drawable.AnimationDrawable
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
@@ -9,7 +8,6 @@ import android.widget.ImageView
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 
-import com.cooleshow.base.R
 import com.cooleshow.base.data.protocol.BaseResp
 import com.cooleshow.base.rx.BaseFunc
 import com.cooleshow.base.rx.BaseFuncBoolean

BaseLibrary/src/main/java/com/cooleshow/base/ui/activity/BaseMvpActivity.kt

@@ -1,6 +1,9 @@
 package com.cooleshow.base.ui.activity
 
+import android.content.Context
 import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
 import com.alibaba.android.arouter.launcher.ARouter
 import com.cooleshow.base.ui.activity.BaseActivity
 import com.cooleshow.base.common.BaseApplication
@@ -38,6 +41,7 @@ abstract open class BaseMvpActivity<T : BasePresenter<*>> : BaseActivity(), Base
         ARouter.getInstance().inject(this)
     }
 
+
     /*
         Dagger注册
      */

Provider/build.gradle

@@ -47,7 +47,6 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation project(':BaseLibrary')
 
-//    api "com.alibaba:arouter-api:$arouter_api_version"
-//    kapt "com.alibaba:arouter-compiler:$arouter_api_version"
+
 }
 

Provider/src/main/java/com/cooleshow/provider/router/RouterPath.kt

@@ -4,13 +4,25 @@ package com.cooleshow.provider.router
     模块路由 路径定义
  */
 object RouterPath{
+
+    //主页面
+    class APPCenter{
+        companion object {
+            const val PATH_HOME = "/appCenter/home"
+
+        }
+    }
+
     //用户模块
     class UserCenter{
         companion object {
             const val PATH_LOGIN = "/userCenter/login"
+
         }
     }
 
+
+
     //订单模块
     class OrderCenter{
         companion object {

app/build.gradle

@@ -4,6 +4,14 @@ plugins {
 
 }
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+kapt {
+    arguments {
+        arg("AROUTER_MODULE_NAME", project.getName())
+        // 是否生成路由文档，"enable"：生成文档，其他字符串不生成路由文档
+        arg("AROUTER_GENERATE_DOC", "enable")
+    }
+}
 android {
     compileSdk 31
 
@@ -24,15 +32,7 @@ android {
         }
     }
 
-//    sourceSets {
-//        main {
-//            if (isUserModule.toBoolean()) {
-//                manifest.srcFile 'src/main/release/AndroidManifest.xml'
-//            } else {
-//                manifest.srcFile 'src/main/debug/AndroidManifest.xml'
-//            }
-//        }
-//    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -47,10 +47,6 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
@@ -59,6 +55,8 @@ dependencies {
     implementation project(path: ':BaseLibrary')
 
     if (isUserModule.toBoolean()){
-        implementation project(':usercenter')
+        implementation project(path:':usercenter')
     }
+    implementation "com.alibaba:arouter-api:$arouter_api_version"
+    kapt "com.alibaba:arouter-compiler:$arouter_api_version"
 }

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     package="com.example.cooleshow">
 
     <application
+        android:name=".common.MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -12,8 +13,11 @@
         tools:node="replace"
         android:theme="@style/Theme.CooleShow">
         <activity
-            android:name=".uI.activity.MainActivity"
+            android:name="com.example.cooleshow.ui.activity.MainActivity"
             android:exported="true">
+
+        </activity>
+        <activity android:name="com.cooleshow.usercenter.ui.activity.LoginActivity" android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/example/cooleshow/common/MainApplication.kt

@@ -0,0 +1,18 @@
+package com.example.cooleshow.common
+
+import com.alibaba.android.arouter.launcher.ARouter
+import com.cooleshow.base.common.BaseApplication
+
+/*
+    主工程 Application
+ */
+class MainApplication: BaseApplication() {
+    override fun onCreate() {
+        super.onCreate()
+
+        //极光推送初始化
+//        JPushInterface.setDebugMode(true)
+//        JPushInterface.init(this)
+        ARouter.init(this)
+    }
+}

app/src/main/java/com/example/cooleshow/uI/activity/MainActivity.kt

@@ -1,19 +1,21 @@
-package com.example.cooleshow.uI.activity
+package com.example.cooleshow.ui.activity
 
 import android.os.Bundle
-import android.widget.EditText
 import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.cooleshow.base.common.AppManager
 import com.cooleshow.base.ext.showToast
 import com.cooleshow.base.ui.activity.BaseActivity
+import com.cooleshow.provider.router.RouterPath
 import com.example.cooleshow.R
-import com.example.cooleshow.uI.fragment.HomeFragment
-import com.example.cooleshow.uI.fragment.MeFragment
+import com.example.cooleshow.ui.fragment.HomeFragment
+import com.example.cooleshow.ui.fragment.MeFragment
 import java.util.*
 
 import kotlinx.android.synthetic.main.activity_main.*
 
+@Route(path = RouterPath.APPCenter.PATH_HOME)
 class MainActivity :BaseActivity() {
 
 

app/src/main/java/com/example/cooleshow/uI/fragment/HomeFragment.kt

@@ -1,4 +1,5 @@
-package com.example.cooleshow.uI.fragment
+package com.example.cooleshow.ui.fragment
+
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,6 +9,7 @@ import com.cooleshow.base.ui.fragment.BaseFragment
 import com.example.cooleshow.R
 
 
+
 /*
     主界面Fragment
  */
@@ -15,76 +17,21 @@ class HomeFragment: BaseFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container,savedInstanceState)
+
         return inflater.inflate(R.layout.fragment_home,null)
     }
 
-//    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
-//        super.onViewCreated(view, savedInstanceState)
-//        initView()
-//        initBanner()
-//        initNews()
-//        initDiscount()
-//        initTopic()
-//    }
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initView()
+    }
 
     /*
         初始化视图
      */
-//    private fun initView() {
-//        mSearchEt.onClick {
-//            startActivity<SearchGoodsActivity>()
-//        }
-//
-//        mScanIv.onClick {
-//            toast(R.string.coming_soon_tip)
-//        }
-//    }
-
-    /*
-        初始化Banner
-     */
-//    private fun initBanner() {
-//        mHomeBanner.setImageLoader(BannerImageLoader())
-//        mHomeBanner.setImages(listOf(HOME_BANNER_ONE, HOME_BANNER_TWO, HOME_BANNER_THREE, HOME_BANNER_FOUR))
-//        mHomeBanner.setBannerAnimation(Transformer.Accordion)
-//        mHomeBanner.setDelayTime(2000)
-//        //设置指示器位置（当banner模式中有指示器时）
-//        mHomeBanner.setIndicatorGravity(BannerConfig.RIGHT)
-//        //banner设置方法全部调用完毕时最后调用
-//        mHomeBanner.start()
-//
-//    }
+    private fun initView() {
 
-    /*
-        初始化公告
-     */
-//    private fun initNews(){
-//        //公告
-//        mNewsFlipperView.setData(arrayOf("夏日炎炎，第一波福利还有30秒到达战场", "新用户立领1000元优惠券"))
-//    }
 
-    /*
-        初始化折扣
-     */
-//    private fun initDiscount(){
-//        val manager = LinearLayoutManager(context)
-//        manager.orientation = LinearLayoutManager.HORIZONTAL
-//        mHomeDiscountRv.layoutManager = manager
-//
-//        val discountAdapter  = HomeDiscountAdapter(activity)
-//        mHomeDiscountRv.adapter = discountAdapter
-//        discountAdapter.setData(mutableListOf(HOME_DISCOUNT_ONE, HOME_DISCOUNT_TWO, HOME_DISCOUNT_THREE, HOME_DISCOUNT_FOUR, HOME_DISCOUNT_FIVE))
-//    }
+    }
 
-    /*
-        初始化主题
-     */
-//    private fun initTopic(){
-//        //话题
-//        mTopicPager.adapter = TopicAdapter(context, listOf(HOME_TOPIC_ONE, HOME_TOPIC_TWO, HOME_TOPIC_THREE, HOME_TOPIC_FOUR, HOME_TOPIC_FIVE))
-//        mTopicPager.currentItem = 1
-//        mTopicPager.offscreenPageLimit = 5
-//
-//        CoverFlow.Builder().with(mTopicPager).scale(0.3f).pagerMargin(-30.0f).spaceSize(0.0f).build()
-//    }
 }

app/src/main/java/com/example/cooleshow/uI/fragment/MeFragment.kt

@@ -1,4 +1,4 @@
-package com.example.cooleshow.uI.fragment
+package com.example.cooleshow.ui.fragment
 
 import android.os.Bundle
 import android.view.LayoutInflater

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

@@ -4,6 +4,7 @@
     android:layout_height="match_parent">
 
     <TextView
+        android:id="@+id/tv"
         android:text="主页"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"></TextView>

build.gradle

@@ -36,13 +36,12 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.alibaba:arouter-register:1.0.2"
+//        classpath "com.alibaba:arouter-register:1.0.2"
     }
 }
 
 allprojects {
     repositories {
-     
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }

gradle.properties

@@ -25,4 +25,4 @@ android.enableJetifier=true
 kapt.use.worker.api=false
 kapt.incremental.apt=false
 
-isUserModule = false
+isUserModule = true

usercenter/build.gradle

@@ -8,17 +8,17 @@ if (isUserModule.toBoolean()) {
 } else {
     apply plugin: 'com.android.application'
 }
-apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'org.jetbrains.kotlin.android'
 
 kapt {
     arguments {
-        arg("moduleName", project.getName())
+        arg("AROUTER_MODULE_NAME", project.getName())
+        // 是否生成路由文档，"enable"：生成文档，其他字符串不生成路由文档
+        arg("AROUTER_GENERATE_DOC", "enable")
     }
 }
-
 android {
     compileSdkVersion 31
     defaultConfig {
@@ -28,14 +28,14 @@ android {
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        kapt {
-            arguments {
-                //根据模块名来命名路由根节点
-                arg("AROUTER_MODULE_NAME", project.getName())
-                //生成Json文件
-                arg("AROUTER_GENERATE_DOC", "enable")
-            }
-        }
+//        kapt {
+//            arguments {
+//                //根据模块名来命名路由根节点
+//                arg("AROUTER_MODULE_NAME", project.getName())
+//                //生成Json文件
+//                arg("AROUTER_GENERATE_DOC", "enable")
+//            }
+//        }
 
     }
 
@@ -70,9 +70,11 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation project(':Provider')
     implementation project(':BaseLibrary')

usercenter/src/main/debug/AndroidManifest.xml

@@ -3,30 +3,34 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.cooleshow.usercenter">
 
-    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-
     <application
-            android:name="com.cooleshow.base.common.BaseApplication"
-            android:allowBackup="true"
-            android:label="@string/app_name"
-            android:supportsRtl="true"
-            tools:replace="android:theme"
-            android:theme="@style/AppTheme">
-
-        <activity android:name=".ui.activity.LoginActivity"
-            android:exported="true">
+        android:name="com.cooleshow.base.common.BaseApplication"
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:replace="android:theme">
+        <activity android:name=".ui.activity.TestActivity" android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-<!--        <activity android:name=".ui.activity.RegisterActivity"/>-->
-<!--        <activity android:name=".ui.activity.ForgetPwdActivity"/>-->
-<!--        <activity android:name=".ui.activity.ResetPwdActivity"/>-->
-<!--        <activity android:name=".ui.activity.UserInfoActivity"/>-->
+        <activity
+            android:name=".ui.activity.LoginActivity"
+            android:exported="true">
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.MAIN" />-->
+
+            <!--                <category android:name="android.intent.category.LAUNCHER" />-->
+            <!--            </intent-filter>-->
+        </activity>
     </application>
 
-</manifest>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
+
+</manifest>

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/LoginActivity.kt

@@ -1,8 +1,11 @@
 package com.cooleshow.usercenter.ui.activity
 
 import android.os.Bundle
-import android.view.View
+import android.widget.Button
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.alibaba.android.arouter.launcher.ARouter
+import com.cooleshow.base.ext.onClick
+import com.cooleshow.base.ext.showToast
 import com.cooleshow.base.ui.activity.BaseMvpActivity
 import com.cooleshow.provider.router.RouterPath
 import com.cooleshow.usercenter.R
@@ -11,23 +14,17 @@ import com.cooleshow.usercenter.injection.component.DaggerUserComponent
 import com.cooleshow.usercenter.injection.module.UserModule
 import com.cooleshow.usercenter.presenter.LoginPresenter
 import com.cooleshow.usercenter.presenter.view.LoginView
+import kotlinx.android.synthetic.main.activity_login.*
 
 @Route(path = RouterPath.UserCenter.PATH_LOGIN)
-class LoginActivity : BaseMvpActivity<LoginPresenter>(), LoginView, View.OnClickListener{
-
+class LoginActivity : BaseMvpActivity<LoginPresenter>(), LoginView{
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
-
         initView()
     }
 
-    private fun initView() {
-
-
-    }
-
 
     override fun injectComponent() {
         DaggerUserComponent.builder()
@@ -38,11 +35,16 @@ class LoginActivity : BaseMvpActivity<LoginPresenter>(), LoginView, View.OnClick
         mPresenter.mView = this
     }
 
-    override fun onClick(v: View?) {
-        TODO("Not yet implemented")
-    }
 
     override fun onLoginResult(result: UserInfo) {
         TODO("Not yet implemented")
     }
+
+    private fun initView() {
+        mForgetPwdTv.onClick{
+            ARouter.getInstance().build(RouterPath.APPCenter.PATH_HOME).navigation()
+        }
+
+
+    }
 }

usercenter/src/main/release/AndroidManifest.xml

@@ -2,14 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cooleshow.usercenter">
 
-    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
 
-
+        <activity android:name="com.cooleshow.usercenter.ui.activity.LoginActivity" android:exported="true" />
     </application>
 
-</manifest>
+
+
+</manifest>

usercenter/src/main/res/layout/activity_login.xml

@@ -19,7 +19,9 @@
             android:hint="请输入手机号码"
             android:drawablePadding="@dimen/common_padding_small"
             android:inputType="phone"/>
+
         <View style="@style/DividerFixedHeight"/>
+
         <EditText android:id="@+id/mPwdEt"
             android:layout_width="match_parent"
             android:layout_height="@dimen/common_line_height"
@@ -28,11 +30,14 @@
             android:hint="请输入密码"
             android:drawablePadding="@dimen/common_padding_small"
             android:inputType="textPassword"/>
+
     </LinearLayout>
+
     <Button
         android:id="@+id/mLoginBtn"
         style="@style/FullBtnStyle"
         android:text="登录"/>
+
     <TextView
         android:id="@+id/mForgetPwdTv"
         style="@style/WrapWrap"