temp

ModuleProject/app/src/main/AndroidManifest.xml

@@ -11,7 +11,11 @@
         tools:ignore="GoogleAppIndexingWarning,HardcodedDebugMode"
         tools:ignore="GoogleAppIndexingWarning,HardcodedDebugMode"
         tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
         tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
 
 
+<<<<<<< HEAD
     <activity android:name="com.hikcreate.ui.testActivity">
     <activity android:name="com.hikcreate.ui.testActivity">
+=======
+    <activity android:name="com.main.testActivity">
+>>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
             <intent-filter>
             <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" />

ModuleProject/app/src/main/java/com/main/testActivity.java

+package com.main;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import com.module.hikcreate.R;
+import com.passport.TestFragment;
+
+/**
+ * 类说明
+ *
+ * @author wangtao55
+ * @date 2019/9/18
+ * @mail wangtao55@hikcreate.com
+ */
+public class testActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.app_test);
+        findViewById(R.id.mBtnLogin).setOnClickListener(v -> {
+            Intent mIntent = new Intent(testActivity.this,testLoginActivity.class);
+            startActivity(mIntent);
+        });
+        findViewById(R.id.mBtnPassport).setOnClickListener(v -> {
+            Intent mIntent = new Intent(testActivity.this,testLoginActivity.class);
+            startActivity(mIntent);
+        });
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        transaction.add(R.id.test_passport,new TestFragment());
+        transaction.commit();
+    }
+}

ModuleProject/app_login/src/main/AndroidManifest.xml

@@ -4,7 +4,11 @@
 
 
     <application>
     <application>
         <activity
         <activity
+<<<<<<< HEAD
             android:name="com.hikcreate.login.testLoginActivity"
             android:name="com.hikcreate.login.testLoginActivity"
+=======
+            android:name="com.main.testLoginActivity"
+>>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
             android:launchMode="singleTop"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
             android:screenOrientation="portrait" />
 
 

ModuleProject/app_login/src/main/java/com/main/testLoginActivity.java

+package com.main;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.app.login.R;
+
+/**
+ * 类说明
+ *
+ * @author wangtao55
+ * @date 2019/9/18
+ * @mail wangtao55@hikcreate.com
+ */
+public class testLoginActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.lg_app_test);
+    }
+}

ModuleProject/app_login/src/main/module/AndroidManifest.xml

@@ -12,7 +12,11 @@
         tools:ignore="GoogleAppIndexingWarning"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
         tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
 
 
+<<<<<<< HEAD
         <activity android:name="com.hikcreate.login.testLoginActivity">
         <activity android:name="com.hikcreate.login.testLoginActivity">
+=======
+        <activity android:name="com.main.testLoginActivity">
+>>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
             <intent-filter>
             <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" />

ModuleProject/app_passport/src/main/module/AndroidManifest.xml

@@ -12,7 +12,11 @@
         tools:ignore="GoogleAppIndexingWarning"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
         tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
 
 
+<<<<<<< HEAD
         <activity android:name="com.hikcreate,login.testLoginActivity">
         <activity android:name="com.hikcreate,login.testLoginActivity">
+=======
+        <activity android:name="com.main.testLoginActivity">
+>>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
             <intent-filter>
             <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" />