Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
component
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王涛55
component
Commits
18e1a260
Commit
18e1a260
authored
Sep 20, 2019
by
wangtao
Browse files
Options
Browse Files
Download
Plain Diff
temp
parents
85eff6e4
483bb067
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
74 additions
and
0 deletions
+74
-0
ModuleProject/app/src/main/AndroidManifest.xml
+4
-0
ModuleProject/app/src/main/java/com/main/testActivity.java
+35
-0
ModuleProject/app_login/src/main/AndroidManifest.xml
+4
-0
ModuleProject/app_login/src/main/java/com/main/testLoginActivity.java
+23
-0
ModuleProject/app_login/src/main/module/AndroidManifest.xml
+4
-0
ModuleProject/app_passport/src/main/module/AndroidManifest.xml
+4
-0
No files found.
ModuleProject/app/src/main/AndroidManifest.xml
View file @
18e1a260
...
...
@@ -11,7 +11,11 @@
tools:ignore=
"GoogleAppIndexingWarning,HardcodedDebugMode"
tools:replace=
"android:icon,android:roundIcon,android:theme,android:label,android:allowBackup"
>
<<<<<<
< HEAD
<activity
android:name=
"com.hikcreate.ui.testActivity"
>
=======
<activity
android:name=
"com.main.testActivity"
>
>>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
...
...
ModuleProject/app/src/main/java/com/main/testActivity.java
0 → 100644
View file @
18e1a260
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
View file @
18e1a260
...
...
@@ -4,7 +4,11 @@
<application>
<activity
<<<<<<<
HEAD
android:name=
"com.hikcreate.login.testLoginActivity"
=======
android:name=
"com.main.testLoginActivity"
>
>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
android:launchMode="singleTop"
android:screenOrientation="portrait" />
...
...
ModuleProject/app_login/src/main/java/com/main/testLoginActivity.java
0 → 100644
View file @
18e1a260
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
View file @
18e1a260
...
...
@@ -12,7 +12,11 @@
tools:ignore=
"GoogleAppIndexingWarning"
tools:replace=
"android:icon,android:roundIcon,android:theme,android:label,android:allowBackup"
>
<<<<<<
< HEAD
<activity
android:name=
"com.hikcreate.login.testLoginActivity"
>
=======
<activity
android:name=
"com.main.testLoginActivity"
>
>>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
...
...
ModuleProject/app_passport/src/main/module/AndroidManifest.xml
View file @
18e1a260
...
...
@@ -12,7 +12,11 @@
tools:ignore=
"GoogleAppIndexingWarning"
tools:replace=
"android:icon,android:roundIcon,android:theme,android:label,android:allowBackup"
>
<<<<<<
< HEAD
<activity
android:name=
"com.hikcreate,login.testLoginActivity"
>
=======
<activity
android:name=
"com.main.testLoginActivity"
>
>>>>>>> 483bb067a456c0e8a14e8c61ce522972aad9097a
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment