Commit 76b1d048 by 罗翻

增加店长模块

parent 30014362
Showing with 861 additions and 9 deletions
......@@ -13,6 +13,7 @@
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/baseSDK" />
<option value="$PROJECT_DIR$/locationComponent" />
<option value="$PROJECT_DIR$/managercenter" />
<option value="$PROJECT_DIR$/messageCenter" />
<option value="$PROJECT_DIR$/orderCenter" />
<option value="$PROJECT_DIR$/pickerview" />
......
......@@ -7,6 +7,7 @@
<module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu.iml" filepath="$PROJECT_DIR$/dayu.iml" />
<module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" />
<module fileurl="file://$PROJECT_DIR$/managercenter/managercenter.iml" filepath="$PROJECT_DIR$/managercenter/managercenter.iml" />
<module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/orderCenter/orderCenter.iml" filepath="$PROJECT_DIR$/orderCenter/orderCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" />
......
......@@ -100,9 +100,9 @@ dependencies {
if (isOrderModule.toBoolean()) {
api project(':orderCenter')
}
// if (isManagerModule.toBoolean()) {
// api project(':managerCenter')
// }
if (isManagerModule.toBoolean()) {
api project(':managercenter')
}
// compile(name: 'orderCenter-debug', ext: 'aar')
// compile(name: 'userCenter-debug', ext: 'aar')
// compile(name: 'messageCenter-debug', ext: 'aar')
......
......@@ -3,11 +3,9 @@
<data>
<import type="com.dayu.bigfish.presenter.main.MainPresenter"/>
<variable
name="presenter"
type="MainPresenter"/>
type="com.dayu.bigfish.presenter.main.MainPresenter"/>
</data>
<LinearLayout
......
......@@ -4,11 +4,9 @@
<data>
<import type="com.dayu.bigfish.presenter.setting.SettingPresenter" />
<variable
name="presenter"
type="SettingPresenter" />
type="com.dayu.bigfish.presenter.setting.SettingPresenter" />
</data>
<LinearLayout
......
......@@ -170,6 +170,12 @@
<string name="send_code_agian">秒后可重发</string>
<string name="login">登录</string>
<!--派单-->
<string name="send_order">派单</string>
<string name="grab_order">抢单</string>
<string name="subcribe_order">预约审核</string>
<string name="change_order">可改派</string>
<string name="swtich_service_station">切换服务站</string>
<!--工单-->
<string name="order_title">我的工单</string>
......
if (isManagerModule.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 isReleaseMinify
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
dataBinding {
enabled = true
}
dexOptions {
preDexLibraries = false
}
sourceSets {
main {
if (isMessageModule.toBoolean()) {
manifest.srcFile 'src/main/release/AndroidManifest.xml'
} else {
manifest.srcFile 'src/main/debug/AndroidManifest.xml'
}
}
}
}
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
//ARouter
annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
api 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
package com.dayu.managercenter;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
assertEquals("com.dayu.managercenter.test", appContext.getPackageName());
}
}
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.managercenter">
<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="com.dayu.managercenter.ui.activity.ManagerActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
package com.dayu.managercenter.api;
/**
* 全局model类.
*/
public class ManagerApiFactory {
}
package com.dayu.managercenter.api;
/**
* Created by luofan on 2017/11/09.
*/
public interface ManagerService {
}
package com.dayu.managercenter.common;
import com.dayu.managercenter.R;
import com.dayu.utils.UIUtils;
/**
* Created by luofan
* on 2018/2/9.
*/
public class ManagerConstant {
public final static String[] tabs = {UIUtils.getString(R.string.send_order),UIUtils.getString(R.string.grab_order)
,UIUtils.getString(R.string.subcribe_order),UIUtils.getString(R.string.change_order)};
/**
* 阅读环信消息.
*/
public final static String MESSAGE_HX = "/api-message/" + "hXMessage";
/**
* 获取环信消息.
*/
public final static String MESSAGE_HX_LIST = "/api-message/hXMessage/hxAccount/{hxAccount}/category/{category}";
}
package com.dayu.managercenter.presenter.changeorder;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface ChangeOrderContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
package com.dayu.managercenter.presenter.changeorder;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class ChangeOrderPresenter extends ChangeOrderContract.Presenter {
@Override
public void onAttached() {
}
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
}
package com.dayu.managercenter.presenter.graborder;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface GrabOrderContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
package com.dayu.managercenter.presenter.graborder;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class GrabOrderPresenter extends GrabOrderContract.Presenter {
@Override
public void onAttached() {
}
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
}
package com.dayu.managercenter.presenter.manager;
import com.dayu.base.ui.presenter.BasePresenter;
import com.dayu.common.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface ManagerContract {
interface View extends BaseView {
}
abstract class Presenter extends BasePresenter<View> {
}
}
package com.dayu.managercenter.presenter.manager;
/**
* Created by luofan
* on 2017/11/8.
*/
public class ManagerPresenter extends ManagerContract.Presenter {
@Override
public void onAttached() {
}
}
package com.dayu.managercenter.presenter.senddetail;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface SendDetailContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
package com.dayu.managercenter.presenter.senddetail;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class SendDetailPresenter extends SendDetailContract.Presenter {
@Override
public void onAttached() {
}
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
}
package com.dayu.managercenter.presenter.sendorder;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface SendOrderContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
package com.dayu.managercenter.presenter.sendorder;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class SendOrderPresenter extends SendOrderContract.Presenter {
@Override
public void onAttached() {
}
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
}
package com.dayu.managercenter.presenter.servicestation;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface ServiceStationContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
package com.dayu.managercenter.presenter.servicestation;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class ServiceStationPresenter extends ServiceStationContract.Presenter {
@Override
public void onAttached() {
}
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
}
package com.dayu.managercenter.presenter.subcribeorder;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.common.BaseView;
/**
* Created by luo on 2016/8/4.
*/
public interface SubcribeOrderContract {
interface View extends BaseView {
}
abstract class Presenter extends BaseListPresenter<View> {
}
}
package com.dayu.managercenter.presenter.subcribeorder;
import android.databinding.ObservableField;
/**
* Created by luofan
* on 2017/11/8.
*/
public class SubcribeOrderPresenter extends SubcribeOrderContract.Presenter {
@Override
public void onAttached() {
}
@Override
public ObservableField<Object> getSourceDatas() {
return null;
}
}
package com.dayu.managercenter.ui.activity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
import com.dayu.managercenter.R;
import com.dayu.managercenter.ui.fragment.ManagerFragment;
/**
* Created by luofan
* on 2018/2/7.
*/
public class ManagerActivity 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_manager);
initView();
}
public void initView() {
getSupportFragmentManager().beginTransaction()
.add(R.id.fl_content, ManagerFragment.newInstance())
.commit();
}
}
package com.dayu.managercenter.ui.activity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.managercenter.R;
import com.dayu.managercenter.databinding.ActivitySendDetailBinding;
import com.dayu.managercenter.presenter.senddetail.SendDetailContract;
import com.dayu.managercenter.presenter.senddetail.SendDetailPresenter;
/**
* Created by luofan
* on 2018/8/27.
*/
public class SendOrderDetailActivity extends BaseActivity<SendDetailPresenter,ActivitySendDetailBinding> implements SendDetailContract.View {
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_send_detail;
}
@Override
public void initView() {
}
}
package com.dayu.managercenter.ui.activity;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.managercenter.R;
import com.dayu.managercenter.databinding.ActivityServiceStationBinding;
import com.dayu.managercenter.presenter.servicestation.ServiceStationContract;
import com.dayu.managercenter.presenter.servicestation.ServiceStationPresenter;
/**
* Created by luofan
* on 2018/8/27.
*/
public class ServiceStationActivity extends BaseActivity<ServiceStationPresenter, ActivityServiceStationBinding> implements ServiceStationContract.View {
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_service_station;
}
@Override
public void initView() {
}
}
package com.dayu.managercenter.ui.fragment;
import android.os.Bundle;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.managercenter.R;
import com.dayu.managercenter.databinding.FragmentRecycleBinding;
import com.dayu.managercenter.presenter.changeorder.ChangeOrderContract;
import com.dayu.managercenter.presenter.changeorder.ChangeOrderPresenter;
/**
* Created by luofan
* on 2018/8/27.
*/
public class ChangeOrderFragment extends BaseFragment<ChangeOrderPresenter,FragmentRecycleBinding> implements ChangeOrderContract.View{
public static ChangeOrderFragment newInstance() {
Bundle args = new Bundle();
ChangeOrderFragment fragment = new ChangeOrderFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
public int getLayoutId() {
return R.layout.fragment_recycle;
}
@Override
public void initView() {
}
}
package com.dayu.managercenter.ui.fragment;
import android.os.Bundle;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.managercenter.R;
import com.dayu.managercenter.databinding.FragmentRecycleBinding;
import com.dayu.managercenter.presenter.graborder.GrabOrderContract;
import com.dayu.managercenter.presenter.graborder.GrabOrderPresenter;
/**
* Created by luofan
* on 2018/8/27.
*/
public class GrabOrderFragment extends BaseFragment<GrabOrderPresenter,FragmentRecycleBinding> implements GrabOrderContract.View{
public static GrabOrderFragment newInstance() {
Bundle args = new Bundle();
GrabOrderFragment fragment = new GrabOrderFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
public int getLayoutId() {
return R.layout.fragment_recycle;
}
@Override
public void initView() {
}
}
package com.dayu.managercenter.ui.fragment;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import com.dayu.base.ui.adapter.FragmentBaseAdapter;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.managercenter.R;
import com.dayu.managercenter.common.ManagerConstant;
import com.dayu.managercenter.databinding.FragmentManagerBinding;
import com.dayu.managercenter.presenter.manager.ManagerContract;
import com.dayu.managercenter.presenter.manager.ManagerPresenter;
import com.dayu.utils.TabLayoutUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* Created by luofan
* on 2018/8/27.
*/
public class ManagerFragment extends BaseFragment<ManagerPresenter, FragmentManagerBinding> implements ManagerContract.View{
private List<Fragment> mFragments;
public static ManagerFragment newInstance() {
Bundle args = new Bundle();
ManagerFragment fragment = new ManagerFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public int getLayoutId() {
return R.layout.fragment_manager;
}
@Override
public void setPresenter() {
}
@Override
public void initView() {
mFragments = new ArrayList<>();
mFragments.add(SendOrderFragment.newInstance());
mFragments.add(GrabOrderFragment.newInstance());
mFragments.add(SubcribeOrderFragment.newInstance());
mFragments.add(ChangeOrderFragment.newInstance());
FragmentBaseAdapter adapter = FragmentBaseAdapter.newInstance(getFragmentManager(), mFragments, Arrays.asList(ManagerConstant.tabs));
mBind.vpHome.setAdapter(adapter);
mBind.tbHome.setupWithViewPager(mBind.vpHome);
mBind.tbHome.setTabMode(TabLayout.MODE_FIXED);
mBind.vpHome.setOffscreenPageLimit(4);
TabLayoutUtils.setIndicator(mBind.tbHome, 10, 10, R.color.cl_receiving_order_item_data, getActivity());
}
}
package com.dayu.managercenter.ui.fragment;
import android.os.Bundle;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.managercenter.R;
import com.dayu.managercenter.databinding.FragmentRecycleBinding;
import com.dayu.managercenter.presenter.sendorder.SendOrderContract;
import com.dayu.managercenter.presenter.sendorder.SendOrderPresenter;
/**
* Created by luofan
* on 2018/8/27.
*/
public class SendOrderFragment extends BaseFragment<SendOrderPresenter,FragmentRecycleBinding> implements SendOrderContract.View{
public static SendOrderFragment newInstance() {
Bundle args = new Bundle();
SendOrderFragment fragment = new SendOrderFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public int getLayoutId() {
return R.layout.fragment_recycle;
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
public void initView() {
}
}
package com.dayu.managercenter.ui.fragment;
import android.os.Bundle;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.managercenter.R;
import com.dayu.managercenter.databinding.FragmentRecycleBinding;
import com.dayu.managercenter.presenter.subcribeorder.SubcribeOrderContract;
import com.dayu.managercenter.presenter.subcribeorder.SubcribeOrderPresenter;
/**
* Created by luofan
* on 2018/8/27.
*/
public class SubcribeOrderFragment extends BaseFragment<SubcribeOrderPresenter, FragmentRecycleBinding> implements SubcribeOrderContract.View {
public static SubcribeOrderFragment newInstance() {
Bundle args = new Bundle();
SubcribeOrderFragment fragment = new SubcribeOrderFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public int getLayoutId() {
return R.layout.fragment_recycle;
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
public void initView() {
}
}
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.managercenter">
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
<activity android:name="com.dayu.managercenter.ui.activity.ManagerActivity" />
</application>
</manifest>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white"
android:orientation="vertical">
<RelativeLayout style="@style/title">
<TextView
style="@style/text_title"
android:text="@string/send_order" />
<TextView
android:id="@+id/tv_right_title"
style="@style/title_right_text"
android:text="@string/swtich_service_station"
android:textColor="#3faafc"
android:textSize="@dimen/dp_13.3" />
</RelativeLayout>
<android.support.design.widget.TabLayout
android:id="@+id/tb_home"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:background="@color/cl_white"
app:tabIndicatorColor="@color/cl_receiving_order_item_data"
app:tabMaxWidth="0dp"
app:tabSelectedTextColor="@color/cl_receiving_order_item_data"
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabTextColor="@color/cl_tab_line" />
<ImageView style="@style/card_line" />
<android.support.v4.view.ViewPager
android:id="@+id/vp_home"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="presenter"
type="com.dayu.base.ui.presenter.BaseListPresenter" />
</data>
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f5f5f5" />
</layout>
\ No newline at end of file
<resources>
<string name="app_name">managerCenter</string>
</resources>
package com.dayu.managercenter;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}
\ No newline at end of file
......@@ -4,6 +4,7 @@ include ':app',
':messageCenter',
':userCenter',
':orderCenter',
':managercenter',
':locationComponent',
':pickerview',
':wheelview',
......
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