Skip to content

C
component
Commit 31916fc7 by 王涛55
Options

feat:temp

parent 18e1a260
Showing with 57 additions and 79 deletions
ModuleProject/.idea/codeStyles/Project.xml
...@@ -64,31 +64,6 @@ ...@@ -64,31 +64,6 @@
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings> </JetCodeStyleSettings>
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
<XML> <XML>
<option name="XML_KEEP_LINE_BREAKS" value="false" /> <option name="XML_KEEP_LINE_BREAKS" value="false" />
<option name="XML_ALIGN_ATTRIBUTES" value="false" /> <option name="XML_ALIGN_ATTRIBUTES" value="false" />
......
ModuleProject/app/build.gradle
...@@ -95,7 +95,6 @@ android { ...@@ -95,7 +95,6 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
if (build_module == build_module_app) { if (build_module == build_module_app) {
api project(':lib_app_common')
api project(':app_common') api project(':app_common')
api project(':app_login') api project(':app_login')
api project(':app_passport') api project(':app_passport')
......
ModuleProject/app/src/main/AndroidManifest.xml
...@@ -11,11 +11,8 @@ ...@@ -11,11 +11,8 @@
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/hikcreate/app/AppBaseContext.java 0 → 100644
package com.hikcreate.app;
import android.app.Application;
import android.content.Context;
import android.support.multidex.MultiDex;
/**
* app初始化类
*
* @author wangtao55
* @date 2019/9/21
* @mail wangtao55@hikcreate.com
*/
public class AppBaseContext extends Application {
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);
AppContext.init(base);
}
@Override
public void onCreate() {
super.onCreate();
}
}
ModuleProject/app/src/main/java/com/hikcreate/ui/testActivity.java
...@@ -6,6 +6,7 @@ import android.support.v4.app.FragmentTransaction; ...@@ -6,6 +6,7 @@ import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import com.hikcreate.login.testLoginActivity; import com.hikcreate.login.testLoginActivity;
import com.hikcreate.passport.TestFragment;
import com.module.hikcreate.R; import com.module.hikcreate.R;
......
ModuleProject/app/src/main/java/com/main/testActivity.java deleted 100644 → 0
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_common/build.gradle
...@@ -24,4 +24,5 @@ android { ...@@ -24,4 +24,5 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
api project(':lib_app_common')
} }
ModuleProject/app_common/src/main/java/com/hikcreate/app/AppContext.java 0 → 100644
package com.hikcreate.app;
import android.content.Context;
import android.support.multidex.MultiDex;
/**
* app初始化类
*
* @author wangtao55
* @date 2019/9/21
* @mail wangtao55@hikcreate.com
*/
public class AppContext {
private Context mContext;
public static void init(Context application){
MultiDex.install(application);
}
}
ModuleProject/app_login/src/main/AndroidManifest.xml
...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
<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/module/AndroidManifest.xml
...@@ -12,11 +12,7 @@ ...@@ -12,11 +12,7 @@
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/lib_app_common/build.gradle
...@@ -30,12 +30,12 @@ android { ...@@ -30,12 +30,12 @@ android {
dependencies { dependencies {
api fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
api project(':lib_baidu_audiodect') // api project(':lib_baidu_audiodect')
api project(':lib_baidu_facedect') // api project(':lib_baidu_facedect')
api project(':lib_baidu_textdect') // api project(':lib_baidu_textdect')
api project(':lib_common_ui') // api project(':lib_common_ui')
api project(':lib_data_drive') // api project(':lib_data_drive')
api project(':lib_network') // api project(':lib_network')
// App's support dependencies // App's support dependencies
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment