add 添加LoginLifeCircle

CommonLib/Common/src/main/java/com/yidian/common/XRouterPathConstants.kt

 package com.yidian.common
 
+/**
+ * Describe:生活圈项目如果名称和之前的有重复的，就在后面加上"_LIFE_CIRCLE"
+ */
 class XRouterPathConstants {
     companion object {
         const val ParamsKey = "ParamsMap"
 
         const val FLASH = "/flash"
         const val LOGIN = "/loginPhone"
+        const val LOGIN_LIFE_CIRCLE = "/loginLifeCircle"
         const val ONE_KEY_LOGIN = "/common/oneKeyLogin"
         const val LOGIN_NATIVE = "/loginNative"
         const val USER_INFO = "/fragment/userInfo"

CommonLib/Common/src/main/java/com/yidian/common/ui/widget/ScrollViewPager.kt

 package com.yidian.common.ui.widget
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
@@ -27,6 +28,7 @@ class ScrollViewPager : ViewPager {
         }
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(ev: MotionEvent?): Boolean {
         return if (scrollable) {
             super.onTouchEvent(ev)

Components/newscontent/src/main/AndroidManifest.xml

@@ -84,6 +84,10 @@
         <activity
             android:name=".ui.GalleryActivity"
             android:theme="@style/Transparent" />
+
+        <activity
+            android:name=".ui.LoginLifeCircleActivity"
+            android:theme="@style/Transparent" />
     </application>
 
 </manifest>
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt

@@ -18,6 +18,7 @@ import com.yidian.common.XRouterPathConstants.Companion.COLLECTION
 import com.yidian.common.XRouterPathConstants.Companion.FLASH
 import com.yidian.common.XRouterPathConstants.Companion.GALLERY
 import com.yidian.common.XRouterPathConstants.Companion.HOME
+import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
 import com.yidian.common.XRouterPathConstants.Companion.NEWS_CONTENT
 import com.yidian.common.XRouterPathConstants.Companion.NEWS_MAIN
 import com.yidian.common.XRouterPathConstants.Companion.PROTOCOL
@@ -104,6 +105,19 @@ class NewsContentApplication : YdBaseApplication() {
                     }
                 }),
 
+                XPageNode(LOGIN_LIFE_CIRCLE, XPageNodePageType.NATIVE, object : XPageHandler {
+                    override fun handler(params: Map<String, Any?>?) {
+                        val intent = Intent()
+                        if (params != null) {
+                            intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
+                        }
+                        intent.setClass(context, LoginLifeCircleActivity::class.java)
+                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                        context.startActivity(intent)
+                    }
+                }),
+
+
                 XPageNode(NEWS_CONTENT, XPageNodePageType.NATIVE, object : XPageHandler {
                     override fun handler(params: Map<String, Any?>?) {
                         val intent = Intent()

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt

@@ -57,7 +57,7 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() {
         val isAgree = Hawk.get<Boolean>(HawkConfig.ProtocolIsAgree, false)
         if(isAgree){
             viewBind.clRoot.postDelayed( {
-                XPageManager.push(XRouterPathConstants.HOME, paramsMap)
+                XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, paramsMap)
                 finish()
             },2000)
         }else{

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LoginLifeActivity.kt

+package com.yidian.shenghuoquan.newscontent.ui
+
+import android.os.Bundle
+import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityLoginBinding
+
+/**
+ * Author: sym
+ * Date: 2021/5/18 5:14 PM
+ * Describe:
+ */
+class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
+    override fun createViewBinding(): ActivityLoginBinding {
+        return ActivityLoginBinding.inflate(layoutInflater)
+    }
+
+    override fun getXPageName(): String {
+        return LOGIN_LIFE_CIRCLE
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+}
\ No newline at end of file

Components/newscontent/src/main/res/layout/activity_login.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="login"/>
+
+</LinearLayout>
\ No newline at end of file

Components/userinfo/src/main/manifest/AndroidManifest.xml

-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yidian.subway">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Subway_news">
-        <activity android:name=".userinfo.ui.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file