Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
android
/
dayu
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8abd67a0
authored
Oct 30, 2017
by
罗翻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除无用导入的包
parent
2f7e4745
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
79 additions
and
142 deletions
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/com/dayu/bigfish/Constants.java
app/src/main/java/com/dayu/bigfish/MainActivity.java
app/src/main/java/com/dayu/bigfish/activity/DeleteActivty.java
app/src/main/java/com/dayu/bigfish/activity/HomeActivity.java
app/src/main/java/com/dayu/bigfish/activity/UpdataSubscribeTimeActivity.java
app/src/main/java/com/dayu/bigfish/fragment/order/message/SystemMessageFragment.java
app/src/main/java/com/dayu/bigfish/moudle/personal/PersonalCenterView.java
app/src/main/res/layout/activty_delete.xml
app/build.gradle
View file @
8abd67a0
...
...
@@ -16,7 +16,7 @@ android {
storePassword
'123456789'
}
}
compileSdkVersion
2
5
compileSdkVersion
2
3
buildToolsVersion
"25.0.3"
aaptOptions
{
cruncherEnabled
=
false
...
...
@@ -24,7 +24,7 @@ android {
}
defaultConfig
{
applicationId
"com.dayu.bigfish"
minSdkVersion
1
5
minSdkVersion
1
6
targetSdkVersion
23
versionCode
1
versionName
"1.0.0"
...
...
@@ -59,34 +59,21 @@ dependencies {
androidTestCompile
(
'com.android.support.test.espresso:espresso-core:2.2.2'
,
{
exclude
group:
'com.android.support'
,
module:
'support-annotations'
})
//compile 'com.android.support:recyclerview-v7:22.0.2'
//compile 'com.android.support:appcompat-v7:24.0.0'
// compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
compile
'com.android.support:design:23.4.0'
testCompile
'junit:junit:4.12'
//网络请求框架 https://github.com/jeasonlzy/okhttp-OkGo
compile
'com.lzy.net:okgo:2.1.4'
//可以单独使用,不需要依赖下方的扩展包
//RxJava扩展支持,根据需要添加
// compile 'com.lzy.net:okrx:+'
//下载管理和上传管理扩展,根据需要添加
// compile 'com.lzy.net:okserver:+'
//json数据解析的gson,谷歌出品
//注解工具
compile
'com.jakewharton:butterknife:8.1.0'
// compile 'com.android.support:cardview-v7:21.0.2'
apt
'com.jakewharton:butterknife-compiler:8.1.0'
compile
'com.google.code.gson:gson:2.8.1'
//友盟统计
compile
'com.umeng.analytics:analytics:latest.integration'
compile
files
(
'libs/hyphenatechat_3.3.4.jar'
)
compile
files
(
'libs/eventbus-3.0.0.jar'
)
//常用工具类大全
//Android5.0,TabLayout兼容包
compile
'com.android.support:design:25.1.0'
//调起相机拍照
//compile 'com.jph.takephoto:takephoto_library:4.0.3'
// compile 'com.jph.takephoto:takephoto_library:4.0.3'
// compile 'com.squareup.picasso:picasso:2.5.2'
//上拉加载,下拉刷新
compile
'com.cjj.materialrefeshlayout:library:1.3.0'
//greendao数据库
...
...
@@ -100,11 +87,7 @@ dependencies {
compile
'com.contrarywind:Android-PickerView:3.2.4'
// 图片压缩
compile
'top.zibin:Luban:1.1.3'
//各种工具类 https://github.com/passiontim/AndroidUtilCode
//compile 'com.blankj:utilcode:1.1.5'
compile
'com.afollestad.material-dialogs:core:0.8.5.9'
compile
files
(
'libs/xUtils-2.6.14.jar'
)
// compile project(path: ':easeui')
//RxJava扩展支持,根据需要添加
//compile 'com.lzy.net:okrx:+'
}
app/src/main/AndroidManifest.xml
View file @
8abd67a0
...
...
@@ -23,12 +23,12 @@
<uses-permission
android:name=
"android.permission.ACCESS_WIFI_STATE"
/>
<uses-permission
android:name=
"android.permission.access_network_state"
/>
<application
android:name=
".application.MyApplication"
android:allowBackup=
"true"
android:icon=
"@mipmap/wechatimg"
android:label=
"@string/tv_dayu"
android:roundIcon=
"@mipmap/wechatimg"
android:supportsRtl=
"true"
android:theme=
"@style/AppTheme"
>
<activity
android:name=
".MainActivity"
>
...
...
@@ -82,7 +82,6 @@
<activity
android:name=
".activity.SettingActivity"
/>
<activity
android:name=
".activity.SubscribeTimeActivity"
/>
<activity
android:name=
".activity.UpdataSubscribeTimeActivity"
/>
<activity
android:name=
".activity.AgainVisitActivity"
/>
<activity
android:name=
".activity.OrderDetailsActivity"
/>
<activity
android:name=
".activity.OrderFinishActivity"
/>
<activity
android:name=
".activity.HandleListActivity"
/>
...
...
app/src/main/java/com/dayu/bigfish/Constants.java
View file @
8abd67a0
...
...
@@ -2,8 +2,6 @@ package com.dayu.bigfish;
import
com.dayu.bigfish.utils.LogUtils
;
import
static
android
.
R
.
id
.
message
;
/**
* Created by MrWang on 2017/8/20.
*/
...
...
@@ -26,7 +24,7 @@ public class Constants {
public
static
final
String
BASE_URL
=
"https://mobile.dayu.ai"
;
/***********************测试环境配置**********************************/
/*
public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
public
static
final
String
LOGIN_URL
=
"http://47.94.101.239:3112/check"
;
//登录时发送验证码的URL
public
static
final
String
REGISTER_URL
=
BASE_TEST
+
"/api-user/"
+
"account/loginSms/"
;
//根据工单状态获取分页工单信息的路径
...
...
@@ -70,55 +68,54 @@ public class Constants {
public
final
static
String
MESSAGE_HX
=
BASE_TEST
+
"/api-message/"
+
"hXMessage"
;
//处理工单上传照片
public
final
static
String
UP_PHOTO
=
"http://47.94.101.239:3111/file/uploadMore"
;
*/
/**************************正式环境*******************************/
//登录的URL
public
static
final
String
LOGIN_URL
=
BASE_URL
+
"/check"
;
//登录时发送验证码的URL
public
static
final
String
REGISTER_URL
=
BASE_URL
+
"/api-user/"
+
"account/loginSms/"
;
//根据工单状态获取分页工单信息的路径
public
static
final
String
ORDER_URL
=
BASE_URL
+
"/api-order/"
+
"orders/findSimpleOrderVOByPage"
;
//异常单获取
public
static
final
String
ERROR_ORDER
=
BASE_URL
+
"/api-order/"
+
"orders/findExceptionSimpleOrderVO"
;
//工程师接单
public
static
final
String
ORDER_RECEIVING
=
BASE_URL
+
"/api-order/"
+
"orders/"
;
//再次上门、重新预约时间
public
static
final
String
ORDER_DOOR
=
BASE_URL
+
"/api-order/"
+
"orders/bespeakDoor"
;
//开始出发
public
static
final
String
START_ORDER
=
BASE_URL
+
"/api-order/"
+
"orders/onWay/"
;
//开始服务
public
static
final
String
START_SERVE
=
BASE_URL
+
"/api-order/"
+
"orders/onWorking/"
;
//工单详情信息,包含评价,投诉,服务记录
public
static
final
String
ORDER_DETAILS
=
BASE_URL
+
"/api-order/"
+
"orders/"
;
//工单完成,提交验收报告
public
static
final
String
ORDER_FINISH
=
BASE_URL
+
"/api-order/"
+
"orders/waitCustomerCheck"
;
//个人中心
public
static
final
String
PERSONAL_CENTER
=
BASE_URL
+
"/api-user/"
+
"engineerInfo/accountId/"
;
//单表查询工单记录
public
final
static
String
SELECT_ORDER
=
BASE_URL
+
"/api-order/"
+
"orders/"
;
//根据工程师id和工程师id获取今日业绩(今日收益)
public
final
static
String
USER_ORDER_REVENUE
=
BASE_URL
+
"/api-count/"
+
"ordersStatistics/income/"
;
//根据站点id和工程师id获取工程师今日接单数量
public
final
static
String
USER_ORDER_RECEIVING
=
BASE_URL
+
"/api-count/"
+
"ordersStatistics/tasks/"
;
//服务记录、工程师评价
public
final
static
String
USER_REVENUE
=
BASE_URL
+
"/api-count/"
+
"ordersStatistics/total/"
;
//反馈提交
public
final
static
String
SET_IDEA_COMMIT
=
BASE_URL
+
"/api-base/"
+
"suggest"
;
//版本更新检测
public
final
static
String
UPDATA_VERSION
=
BASE_URL
+
"/api-base/"
+
"appVersion/newestVersion/appId/"
;
//版本更新、获取新版本信息
public
final
static
String
UPGRADE_VERSION
=
BASE_URL
+
"/api-base/"
+
"appVersion/versionInfo"
;
public
final
static
String
COMMIT_VERSION_INFO
=
BASE_URL
+
"/api-base/"
+
"versionUpgrade"
;
//工单记录/搜索工单
public
final
static
String
WORKSSHEET_RECORD
=
BASE_URL
+
"/api-order/"
+
"orders/findSimpleOrderVOByPage"
;
//获取首页tab状态的数量
public
final
static
String
TAB_NUM
=
BASE_URL
+
"/api-order/"
+
"orders/"
;
//环信消息
public
final
static
String
MESSAGE_HX
=
BASE_URL
+
"/api-message/"
+
"hXMessage"
;
//处理工单上传照片
public
final
static
String
UP_PHOTO
=
BASE_URL
+
"/file/uploadMore"
;
// /**************************正式环境*******************************/
// //登录的URL
// public static final String LOGIN_URL = BASE_URL + "/check";
// //登录时发送验证码的URL
// public static final String REGISTER_URL = BASE_URL + "/api-user/" + "account/loginSms/";
// //根据工单状态获取分页工单信息的路径
// public static final String ORDER_URL = BASE_URL + "/api-order/" + "orders/findSimpleOrderVOByPage";
// //异常单获取
// public static final String ERROR_ORDER = BASE_URL + "/api-order/" + "orders/findExceptionSimpleOrderVO";
// //工程师接单
//
// public static final String ORDER_RECEIVING = BASE_URL + "/api-order/" + "orders/";
// //再次上门、重新预约时间
// public static final String ORDER_DOOR = BASE_URL + "/api-order/" + "orders/bespeakDoor";
// //开始出发
// public static final String START_ORDER = BASE_URL + "/api-order/" + "orders/onWay/";
// //开始服务
// public static final String START_SERVE = BASE_URL + "/api-order/" + "orders/onWorking/";
// //工单详情信息,包含评价,投诉,服务记录
// public static final String ORDER_DETAILS = BASE_URL + "/api-order/" + "orders/";
// //工单完成,提交验收报告
// public static final String ORDER_FINISH = BASE_URL + "/api-order/" + "orders/waitCustomerCheck";
// //个人中心
// public static final String PERSONAL_CENTER = BASE_URL + "/api-user/" + "engineerInfo/accountId/";
// //单表查询工单记录
// public final static String SELECT_ORDER = BASE_URL + "/api-order/" + "orders/";
// //根据工程师id和工程师id获取今日业绩(今日收益)
// public final static String USER_ORDER_REVENUE = BASE_URL + "/api-count/" + "ordersStatistics/income/";
// //根据站点id和工程师id获取工程师今日接单数量
// public final static String USER_ORDER_RECEIVING = BASE_URL + "/api-count/" + "ordersStatistics/tasks/";
// //服务记录、工程师评价
// public final static String USER_REVENUE = BASE_URL + "/api-count/" + "ordersStatistics/total/";
// //反馈提交
// public final static String SET_IDEA_COMMIT = BASE_URL + "/api-base/" + "suggest";
// //版本更新检测
// public final static String UPDATA_VERSION = BASE_URL + "/api-base/" + "appVersion/newestVersion/appId/";
// //版本更新、获取新版本信息
// public final static String UPGRADE_VERSION = BASE_URL + "/api-base/" + "appVersion/versionInfo";
// public final static String COMMIT_VERSION_INFO = BASE_URL + "/api-base/" + "versionUpgrade";
// //工单记录/搜索工单
// public final static String WORKSSHEET_RECORD = BASE_URL + "/api-order/" + "orders/findSimpleOrderVOByPage";
// //获取首页tab状态的数量
// public final static String TAB_NUM = BASE_URL + "/api-order/" + "orders/";
// //环信消息
// public final static String MESSAGE_HX = BASE_URL + "/api-message/" + "hXMessage";
// //处理工单上传照片
// public final static String UP_PHOTO = BASE_URL + "/file/uploadMore";
/***********************其他配置**********************************/
...
...
app/src/main/java/com/dayu/bigfish/MainActivity.java
View file @
8abd67a0
package
com
.
dayu
.
bigfish
;
import
android.app.Activity
;
import
android.app.ActivityManager
;
import
android.app.AlertDialog
;
import
android.app.Notification
;
import
android.app.NotificationManager
;
import
android.app.PendingIntent
;
import
android.app.ProgressDialog
;
import
android.content.Context
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.content.pm.PackageInfo
;
import
android.content.pm.PackageManager
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Environment
;
import
android.os.SystemClock
;
import
android.support.annotation.RequiresApi
;
import
android.support.v7.app.AppCompatActivity
;
import
android.support.v7.app.NotificationCompat
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
android.widget.Toast
;
import
com.dayu.bigfish.activity.HomeActivity
;
import
com.dayu.bigfish.activity.LoginActivity
;
import
com.dayu.bigfish.activity.MessageActivity
;
import
com.dayu.bigfish.bean.BaseStringBean
;
import
com.dayu.bigfish.bean.InformBean
;
import
com.dayu.bigfish.bean.MessageTell
;
import
com.dayu.bigfish.bean.UserInfo
;
import
com.dayu.bigfish.bean.VersionBase
;
import
com.dayu.bigfish.eventbus.RefreReceiveData
;
import
com.dayu.bigfish.eventbus.RefreshTabNum
;
import
com.dayu.bigfish.managers.UserManager
;
import
com.dayu.bigfish.utils.LogUtils
;
import
com.dayu.bigfish.utils.ToastUtils
;
import
com.google.gson.Gson
;
import
com.hyphenate.EMConnectionListener
;
import
com.hyphenate.EMError
;
...
...
@@ -44,24 +27,11 @@ import com.hyphenate.EMMessageListener;
import
com.hyphenate.chat.EMClient
;
import
com.hyphenate.chat.EMMessage
;
import
com.hyphenate.util.NetUtils
;
import
com.lidroid.xutils.HttpUtils
;
import
com.lidroid.xutils.exception.HttpException
;
import
com.lidroid.xutils.http.ResponseInfo
;
import
com.lidroid.xutils.http.callback.RequestCallBack
;
import
com.lzy.okgo.OkGo
;
import
com.lzy.okgo.callback.StringCallback
;
import
org.greenrobot.eventbus.EventBus
;
import
java.io.File
;
import
java.util.ArrayList
;
import
java.util.List
;
import
okhttp3.Call
;
import
okhttp3.Response
;
import
static
android
.
os
.
Build
.
ID
;
public
class
MainActivity
extends
AppCompatActivity
{
/* public String name;
public String pwd;*/
...
...
@@ -113,7 +83,6 @@ public class MainActivity extends AppCompatActivity {
//注册监听事件
EMMessageListener
msgListener
=
new
EMMessageListener
()
{
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
JELLY_BEAN
)
@Override
public
void
onMessageReceived
(
List
<
EMMessage
>
messages
)
{
//收到消息
...
...
app/src/main/java/com/dayu/bigfish/activity/DeleteActivty.java
View file @
8abd67a0
...
...
@@ -9,7 +9,6 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.widget.Button
;
import
android.widget.ImageView
;
import
android.widget.RelativeLayout
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.R
;
...
...
@@ -33,8 +32,6 @@ public class DeleteActivty extends Activity {
Button
galleryBack
;
@BindView
(
R
.
id
.
gallery_del
)
Button
galleryDel
;
@BindView
(
R
.
id
.
headview
)
RelativeLayout
headview
;
@BindView
(
R
.
id
.
gallery01
)
ViewPager
gallery01
;
//当前的位置
...
...
app/src/main/java/com/dayu/bigfish/activity/HomeActivity.java
View file @
8abd67a0
...
...
@@ -145,7 +145,6 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
* 初始化待接单列表数据-->控制小红点显示和隐藏
*/
private
void
initReceiveData
(
String
token
)
{
OkGo
.
get
(
Constants
.
ORDER_URL
)
.
headers
(
"token"
,
token
)
.
params
(
"state"
,
1
)
...
...
app/src/main/java/com/dayu/bigfish/activity/UpdataSubscribeTimeActivity.java
View file @
8abd67a0
package
com
.
dayu
.
bigfish
.
activity
;
import
android.app.DatePickerDialog
;
import
android.app.TimePickerDialog
;
import
android.content.Intent
;
import
android.graphics.Color
;
import
android.os.Bundle
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.DatePicker
;
import
android.widget.EditText
;
import
android.widget.ImageView
;
import
android.widget.LinearLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
android.widget.TimePicker
;
import
com.bigkoo.pickerview.TimePickerView
;
import
com.dayu.bigfish.R
;
...
...
@@ -38,8 +34,6 @@ import butterknife.BindView;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
import
static
android
.
media
.
CamcorderProfile
.
get
;
import
static
cn
.
finalteam
.
toolsfinal
.
DateUtils
.
getTime
;
import
static
java
.
lang
.
Integer
.
parseInt
;
/**
...
...
@@ -161,11 +155,11 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
myToday
=
Integer
.
parseInt
(
getTimetoday
(
date2
));
int
sysYear
=
(
int
)
myList
.
get
(
0
);
int
sysMoths
=
(
int
)
myList
.
get
(
1
);
int
sysToday
=
(
int
)
myList
.
get
(
2
);
if
(
myYears
<
sysYear
||
myMonths
<
sysMoths
||
myToday
<
sysToday
)
{
int
sysToday
=
(
int
)
myList
.
get
(
2
);
if
(
myYears
<
sysYear
||
myMonths
<
sysMoths
||
myToday
<
sysToday
)
{
ToastUtils
.
showShortToast
(
"请选择合法的时间"
);
return
;
}
else
{
}
else
{
textDateValue
.
setText
(
time
);
}
...
...
@@ -266,10 +260,12 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"yyyy"
);
return
format
.
format
(
date
);
}
public
String
getTimeMonth
(
Date
date
)
{
//可根据需要自行截取数据显示
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"MM"
);
return
format
.
format
(
date
);
}
public
String
getTimetoday
(
Date
date
)
{
//可根据需要自行截取数据显示
SimpleDateFormat
format
=
new
SimpleDateFormat
(
"dd"
);
return
format
.
format
(
date
);
...
...
app/src/main/java/com/dayu/bigfish/fragment/order/message/SystemMessageFragment.java
View file @
8abd67a0
...
...
@@ -48,10 +48,6 @@ import butterknife.Unbinder;
import
okhttp3.Call
;
import
okhttp3.Response
;
import
static
android
.
icu
.
lang
.
UCharacter
.
GraphemeClusterBreak
.
V
;
import
static
android
.
media
.
CamcorderProfile
.
get
;
import
static
com
.
dayu
.
bigfish
.
R
.
id
.
view
;
import
static
com
.
umeng
.
analytics
.
pro
.
x
.
I
;
/**
* 系统工单状态通知
...
...
app/src/main/java/com/dayu/bigfish/moudle/personal/PersonalCenterView.java
View file @
8abd67a0
package
com
.
dayu
.
bigfish
.
moudle
.
personal
;
import
com.dayu.bigfish.bean.LoginBean
;
import
com.dayu.bigfish.bean.PersonalCenterBean
;
import
com.dayu.bigfish.bean.ReceOrderBean
;
import
com.dayu.bigfish.bean.ReceOrderNum
;
import
com.dayu.bigfish.bean.ReceUserRevenue
;
import
com.dayu.bigfish.bean.TodayPerformanceBean
;
...
...
@@ -20,7 +18,6 @@ public interface PersonalCenterView {
void
failed
(
String
msg
);
//工程师今日业绩
void
todayOrderSuccess
(
TodayPerformanceBean
todayPerformanceBean
);
void
todayOrderFailed
(
String
msg
);
...
...
app/src/main/res/layout/activty_delete.xml
View file @
8abd67a0
...
...
@@ -4,44 +4,48 @@
android:layout_height=
"match_parent"
android:background=
"@color/cl_home_edit_text"
>
<RelativeLayout
<LinearLayout
android:id=
"@+id/headview"
android:layout_width=
"fill_parent"
android:layout_height=
"45dp"
android:background=
"@color/cl_home_edit_text"
android:gravity=
"center_vertical"
>
<Button
android:textSize=
"14sp"
android:textColor=
"#fff"
android:id=
"@+id/gallery_back"
android:text=
"返回"
android:layout_width=
"50dp"
android:background=
"@color/cl_home_button"
android:layout_height=
"match_parent"
android:layout_weight=
"1"
android:background=
"@color/cl_home_button"
android:text=
"返回"
android:textColor=
"#fff"
android:textSize=
"14sp"
/>
<Button
android:textSize=
"14sp"
android:textColor=
"#fff"
android:id=
"@+id/gallery_del"
android:background=
"@color/cl_home_button"
android:layout_alignParentRight=
"true"
android:layout_width=
"50dp"
android:
text=
"删除
"
android:
layout_weight=
"1
"
android:layout_height=
"match_parent"
android:layout_alignParentRight=
"true"
android:background=
"@color/cl_home_button"
android:text=
"删除"
android:textColor=
"#fff"
android:textSize=
"14sp"
/>
</
Relative
Layout>
</
Linear
Layout>
<android.support.v4.view.ViewPager
android:id=
"@+id/gallery01"
android:layout_width=
"fill_parent"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_below=
"@id/headview"
android:layout_centerHorizontal=
"true"
android:background=
"@color/cl_order_text_one"
android:unselectedAlpha=
"1"
android:layout_alignParentBottom=
"true"
>
android:unselectedAlpha=
"1"
>
</android.support.v4.view.ViewPager>
</RelativeLayout>
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