Commit 9dc521f6 by 罗翻

增加messagecenter

parent 60be48b9
Showing with 228 additions and 78 deletions
......@@ -51,7 +51,7 @@ android {
debug {
signingConfig android.signingConfigs.release
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
......@@ -106,6 +106,7 @@ dependencies {
annotationProcessor project(':apt')
compile project(':annotation_lib')
compile project(':provider')
compile project(':messageCenter')
//ARouter
annotationProcessor "com.alibaba:arouter-compiler:$arouter_compiler_version"
......
......@@ -16,7 +16,7 @@ import android.widget.Toast;
import com.dayu.bigfish.ui.LoginActivity;
import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.utils.MPermissionUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.umeng.analytics.MobclickAgent;
......
......@@ -20,7 +20,7 @@ import com.dayu.bigfish.bean.ShipperCompany;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.VersionInfo;
import java.util.List;
......
......@@ -18,7 +18,7 @@ import com.dayu.bigfish.bean.ShipperCompany;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.VersionInfo;
import java.util.List;
......
......@@ -7,9 +7,9 @@ import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import org.json.JSONObject;
......
......@@ -6,9 +6,9 @@ import android.os.Bundle;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.WithdrawalsActivity;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
/**
* Created by luofan
......
......@@ -12,7 +12,7 @@ import com.dayu.bigfish.bean.event.RefreshApplyPart;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
......
......@@ -4,9 +4,9 @@ import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
/**
......
......@@ -2,7 +2,7 @@ package com.dayu.bigfish.presenter.login;
import com.dayu.base.ui.presenter.BasePresenter;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.common.BaseView;
import com.dayu.widgets.listener.OnCloseListener;
......
......@@ -7,13 +7,13 @@ import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.AgreementActivity;
import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.ui.PersonInfoActivity;
import com.dayu.utils.ToastUtils;
import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.hyphenate.EMCallBack;
import com.hyphenate.chat.EMClient;
import com.umeng.analytics.MobclickAgent;
......
......@@ -6,10 +6,10 @@ import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.utils.AppUtils;
import com.dayu.utils.SPUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import org.json.JSONException;
import org.json.JSONObject;
......
......@@ -8,10 +8,10 @@ import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.MessageDetailActivity;
import com.dayu.bigfish.ui.fragment.MessageFragment;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.dayu.common.Constants;
import com.umeng.analytics.MobclickAgent;
......@@ -78,25 +78,6 @@ public class messagePresenter extends messageContract.Presenter {
ApiFactory.readMessage(requestBody).subscribe(baseObserver(aBoolean -> {}));
}
// @Override
// public String FomartTime(String time, String srcPattern, String pattern) {
// try {
// if (pattern.equals(LONG_TIME_FORMAT_TWO)) {
// return UtilsDate.changeFormat(time, srcPattern, pattern);
// }
// if (UtilsDate.IsToday(time)) {
// return UIUtils.getString(R.string.today);
// } else if (UtilsDate.IsNextday(time)) {
// return UIUtils.getString(R.string.tomorrow);
// } else {
// return UtilsDate.changeFormat(time, srcPattern, pattern);
// }
// } catch (ParseException e) {
// e.printStackTrace();
// return "";
// }
// }
@Override
public void readAndDump(NewMessage message, View view) {
if (message.getRead() == 0) {
......
......@@ -4,8 +4,8 @@ import android.databinding.ObservableField;
import com.app.annotation.apt.InstanceFactory;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.event.UserInfo;
import com.dayu.utils.UserManager;
import java.io.File;
......
......@@ -7,11 +7,11 @@ import com.app.annotation.apt.InstanceFactory;
import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.fragment.OrderThreeTabFragment;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
......
......@@ -14,7 +14,7 @@ import com.dayu.bigfish.ui.CommonSubmiteActivity;
import com.dayu.bigfish.ui.LogisticsInfoActivity;
import com.dayu.bigfish.ui.ReturnPartActivity;
import com.dayu.utils.UIUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
import io.reactivex.Observable;
......
......@@ -8,10 +8,10 @@ import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.ModifyPersonInfoActivity;
import com.dayu.bigfish.ui.MyHeaderIvActivity;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
/**
......
......@@ -12,7 +12,7 @@ import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.bean.sqlbean.OrderInfo;
......@@ -20,7 +20,7 @@ import com.dayu.bigfish.greendao.GreenDaoManager;
import com.dayu.bigfish.greendao.OrderInfoDao;
import com.dayu.bigfish.ui.ServerInstructionActivity;
import com.dayu.bigfish.ui.SopWebViewActivity;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.luck.picture.lib.tools.PictureFileUtils;
import com.umeng.analytics.MobclickAgent;
......
......@@ -10,13 +10,13 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.bean.event.RefreshReceivingNum;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.bean.event.SwtichFragment;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
......
......@@ -8,10 +8,10 @@ import com.dayu.common.Constants;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.OrderPart;
import com.dayu.bigfish.bean.ShipperCompany;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.RefreshApplyPart;
import com.dayu.bigfish.ui.KaAddressActivity;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONException;
......
......@@ -12,7 +12,7 @@ import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.AboutUsActivity;
import com.dayu.bigfish.ui.CommonSubmiteActivity;
import com.dayu.bigfish.ui.LoginActivity;
......@@ -20,7 +20,7 @@ import com.dayu.bigfish.utils.AppUtils;
import com.dayu.bigfish.utils.DataCleanManager;
import com.dayu.utils.SPUtils;
import com.dayu.utils.UIUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.hyphenate.EMCallBack;
import com.hyphenate.chat.EMClient;
import com.umeng.analytics.MobclickAgent;
......
......@@ -10,10 +10,10 @@ import com.dayu.common.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList;
......
......@@ -15,12 +15,12 @@ import android.widget.LinearLayout;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.databinding.ActivityWebviewBinding;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView;
import com.github.lzyzsd.jsbridge.CallBackFunction;
......
......@@ -16,10 +16,10 @@ import android.widget.LinearLayout;
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.common.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.databinding.ActivityWebviewBinding;
import com.dayu.utils.ProgressUtil;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView;
import com.github.lzyzsd.jsbridge.CallBackFunction;
......
......@@ -16,7 +16,7 @@ import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.event.UserInfo;
import com.dayu.bigfish.databinding.FragmentPersonalCenterBinding;
import com.dayu.bigfish.presenter.homefourtab.HomeFourContract;
import com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter;
......@@ -25,7 +25,7 @@ import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.SettingActivity;
import com.dayu.bigfish.ui.WithdrawalsActivity;
import com.dayu.utils.SPUtils;
import com.dayu.bigfish.utils.managers.UserManager;
import com.dayu.utils.UserManager;
import com.dayu.common.Constants;
import com.dayu.utils.ProgressUtil;
import com.dayu.widgets.CustomDialog;
......
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/cl_white</item>
<item name="colorPrimaryDark">@color/cl_primarydark</item>
<item name="colorAccent">@color/cl_accent</item>
</style>
<style name="SplashTheme" parent="AppTheme">
<item name="android:windowBackground">@mipmap/bg_splash</item>
<item name="android:windowFullscreen">true</item>
......
package com.dayu.bigfish.bean;
package com.dayu.event;
import android.databinding.BaseObservable;
import android.databinding.Bindable;
import com.dayu.bigfish.BR;
/**
* 储存用户信息的类
......@@ -76,14 +73,12 @@ public class UserInfo extends BaseObservable {
this.accessToken = accessToken;
}
@Bindable
public String getHeaderImg() {
return headerImg;
}
public void setHeaderImg(String headerImg) {
this.headerImg = headerImg;
notifyPropertyChanged(BR.headerImg);
}
public String getToken() {
......
package com.dayu.bigfish.utils.managers;
package com.dayu.utils;
import android.text.TextUtils;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.utils.SPUtils;
import com.dayu.event.UserInfo;
import com.google.gson.Gson;
/**
......
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/cl_white</item>
<item name="colorPrimaryDark">@color/cl_primarydark</item>
<item name="colorAccent">@color/cl_accent</item>
</style>
<style name="Dialog" parent="@android:style/Theme.Holo.Dialog">
<item name="android:windowSoftInputMode">stateHidden|adjustResize</item>
<!-- 边框 -->
......
# 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
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.messagecenter" >
<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.messagecenter.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;
/**
* 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);
}
}
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.messagecenter">
<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"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="测试一下"
/>
</LinearLayout>
\ No newline at end of file
<resources>
<string name="app_name">MessageCenter</string>
</resources>
include ':app',':apt', ':annotation_lib', ':provider', ':baseLibrary', ':baseLibrary'
include ':app',':apt', ':annotation_lib', ':provider', ':baseLibrary', ':baseLibrary', ':messageCenter'
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