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
cacddc8c
authored
Jan 13, 2020
by
mReturn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "fix"
This reverts commit
5ed2f2e6
parent
17ae5561
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
34 additions
and
41 deletions
app/src/main/java/com/dayu/bigfish/MyApplication.java
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
baseSDK/src/main/java/com/dayu/common/Constants.java
baseSDK/src/main/res/values/strings.xml
build.gradle
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
app/src/main/java/com/dayu/bigfish/MyApplication.java
View file @
cacddc8c
...
...
@@ -64,7 +64,6 @@ public class MyApplication extends BaseApplication {
//初始化环信
HxManager
.
getInstance
().
init
(
mContext
);
initTextSize
();
}
/**
...
...
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
View file @
cacddc8c
...
...
@@ -205,23 +205,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
if
(
event
.
num
<=
0
)
return
;
if
(
mOrderBadgeView
==
null
)
{
// mOrderBadgeView = new BadgeView(this);
// mOrderBadgeView.setTargetView(mBind.tabSecond);
// mOrderBadgeView.setBadgeGravity(Gravity.CENTER);
// mOrderBadgeView.setBadgeMargin(30, -8, 0, 0);
// mOrderBadgeView.setBackground(0,Color.TRANSPARENT);
// mOrderBadgeView.setTextColor(Color.parseColor("#FF5A4B"));
// mOrderBadgeView.setTextSize(18);
mOrderBadgeView
=
new
BadgeView
(
this
);
mOrderBadgeView
.
setTargetView
(
mBind
.
tabSecond
);
mOrderBadgeView
.
setBadgeGravity
(
Gravity
.
CENTER
|
Gravity
.
TOP
);
mOrderBadgeView
.
setBadgeMargin
(
20
,
0
,
0
,
0
);
mOrderBadgeView
.
setBadgeGravity
(
Gravity
.
CENTER
);
mOrderBadgeView
.
setBadgeMargin
(
30
,
-
8
,
0
,
0
);
mOrderBadgeView
.
setBackground
(
0
,
Color
.
TRANSPARENT
);
mOrderBadgeView
.
setTextColor
(
Color
.
parseColor
(
"#FF5A4B"
));
mOrderBadgeView
.
setTextSize
(
18
);
}
if
(
event
.
num
<
100
)
{
mOrderBadgeView
.
setText
(
event
.
num
+
""
,
TextView
.
BufferType
.
NORMAL
);
mOrderBadgeView
.
setText
(
"("
+
event
.
num
+
")"
);
}
else
{
mOrderBadgeView
.
setText
(
"
99+
"
);
mOrderBadgeView
.
setText
(
"
(99+)
"
);
}
// if (event.num < 100) {
...
...
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @
cacddc8c
...
...
@@ -12,30 +12,30 @@ public class Constants {
/**
* 测试环境配置.
*/
//
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
//
public static final String ENVIROMENT = "debug";
//
public static final String BASE_URL = "http://47.94.101.239:3112";
//
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
//
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
//
public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
//
public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
//
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
//
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
//
public static final boolean IS_DEBUG = true;
public
static
final
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
public
static
final
String
ENVIROMENT
=
"debug"
;
public
static
final
String
BASE_URL
=
"http://47.94.101.239:3112"
;
public
final
static
String
UP_PHOTO
=
"/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"
;
public
final
static
String
WEB_SOP
=
"http://47.94.101.239:9004/#/sop"
;
public
final
static
String
CHECK_MULTI_WEB_SOP
=
"http://47.94.101.239:9004/#/manyServiceResult"
;
public
final
static
String
MULTI_WEB_SOP
=
"http://47.94.101.239:9004/#/manySop"
;
public
final
static
String
WEB_SOP_DETAIL
=
"http://47.94.101.239:9004/#/sopdetail"
;
public
final
static
String
WEB_ZHI_SHI
=
"http://47.94.101.239:9004/#/detail"
;
public
static
final
boolean
IS_DEBUG
=
true
;
/**
* uat环境配置.
*/
public
static
final
String
ENVIROMENT
=
"uat"
;
public
static
final
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
public
static
final
String
BASE_URL
=
"http://47.95.223.6:3112"
;
public
final
static
String
UP_PHOTO
=
"/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"
;
public
final
static
String
WEB_SOP
=
"http://47.95.223.6:9004/#/sop"
;
public
final
static
String
WEB_SOP_DETAIL
=
"http://47.95.223.6:9004/#/sopdetail"
;
public
final
static
String
WEB_ZHI_SHI
=
"http://47.95.223.6:9004/#/detail"
;
public
final
static
String
CHECK_MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manyServiceResult"
;
public
final
static
String
MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manySop"
;
public
static
final
boolean
IS_DEBUG
=
true
;
//
public static final String ENVIROMENT = "uat";
//
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
//
public static final String BASE_URL = "http://47.95.223.6:3112";
//
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
//
public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
//
public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
//
public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
//
public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
//
public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
//
public static final boolean IS_DEBUG = true;
/**
* 正式环境.
...
...
baseSDK/src/main/res/values/strings.xml
View file @
cacddc8c
...
...
@@ -413,7 +413,7 @@
<string
name=
"pay_fail"
>
支付失败
</string>
<string
name=
"click_and_signature"
>
点击此处让客户去签名
</string>
<string
name=
"download_gaode_notice"
>
您还未安装高德地图~
</string>
<string
name=
"sop_title"
>
标准操作规范SOP
</string>
<string
name=
"sop_title"
>
标准操作规范SOP
~
</string>
<string
name=
"process_notice"
>
温馨提示:点击屏幕底部“提交验收”按钮,申请费用。
</string>
<string
name=
"next_step_process_order"
>
您的工单已全部完成,点击下一步去提交验收
</string>
<string
name=
"create_time"
>
下单时间
</string>
...
...
build.gradle
View file @
cacddc8c
...
...
@@ -5,8 +5,8 @@ buildscript {
ext
.
build_tools_version
=
"27.0.3"
ext
.
min_sdk_version
=
16
ext
.
target_sdk_version
=
26
ext
.
version_code
=
23
2
ext
.
verson_name
=
"2.3.
2
"
ext
.
version_code
=
23
1
ext
.
verson_name
=
"2.3.
1
"
ext
.
gradle_version
=
'3.1.4'
ext
.
isReleaseMinify
=
true
ext
.
isDebugMinify
=
false
...
...
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
View file @
cacddc8c
...
...
@@ -74,11 +74,11 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
private
void
receiveOrderSuccess
()
{
int
num
=
mTotalRows
-
1
;
mView
.
showToast
(
R
.
string
.
receive_order_success
);
//
mView.dumpBack();
mView
.
dumpBack
();
mDisPosable
=
Observable
.
timer
(
300
,
TimeUnit
.
MILLISECONDS
).
subscribe
(
aLong
->
{
//
EventBus.getDefault().post(new SwtichFragment(1));
EventBus
.
getDefault
().
post
(
new
SwtichFragment
(
1
));
EventBus
.
getDefault
().
post
(
new
RefreshTab
(
0
));
//
EventBus.getDefault().post(new RefreshReceivingNum(num < 0 ? 0 : num));
EventBus
.
getDefault
().
post
(
new
RefreshReceivingNum
(
num
<
0
?
0
:
num
));
EventBus
.
getDefault
().
post
(
new
RefreshApoiment
(-
1
));
mDisPosable
.
dispose
();
});
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
View file @
cacddc8c
...
...
@@ -191,7 +191,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
// tab.getError() + "", tab.getCanceled() + ""};
String
[]
tabNum
=
new
String
[]{
tab
.
getWaits
()
+
""
,
tab
.
getReservation
()
+
""
,
tab
.
getPendingservice
()
+
""
,
tab
.
getError
()
+
""
};
EventBus
.
getDefault
().
post
(
new
TabNumEvent
(
tab
.
getPendingservice
()+
tab
.
get
Waits
()+
tab
.
getReservation
()));
EventBus
.
getDefault
().
post
(
new
TabNumEvent
(
tab
.
getPendingservice
()+
tab
.
get
Error
()));
if
(
isFirstAddTab
)
{
mBind
.
tbHome
.
removeAllTabs
();
mBind
.
tbHome
.
addTab
(
mBind
.
tbHome
.
newTab
().
setCustomView
(
CreatTab
(
tabNum
[
0
],
tabDesc
[
0
])));
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
View file @
cacddc8c
...
...
@@ -81,7 +81,6 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
mBind
.
llVideo
.
setVisibility
(
TextUtils
.
isEmpty
(
operateInfo
.
getVideoUrl
())
?
View
.
GONE
:
View
.
VISIBLE
);
// http://dl.kf.ai/online/ka/spu/serviceDetailVideo/09ee6818825f705cf106b3c497d40af9.mp4
// String url = "http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4";
String
url
=
operateInfo
.
getVideoUrl
();
mBind
.
jzVideo
.
setUp
(
url
,
""
);
...
...
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