Commit f3d96e17 by 罗翻

增加空用户模块和工单模块

parent d087de08
Showing with 379 additions and 46 deletions
......@@ -166,7 +166,7 @@
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<activity
android:name="com.dayu.messagecenter.ui.activity.MessageDetailActivity"
android:name="com.dayu.message.ui.activity.MessageDetailActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.SopWebViewActivity"
......
......@@ -10,7 +10,7 @@ import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.KaAddress;
import com.dayu.bigfish.bean.LogsticsInfo;
import com.dayu.messagecenter.data.protocol.NewMessage;
import com.dayu.message.data.protocol.NewMessage;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.OrderPart;
......
......@@ -8,7 +8,7 @@ import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.KaAddress;
import com.dayu.bigfish.bean.LogsticsInfo;
import com.dayu.messagecenter.data.protocol.NewMessage;
import com.dayu.message.data.protocol.NewMessage;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.OrderPart;
......
......@@ -29,7 +29,7 @@ import com.dayu.bigfish.databinding.ActivityMainBinding;
import com.dayu.bigfish.presenter.main.MainContract;
import com.dayu.bigfish.presenter.main.MainPresenter;
import com.dayu.bigfish.ui.fragment.HomeFirstTabFragment;
import com.dayu.messagecenter.ui.fragment.HomeMessageFragment;
import com.dayu.message.ui.fragment.HomeMessageFragment;
import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
import com.dayu.bigfish.ui.fragment.HomePersonFragment;
import com.dayu.widgets.listener.onDownloadListener;
......
......@@ -5,7 +5,7 @@
<variable
name="item"
type="com.dayu.messagecenter.data.protocol.NewMessage"/>
type="com.dayu.message.data.protocol.NewMessage"/>
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
isUserModule = true
##模块化开关,单独调试时 false,作为模块 true
##用户模块
isUserModule=false
##消息模块
isMessageModule=true
##工单模块
isOrderModule=false
if (isUserModule.toBoolean()) {
if (isMessageModule.toBoolean()) {
apply plugin: 'com.android.library'
} else {
apply plugin: 'com.android.application'
......@@ -46,7 +46,7 @@ android {
sourceSets {
main {
if (isUserModule.toBoolean()) {
if (isMessageModule.toBoolean()) {
manifest.srcFile 'src/main/release/AndroidManifest.xml'
} else {
manifest.srcFile 'src/main/debug/AndroidManifest.xml'
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.messagecenter">
package="com.dayu.message">
<application
android:name="com.dayu.common.BaseApplication"
......
package com.dayu.messagecenter.api;
package com.dayu.message.api;
import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.messagecenter.data.protocol.NewMessage;
import com.dayu.message.data.protocol.NewMessage;
import io.reactivex.Observable;
import okhttp3.RequestBody;
......
package com.dayu.messagecenter.api;
package com.dayu.message.api;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.common.Constants;
import com.dayu.messagecenter.data.protocol.NewMessage;
import com.dayu.message.data.protocol.NewMessage;
import io.reactivex.Observable;
import okhttp3.RequestBody;
......
package com.dayu.messagecenter.data.protocol;
package com.dayu.message.data.protocol;
import java.io.Serializable;
......
package com.dayu.messagecenter.presenter.message;
package com.dayu.message.presenter.message;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
import com.dayu.messagecenter.data.protocol.NewMessage;
import com.dayu.message.data.protocol.NewMessage;
/**
* Created by luo on 2016/8/4.
......
package com.dayu.messagecenter.presenter.message;
package com.dayu.message.presenter.message;
import android.databinding.ObservableField;
import android.os.Bundle;
......@@ -7,10 +7,10 @@ import android.view.View;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.messagecenter.api.MessageApiFactory;
import com.dayu.messagecenter.data.protocol.NewMessage;
import com.dayu.messagecenter.ui.activity.MessageDetailActivity;
import com.dayu.messagecenter.ui.fragment.MessageFragment;
import com.dayu.message.api.MessageApiFactory;
import com.dayu.message.data.protocol.NewMessage;
import com.dayu.message.ui.activity.MessageDetailActivity;
import com.dayu.message.ui.fragment.MessageFragment;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
......
package com.dayu.messagecenter.ui.activity;
package com.dayu.message.ui.activity;
import android.os.Bundle;
import android.text.TextUtils;
......@@ -7,9 +7,9 @@ import android.view.View;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.common.Constants;
import com.dayu.messagecenter.R;
import com.dayu.messagecenter.data.protocol.NewMessage;
import com.dayu.messagecenter.databinding.ActivityMessageDetailBinding;
import com.dayu.message.R;
import com.dayu.message.data.protocol.NewMessage;
import com.dayu.message.databinding.ActivityMessageDetailBinding;
import com.dayu.provider.common.ProviderConstant;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.UtilsDate;
......
package com.dayu.messagecenter.ui.activity;
package com.dayu.message.ui.activity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
import com.dayu.messagecenter.R;
import com.dayu.messagecenter.ui.fragment.HomeMessageFragment;
import com.dayu.message.R;
import com.dayu.message.ui.fragment.HomeMessageFragment;
/**
* Created by luofan
......
package com.dayu.messagecenter.ui.fragment;
package com.dayu.message.ui.fragment;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
......@@ -6,8 +6,8 @@ import android.support.v4.app.Fragment;
import com.dayu.base.ui.adapter.FragmentBaseAdapter;
import com.dayu.base.ui.fragment.DataBindingFragment;
import com.dayu.messagecenter.R;
import com.dayu.messagecenter.databinding.FragmentMessageBinding;
import com.dayu.message.R;
import com.dayu.message.databinding.FragmentMessageBinding;
import com.dayu.utils.TabLayoutUtils;
import com.umeng.analytics.MobclickAgent;
......
package com.dayu.messagecenter.ui.fragment;
package com.dayu.message.ui.fragment;
import android.os.Bundle;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.messagecenter.R;
import com.dayu.messagecenter.data.protocol.NewMessage;
import com.dayu.messagecenter.databinding.ItemMessageLayoutBinding;
import com.dayu.messagecenter.databinding.LrecyclerViewBinding;
import com.dayu.messagecenter.presenter.message.messageContract;
import com.dayu.messagecenter.presenter.message.messagePresenter;
import com.dayu.message.R;
import com.dayu.message.data.protocol.NewMessage;
import com.dayu.message.databinding.ItemMessageLayoutBinding;
import com.dayu.message.databinding.LrecyclerViewBinding;
import com.dayu.message.presenter.message.messageContract;
import com.dayu.message.presenter.message.messagePresenter;
import com.dayu.widgets.listener.OnItemClickListener;
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.messagecenter">
package="com.dayu.message">
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
<activity android:name=".ui.activity.TestActivity" />
<activity android:name="com.dayu.message.ui.activity.TestActivity" />
</application>
</manifest>
......@@ -9,7 +9,7 @@
<variable
name="item"
type="com.dayu.messagecenter.data.protocol.NewMessage"/>
type="com.dayu.message.data.protocol.NewMessage"/>
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
if (isOrderModule.toBoolean()) {
apply plugin: 'com.android.library'
} else {
apply plugin: 'com.android.application'
}
android {
compileSdkVersion compile_sdk_version
buildToolsVersion build_tools_version
defaultConfig {
minSdkVersion min_sdk_version
targetSdkVersion target_sdk_version
versionCode version_code
versionName verson_name
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
vectorDrawables.useSupportLibrary = true
javaCompileOptions {
annotationProcessorOptions {
arguments = [moduleName: project.getName()]
}
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
dataBinding {
enabled = true
}
dexOptions {
preDexLibraries = false
}
sourceSets {
main {
if (isOrderModule.toBoolean()) {
manifest.srcFile 'src/main/release/AndroidManifest.xml'
} else {
manifest.srcFile 'src/main/debug/AndroidManifest.xml'
}
}
}
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
//ARouter
annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
compile project(':provider')
}
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.order">
<application
android:name="com.dayu.common.BaseApplication"
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.activity.TestActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
package com.dayu.order.ui.activity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
import com.dayu.order.R;
/**
* Created by luofan
* on 2018/2/7.
*/
public class TestActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_test);
initView();
}
public void initView() {
// getSupportFragmentManager().beginTransaction()
// .add(R.id.fl_content, HomeMessageFragment.newInstance())
// .commit();
}
}
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.order">
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
<activity android:name=".ui.activity.TestActivity" />
</application>
</manifest>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fl_content"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="测试一下"
/>
</FrameLayout>
<resources>
<string name="app_name">orderCenter</string>
</resources>
include ':app',':apt', ':annotation_lib', ':provider', ':baseLibrary', ':baseLibrary', ':messageCenter'
include ':app',':apt', ':annotation_lib', ':provider', ':baseLibrary', ':baseLibrary', ':messageCenter', ':userCenter', ':orderCenter'
if (isUserModule.toBoolean()) {
apply plugin: 'com.android.library'
} else {
apply plugin: 'com.android.application'
}
android {
compileSdkVersion compile_sdk_version
buildToolsVersion build_tools_version
defaultConfig {
minSdkVersion min_sdk_version
targetSdkVersion target_sdk_version
versionCode version_code
versionName verson_name
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
vectorDrawables.useSupportLibrary = true
javaCompileOptions {
annotationProcessorOptions {
arguments = [moduleName: project.getName()]
}
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
dataBinding {
enabled = true
}
dexOptions {
preDexLibraries = false
}
sourceSets {
main {
if (isUserModule.toBoolean()) {
manifest.srcFile 'src/main/release/AndroidManifest.xml'
} else {
manifest.srcFile 'src/main/debug/AndroidManifest.xml'
}
}
}
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
//ARouter
annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
compile project(':provider')
}
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.usercenter">
<application
android:name="com.dayu.common.BaseApplication"
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.activity.TestActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
package com.dayu.usercenter.ui.activity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
import com.dayu.usercenter.R;
/**
* Created by luofan
* on 2018/2/7.
*/
public class TestActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_test);
initView();
}
public void initView() {
// getSupportFragmentManager().beginTransaction()
// .add(R.id.fl_content, HomeMessageFragment.newInstance())
// .commit();
}
}
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.usercenter">
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
<activity android:name=".ui.activity.TestActivity" />
</application>
</manifest>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fl_content"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="测试一下"
/>
</FrameLayout>
<resources>
<string name="app_name">userCenter</string>
</resources>
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 sign in to comment