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
b89ddb7a
authored
Jul 18, 2018
by
罗翻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加拨打电话多联系人,增加地址支持导航
parent
7db96050
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
342 additions
and
143 deletions
app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java
baseSDK/src/main/java/com/dayu/common/Constants.java
baseSDK/src/main/res/values/strings.xml
gradle.properties
locationComponent/build.gradle
locationComponent/src/main/java/com/dayu/location/base/LocationUtils.java
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderThreeTabAdapter.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
orderCenter/src/main/release/AndroidManifest.xml
orderCenter/src/main/res/drawable-hdpi/icon_navigation.png
orderCenter/src/main/res/drawable-xhdpi/icon_navigation.png
orderCenter/src/main/res/drawable-xxhdpi/icon_navigation.png
orderCenter/src/main/res/drawable-xxxhdpi/icon_navigation.png
orderCenter/src/main/res/layout/activity_multi_process_order.xml
orderCenter/src/main/res/layout/activity_order_details.xml
orderCenter/src/main/res/layout/activity_process_order.xml
orderCenter/src/main/res/layout/fragment_multi_detail.xml
orderCenter/src/main/res/layout/fragment_order_datails.xml
orderCenter/src/main/res/layout/fragment_order_error_item.xml
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
orderCenter/src/main/res/layout/item_multi_process_foot.xml
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomePersonFragment.java
userCenter/src/main/res/layout/fragment_personal_center.xml
app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
View file @
b89ddb7a
...
...
@@ -47,7 +47,7 @@ public class LocationService extends Service {
sendMessage
();
}
};
mTimer
.
schedule
(
mTask
,
2000
,
3
0000
);
mTimer
.
schedule
(
mTask
,
2000
,
60
0000
);
}
public
void
sendMessage
()
{
...
...
@@ -58,7 +58,9 @@ public class LocationService extends Service {
@Override
public
int
onStartCommand
(
Intent
intent
,
int
flags
,
int
startId
)
{
String
id
=
intent
.
getStringExtra
(
Constants
.
ID
);
if
(
intent
!=
null
)
{
String
id
=
intent
.
getStringExtra
(
Constants
.
ID
);
}
sendMessage
();
return
super
.
onStartCommand
(
intent
,
flags
,
startId
);
}
...
...
baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java
View file @
b89ddb7a
...
...
@@ -43,14 +43,18 @@ public class CoreAdapter<M, B> extends RecyclerView.Adapter<BaseViewHolder> {
protected
OnChildClickListener
mOnChildClickListener
;
private
List
<
M
>
mOldDatas
=
new
ArrayList
<>();
private
boolean
isNeedFoot
=
false
;
private
View
mFootView
;
private
int
mFootViewType
;
@Override
public
BaseViewHolder
onCreateViewHolder
(
ViewGroup
parent
,
int
viewType
)
{
this
.
mContext
=
parent
.
getContext
();
if
(
mFootViewType
==
viewType
)
{
return
new
BaseViewHolder
(
DataBindingUtil
.
bind
(
mFootView
));
}
return
new
BaseViewHolder
(
DataBindingUtil
.
inflate
(
LayoutInflater
.
from
(
parent
.
getContext
()),
viewType
,
parent
,
false
));
}
public
CoreAdapter
(
boolean
needFoot
)
{
isNeedFoot
=
needFoot
;
if
(
needFoot
)
{
...
...
@@ -100,6 +104,16 @@ public class CoreAdapter<M, B> extends RecyclerView.Adapter<BaseViewHolder> {
mHeadTypeDatas
.
add
(
new
Item
(
i
,
data
));
}
/**
* 目前只支持添加一个脚布局.
* @param view
* @param type
*/
public
void
addFootViwe
(
View
view
,
int
type
)
{
mFootView
=
view
;
mFootViewType
=
type
;
}
public
void
addFooterViewType
(
@LayoutRes
int
i
,
Object
data
)
{
for
(
Item
a
:
mFootTypeDatas
)
{
if
(
a
.
type
==
i
)
{
...
...
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @
b89ddb7a
...
...
@@ -12,16 +12,16 @@ 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环境配置.
...
...
@@ -40,16 +40,16 @@ public class Constants {
/**
* 正式环境.
*/
public
static
final
String
ENVIROMENT
=
"release"
;
public
static
final
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
public
static
final
String
BASE_URL
=
"https://mobile.kf.ai"
;
public
final
static
String
UP_PHOTO
=
"/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"
;
public
final
static
String
WEB_SOP
=
"https://sop.kf.ai/#/sop"
;
public
final
static
String
WEB_SOP_DETAIL
=
"https://sop.kf.ai/#/sopdetail"
;
public
final
static
String
WEB_ZHI_SHI
=
"https://sop.kf.ai/#/detail"
;
public
final
static
String
CHECK_MULTI_WEB_SOP
=
"https://sop.kf.ai/#/manyServiceResult"
;
public
final
static
String
MULTI_WEB_SOP
=
"https://sop.kf.ai/#/manySop"
;
public
static
final
boolean
IS_DEBUG
=
false
;
//
public static final String ENVIROMENT = "release";
//
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
//
public static final String BASE_URL = "https://mobile.kf.ai";
//
public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
//
public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
//
public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
//
public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
//
public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
//
public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
//
public static final boolean IS_DEBUG = false;
/**
* 演示环境
...
...
baseSDK/src/main/res/values/strings.xml
View file @
b89ddb7a
...
...
@@ -357,6 +357,7 @@
<string
name=
"process_order_success"
>
提交验收成功
</string>
<string
name=
"signature_name"
>
请先签名!
</string>
<string
name=
"click_and_signature"
>
点击此处让客户去签名
</string>
<string
name=
"download_gaode_notice"
>
您还未安装高德地图~
</string>
<!--消息-->
<string
name=
"message_system"
>
系统通知
</string>
...
...
@@ -379,6 +380,7 @@
<string
name=
"input_content"
>
请输入内容
</string>
<string
name=
"commite_success"
>
提交成功
</string>
<string
name=
"on_download"
>
正在下载中,请稍后…
</string>
<string
name=
"go_download"
>
去安装
</string>
<string
name=
"download_faile"
>
下载失败
</string>
<string
name=
"have_new_version"
>
有新版本
</string>
<string
name=
"next_again"
>
下次再说
</string>
...
...
gradle.properties
View file @
b89ddb7a
...
...
@@ -7,4 +7,5 @@ isMessageModule=true
isOrderModule
=
true
##maven依赖
mavenMode
=
false
BASE_URL
=
http://47.94.101.239:3112
\ No newline at end of file
BASE_URL
=
http://47.94.101.239:3112
Android.useDeprecatedNdk
=
true
\ No newline at end of file
locationComponent/build.gradle
View file @
b89ddb7a
...
...
@@ -27,7 +27,7 @@ android {
dependencies
{
compile
fileTree
(
include:
[
'*.jar'
],
dir:
'libs'
)
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
'
androidTestImplementation
'com.android.support.test:runner:1.0.
2
'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.
2
'
implementation
files
(
'libs/Amap_2DMap_V5.2.0_20170627.jar'
)
}
locationComponent/src/main/java/com/dayu/location/base/LocationUtils.java
View file @
b89ddb7a
...
...
@@ -25,6 +25,7 @@ public class LocationUtils {
private
static
boolean
flag
=
true
;
private
static
MyLocationListener
mListener
;
private
static
Handler
mHandler
;
private
static
OpenMarketListener
marketListener
;
/**
* @param context
...
...
@@ -135,7 +136,7 @@ public class LocationUtils {
return
new
File
(
"/data/data/"
+
"com.autonavi.minimap"
).
exists
();
}
public
static
void
openMap
(
Context
mContext
,
String
address
)
{
public
static
void
openMap
(
Context
mContext
,
String
address
,
OpenMarketListener
listener
)
{
if
(
isInstallPackage
())
{
Intent
intent
=
new
Intent
(
"android.intent.action.VIEW"
,
android
.
net
.
Uri
.
parse
(
"androidamap://poi?sourceApplication=softname&keywords="
+
address
));
...
...
@@ -143,18 +144,21 @@ public class LocationUtils {
intent
.
addCategory
(
"android.intent.category.DEFAULT"
);
mContext
.
startActivity
(
intent
);
}
else
{
goToMarket
(
mContext
,
"com.autonavi.minimap"
);
listener
.
openMarket
(
);
}
}
p
rivate
static
void
goToMarket
(
Context
context
,
String
packageName
)
{
Uri
uri
=
Uri
.
parse
(
"market://details?id="
+
packageName
);
p
ublic
static
void
goToMarket
(
Context
context
)
{
Uri
uri
=
Uri
.
parse
(
"market://details?id="
+
"com.autonavi.minimap"
);
Intent
goToMarket
=
new
Intent
(
Intent
.
ACTION_VIEW
,
uri
);
try
{
context
.
startActivity
(
goToMarket
);
}
catch
(
ActivityNotFoundException
e
)
{
e
.
printStackTrace
();
}
}
public
interface
OpenMarketListener
{
void
openMarket
();
}
}
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
View file @
b89ddb7a
...
...
@@ -56,6 +56,7 @@ public class Order implements Serializable{
private
Integer
kaCompanyId
;
private
Integer
faceSwitch
;
//0:关闭;1:打开
public
Integer
getFaceSwitch
()
{
return
faceSwitch
;
}
...
...
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
View file @
b89ddb7a
...
...
@@ -783,7 +783,7 @@ public class OrderDetail implements Serializable {
}
}
public
class
accessories
implements
Serializable
{
public
static
class
accessories
implements
Serializable
{
private
int
id
;
private
String
name
;
private
int
orderId
;
...
...
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
View file @
b89ddb7a
...
...
@@ -50,6 +50,13 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
mAccountId
=
Integer
.
parseInt
(
UserManager
.
getInstance
().
getUser
().
getAccountId
());
mSpus
=
mView
.
getBundle
().
getParcelableArrayList
(
OrderConstant
.
SPUS
);
int
type
=
mView
.
getBundle
().
getInt
(
OrderConstant
.
ORDER_TYPE
);
mSpus
.
add
(
mSpus
.
get
(
0
));
mSpus
.
add
(
mSpus
.
get
(
0
));
mSpus
.
add
(
mSpus
.
get
(
0
));
mSpus
.
add
(
mSpus
.
get
(
0
));
mSpus
.
add
(
mSpus
.
get
(
0
));
mSpus
.
add
(
mSpus
.
get
(
0
));
mSpus
.
add
(
mSpus
.
get
(
0
));
mDatas
.
set
(
mSpus
);
if
(
mSpus
.
size
()
==
1
&&
type
==
1
)
{
mOrderType
=
1
;
...
...
orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
View file @
b89ddb7a
...
...
@@ -61,7 +61,6 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
private
LinearLayout
mLPayer
;
private
ArrayList
<
String
>
mPayerImages
=
new
ArrayList
<>();
private
List
<
LocalMedia
>
mSelectList
;
private
boolean
mFlag
=
true
;
private
ImageView
mArrow
;
private
LinearLayout
mPayerNotice
;
private
RelativeLayout
mAllSignature
;
...
...
@@ -88,28 +87,15 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mBind
.
tvTitle
.
setText
(
getString
(
R
.
string
.
submit_order
));
mIvWeight
=
(
UtilsScreen
.
getScreenWidth
(
mActivity
)
-
UtilsScreen
.
dip2px
(
mActivity
,
20
))
/
5
;
mBind
.
recyclerView
.
mCoreAdapter
.
addFooterViewType
(
R
.
layout
.
item_multi_process_foot
,
null
);
mBind
.
recyclerView
.
postDelayed
(()
->
{
if
(
mFlag
)
{
initFootView
();
}
},
500
);
mBind
.
recyclerView
.
setOnEndListener
(()
->
{
if
(
mFlag
)
{
initFootView
();
}
});
View
view
=
LayoutInflater
.
from
(
mActivity
).
inflate
(
R
.
layout
.
item_multi_process_foot
,
null
);
mBind
.
recyclerView
.
mCoreAdapter
.
addFootViwe
(
view
,
R
.
layout
.
item_multi_process_foot
);
initFootView
(
view
);
}
public
void
initFootView
()
{
View
view
=
mBind
.
recyclerView
.
getChildAt
(
0
);
public
void
initFootView
(
View
view
)
{
swtich
=
view
.
findViewById
(
R
.
id
.
iv_switch
);
RelativeLayout
rlPay
=
view
.
findViewById
(
R
.
id
.
rl_pay
);
LinearLayout
signature
=
view
.
findViewById
(
R
.
id
.
rl_signature
);
if
(
signature
==
null
)
{
return
;
}
mFlag
=
false
;
mSignature
=
signature
;
mSignature
=
view
.
findViewById
(
R
.
id
.
rl_signature
);
mDoorPrice
=
view
.
findViewById
(
R
.
id
.
et_door_price
);
mServerPrice
=
view
.
findViewById
(
R
.
id
.
et_serve_price
);
mMaterialsPrice
=
view
.
findViewById
(
R
.
id
.
et_materials_price
);
...
...
orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
View file @
b89ddb7a
...
...
@@ -274,9 +274,6 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
@Override
public
void
setFoucesable
()
{
mBind
.
tvBrand
.
setFocusable
(
false
);
mBind
.
etVersion
.
setFocusable
(
false
);
mBind
.
etSerialNum
.
setFocusable
(
false
);
mBind
.
ivPayer
.
setVisibility
(
View
.
GONE
);
mBind
.
tvPayer
.
setClickable
(
false
);
mBind
.
rlPalyerProve
.
setVisibility
(
View
.
GONE
);
...
...
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
View file @
b89ddb7a
...
...
@@ -8,6 +8,8 @@ import android.view.View;
import
com.alibaba.android.arouter.launcher.ARouter
;
import
com.amap.api.location.AMapLocation
;
import
com.bigkoo.pickerview.builder.OptionsPickerBuilder
;
import
com.bigkoo.pickerview.view.OptionsPickerView
;
import
com.dayu.base.ui.adapter.CoreAdapter
;
import
com.dayu.common.Constants
;
import
com.dayu.location.base.LocationUtils
;
...
...
@@ -35,7 +37,9 @@ import com.umeng.analytics.MobclickAgent;
import
org.greenrobot.eventbus.EventBus
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
...
...
@@ -81,7 +85,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder
.
orderLineOne
.
setVisibility
(
View
.
VISIBLE
);
holder
.
orderLineTwo
.
setVisibility
(
View
.
VISIBLE
);
holder
.
tvItemProcess
.
setVisibility
(
View
.
VISIBLE
);
// holder.itemTextDizhi.setOnClickListener(v -> LocationUtils.openMap(mContext, address
));
holder
.
navigation
.
setOnClickListener
(
v
->
LocationUtils
.
openMap
(
mContext
,
address
,
this
::
showOpenMarketDialog
));
final
int
id
=
item
.
getId
();
if
(
item
.
getAnyContacts
()
==
0
)
{
...
...
@@ -238,9 +242,11 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
});
if
(
item
.
getStatus
()
!=
1
)
{
holder
.
itemTextPhone
.
setOnClickListener
(
v
->
{
Intent
intent
=
new
Intent
(
Intent
.
ACTION_DIAL
);
intent
.
setData
(
Uri
.
parse
(
"tel:"
+
item
.
getCustomerMobile
()));
mContext
.
startActivity
(
intent
);
if
(!
TextUtils
.
isEmpty
(
item
.
getCustomerTelphome
()))
{
showMoblieDialog
(
item
.
getCustomerMobile
(),
item
.
getCustomerTelphome
());
}
else
{
takePhone
(
item
.
getCustomerMobile
());
}
Map
<
String
,
String
>
map_ekv
=
new
HashMap
<>();
if
(
item
.
getStatus
()
==
2
)
{
map_ekv
.
put
(
"type"
,
mContext
.
getString
(
R
.
string
.
receive_list
));
...
...
@@ -420,6 +426,39 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
customDialog
.
show
();
}
private
void
showOpenMarketDialog
()
{
CustomDialog
customDialog
=
new
CustomDialog
(
mContext
,
R
.
style
.
CustomDialog
,
UIUtils
.
getString
(
R
.
string
.
download_gaode_notice
)
,
(
dialog
,
confirm
)
->
{
if
(
confirm
)
{
LocationUtils
.
goToMarket
(
mContext
);
}
});
customDialog
.
setTitle
(
UIUtils
.
getString
(
R
.
string
.
reminder
))
.
setPositiveButton
(
UIUtils
.
getString
(
R
.
string
.
go_download
))
.
setNegativeButton
(
UIUtils
.
getString
(
R
.
string
.
cancle
));
customDialog
.
show
();
}
private
void
showMoblieDialog
(
String
mobile
,
String
tel
)
{
List
<
String
>
list
=
new
ArrayList
<>();
list
.
add
(
mobile
);
list
.
add
(
tel
);
OptionsPickerView
pvOptions
=
new
OptionsPickerBuilder
(
mContext
,
(
options1
,
options2
,
options3
,
v
)
->
takePhone
(
list
.
get
(
options1
)))
.
setContentTextSize
(
20
)
.
setLineSpacingMultiplier
(
2.0f
)
.
setContentTextSize
(
20
)
.
build
();
pvOptions
.
setPicker
(
list
);
pvOptions
.
show
();
}
private
void
takePhone
(
String
phone
)
{
Intent
intent
=
new
Intent
(
Intent
.
ACTION_DIAL
);
intent
.
setData
(
Uri
.
parse
(
"tel:"
+
phone
));
mContext
.
startActivity
(
intent
);
}
public
void
initPresenter
(
OrderDoingPresenter
presenter
)
{
mPresenter
=
presenter
;
}
...
...
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderThreeTabAdapter.java
View file @
b89ddb7a
...
...
@@ -4,12 +4,14 @@ import android.text.TextUtils;
import
android.view.View
;
import
com.dayu.base.ui.adapter.CoreAdapter
;
import
com.dayu.location.base.LocationUtils
;
import
com.dayu.order.R
;
import
com.dayu.order.api.protocol.ErrorOrder
;
import
com.dayu.order.api.protocol.Spu
;
import
com.dayu.order.databinding.FragmentOrderErrorItemBinding
;
import
com.dayu.utils.UIUtils
;
import
com.dayu.utils.UtilsDate
;
import
com.dayu.widgets.CustomDialog
;
import
static
com
.
dayu
.
utils
.
UtilsDate
.
FORMAT_ONE
;
import
static
com
.
dayu
.
utils
.
UtilsDate
.
LONG_TIME_FORMAT_TWO
;
...
...
@@ -54,9 +56,10 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
}
helper
.
itemTextWeixiu
.
setText
(
item
.
getProviderName
());
helper
.
itemTextWeixiuLeixing
.
setText
(
item
.
getCategoryName
());
helper
.
itemTextDizhi
.
setText
(
item
.
getProvinceName
()
+
item
.
getCityName
()
+
item
.
getDistrictName
()
+
item
.
getAddress
());
String
address
=
item
.
getProvinceName
()
+
item
.
getCityName
()
+
item
.
getDistrictName
()
+
item
.
getAddress
();
helper
.
itemTextDizhi
.
setText
(
address
);
helper
.
navigation
.
setOnClickListener
(
v
->
LocationUtils
.
openMap
(
mContext
,
address
,
this
::
showOpenMarketDialog
));
int
errorState
=
item
.
getExcptionCode
();
if
(
errorState
==
1
)
{
helper
.
errorState
.
setText
(
mContext
.
getString
(
R
.
string
.
receive_time_out
));
...
...
@@ -92,4 +95,17 @@ public class OrderThreeTabAdapter extends CoreAdapter<ErrorOrder, FragmentOrderE
}
}
private
void
showOpenMarketDialog
()
{
CustomDialog
customDialog
=
new
CustomDialog
(
mContext
,
R
.
style
.
CustomDialog
,
UIUtils
.
getString
(
R
.
string
.
download_gaode_notice
)
,
(
dialog
,
confirm
)
->
{
if
(
confirm
)
{
LocationUtils
.
goToMarket
(
mContext
);
}
});
customDialog
.
setTitle
(
UIUtils
.
getString
(
R
.
string
.
reminder
))
.
setPositiveButton
(
UIUtils
.
getString
(
R
.
string
.
go_download
))
.
setNegativeButton
(
UIUtils
.
getString
(
R
.
string
.
cancle
));
customDialog
.
show
();
}
}
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
View file @
b89ddb7a
...
...
@@ -11,6 +11,7 @@ import android.widget.ImageView;
import
com.dayu.base.ui.adapter.CoreAdapter
;
import
com.dayu.base.ui.fragment.DataBindingFragment
;
import
com.dayu.common.Constants
;
import
com.dayu.location.base.LocationUtils
;
import
com.dayu.order.R
;
import
com.dayu.order.api.protocol.OrderDetail
;
import
com.dayu.order.api.protocol.Spu
;
...
...
@@ -24,6 +25,8 @@ import com.dayu.order.ui.activity.QrCodeActivity;
import
com.dayu.order.ui.activity.ServerInstructionActivity
;
import
com.dayu.utils.GlideImageLoader
;
import
com.dayu.utils.ToastUtils
;
import
com.dayu.utils.UIUtils
;
import
com.dayu.widgets.CustomDialog
;
import
com.dayu.widgets.listener.OnItemClickListener
;
import
com.umeng.analytics.MobclickAgent
;
...
...
@@ -56,6 +59,8 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
mServerAdapter
.
setViewType
(
R
.
layout
.
item_detail_server_info
);
mBind
.
rlServerContent
.
setAdapter
(
mServerAdapter
);
mServerAdapter
.
setData
(
detail
.
getSpus
());
mBind
.
navigation
.
setOnClickListener
(
v
->
LocationUtils
.
openMap
(
mActivity
,
detail
.
getProvinceName
()
+
detail
.
getCityName
()
+
detail
.
getDistrictName
()
+
detail
.
getAddress
(),
this
::
showOpenMarketDialog
));
mServerAdapter
.
setOnItemClickListener
(
new
OnItemClickListener
<
Spu
,
ItemDetailServerInfoBinding
>()
{
@Override
public
void
OnItemClick
(
Spu
item
,
ItemDetailServerInfoBinding
bind
)
{
...
...
@@ -103,6 +108,19 @@ public class MultiOrderDetailFragment extends DataBindingFragment<FragmentMultiD
mBind
.
customerSignature
.
setOnClickListener
(
v
->
imgMax
(
detail
.
getEsignatureImg
()));
}
private
void
showOpenMarketDialog
()
{
CustomDialog
customDialog
=
new
CustomDialog
(
mActivity
,
R
.
style
.
CustomDialog
,
UIUtils
.
getString
(
R
.
string
.
download_gaode_notice
)
,
(
dialog
,
confirm
)
->
{
if
(
confirm
)
{
LocationUtils
.
goToMarket
(
mActivity
);
}
});
customDialog
.
setTitle
(
UIUtils
.
getString
(
R
.
string
.
reminder
))
.
setPositiveButton
(
UIUtils
.
getString
(
R
.
string
.
go_download
))
.
setNegativeButton
(
UIUtils
.
getString
(
R
.
string
.
cancle
));
customDialog
.
show
();
}
public
String
getStaus
(
int
staus
)
{
if
(
staus
==
1
)
{
return
mActivity
.
getString
(
R
.
string
.
not_receive_order
);
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
View file @
b89ddb7a
...
...
@@ -8,6 +8,7 @@ import android.view.View;
import
com.dayu.base.ui.adapter.CoreAdapter
;
import
com.dayu.base.ui.fragment.DataBindingFragment
;
import
com.dayu.common.Constants
;
import
com.dayu.location.base.LocationUtils
;
import
com.dayu.order.R
;
import
com.dayu.order.api.protocol.OrderDetail
;
import
com.dayu.order.common.OrderConstant
;
...
...
@@ -18,6 +19,7 @@ import com.dayu.order.ui.activity.QrCodeActivity;
import
com.dayu.order.ui.activity.ServerInstructionActivity
;
import
com.dayu.utils.ToastUtils
;
import
com.dayu.utils.UIUtils
;
import
com.dayu.widgets.CustomDialog
;
import
com.dayu.widgets.listener.OnItemClickListener
;
import
com.umeng.analytics.MobclickAgent
;
...
...
@@ -78,6 +80,8 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
mBind
.
tvLookMore
.
setVisibility
(
View
.
GONE
);
}
});
mBind
.
navigation
.
setOnClickListener
(
v
->
LocationUtils
.
openMap
(
mActivity
,
dataBean
.
getProvinceName
()
+
dataBean
.
getCityName
()
+
dataBean
.
getDistrictName
()
+
dataBean
.
getAddress
(),
this
::
showOpenMarketDialog
));
if
(
dataBean
.
getIsPay
()
==
null
||
dataBean
.
getIsPay
()
==
1
)
{
mBind
.
rlNoCharge
.
setVisibility
(
View
.
VISIBLE
);
mBind
.
rlHaveCharge
.
setVisibility
(
View
.
GONE
);
...
...
@@ -153,6 +157,19 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
}
}
private
void
showOpenMarketDialog
()
{
CustomDialog
customDialog
=
new
CustomDialog
(
mActivity
,
R
.
style
.
CustomDialog
,
UIUtils
.
getString
(
R
.
string
.
download_gaode_notice
)
,
(
dialog
,
confirm
)
->
{
if
(
confirm
)
{
LocationUtils
.
goToMarket
(
mActivity
);
}
});
customDialog
.
setTitle
(
UIUtils
.
getString
(
R
.
string
.
reminder
))
.
setPositiveButton
(
UIUtils
.
getString
(
R
.
string
.
go_download
))
.
setNegativeButton
(
UIUtils
.
getString
(
R
.
string
.
cancle
));
customDialog
.
show
();
}
public
void
dumpToServerInstruction
()
{
Bundle
bundle
=
new
Bundle
();
bundle
.
putInt
(
Constants
.
ID
,
mDetail
.
getSpuId
());
...
...
orderCenter/src/main/release/AndroidManifest.xml
View file @
b89ddb7a
...
...
@@ -69,7 +69,7 @@
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activity.MultiProcessOrderActivity"
android:windowSoftInputMode=
"state
Visible
|adjustResize"
android:windowSoftInputMode=
"state
Hidden
|adjustResize"
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activity.SignatureActivity"
...
...
orderCenter/src/main/res/drawable-hdpi/icon_navigation.png
0 → 100644
View file @
b89ddb7a
1.17 KB
orderCenter/src/main/res/drawable-xhdpi/icon_navigation.png
0 → 100644
View file @
b89ddb7a
1.58 KB
orderCenter/src/main/res/drawable-xxhdpi/icon_navigation.png
0 → 100644
View file @
b89ddb7a
2.39 KB
orderCenter/src/main/res/drawable-xxxhdpi/icon_navigation.png
0 → 100644
View file @
b89ddb7a
3.25 KB
orderCenter/src/main/res/layout/activity_multi_process_order.xml
View file @
b89ddb7a
...
...
@@ -5,6 +5,7 @@
<import
type=
"android.view.View"
/>
<import
type=
"android.text.TextUtils"
/>
<variable
name=
"presenter"
...
...
@@ -108,9 +109,8 @@
android:layout_marginLeft=
"90dp"
android:layout_toEndOf=
"@+id/text_one_text"
android:layout_toRightOf=
"@+id/text_one_text"
android:hint=
"@string/input_product_name"
android:text=
"@{presenter.mDetail.categoryThreeName??@string/now_no}"
android:textColor=
"@color/cl_selector_hui"
android:text=
"@{!TextUtils.isEmpty(presenter.mDetail.categoryThreeName)?presenter.mDetail.categoryThreeName:@string/no_data}"
android:textColor=
"@color/default_text_color"
android:textSize=
"@dimen/sp_15"
/>
</RelativeLayout>
...
...
@@ -146,7 +146,7 @@
android:background=
"@null"
android:hint=
"@string/order_brand_name"
android:text=
"@={presenter.mBrandName}"
android:textColor=
"@color/
cl_selector_hui
"
android:textColor=
"@color/
default_text_color
"
android:textSize=
"@dimen/sp_15"
/>
</RelativeLayout>
...
...
@@ -180,9 +180,8 @@
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"90dp"
android:layout_toRightOf=
"@id/tv_version"
android:hint=
"@string/order_product_model_hint"
android:text=
"@{presenter.mDetail.productModel??@string/now_no}"
android:textColor=
"@color/cl_selector_hui"
android:text=
"@{!TextUtils.isEmpty(presenter.mDetail.productModel)?presenter.mDetail.productModel:@string/no_data}"
android:textColor=
"@color/default_text_color"
android:textSize=
"@dimen/sp_15"
/>
</RelativeLayout>
...
...
@@ -228,7 +227,7 @@
android:background=
"@null"
android:hint=
"@string/order_serail_hint"
android:text=
"@={presenter.mSn}"
android:textColor=
"@color/
cl_selector_hui
"
android:textColor=
"@color/
default_text_color
"
android:textSize=
"@dimen/sp_15"
/>
</RelativeLayout>
...
...
orderCenter/src/main/res/layout/activity_order_details.xml
View file @
b89ddb7a
...
...
@@ -13,11 +13,11 @@
<ImageView
android:id=
"@+id/title_back"
android:layout_width=
"
11dp
"
android:layout_height=
"
22dp
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"
wrap_content
"
android:layout_gravity=
"center"
android:
layout_margin
Left=
"15dp"
android:
layout_margin
Right=
"25dp"
android:
padding
Left=
"15dp"
android:
padding
Right=
"25dp"
android:src=
"@drawable/back_btn_normal"
/>
<LinearLayout
...
...
orderCenter/src/main/res/layout/activity_process_order.xml
View file @
b89ddb7a
...
...
@@ -6,6 +6,8 @@
<import
type=
"android.view.View"
/>
<import
type=
"android.text.TextUtils"
/>
<variable
name=
"presenter"
type=
"com.dayu.order.presenter.processorder.ProcessOrderPresenter"
/>
...
...
@@ -107,8 +109,8 @@
android:layout_marginLeft=
"90dp"
android:layout_toEndOf=
"@+id/text_one_text"
android:layout_toRightOf=
"@+id/text_one_text"
android:text=
"@{
presenter.mDetail.categoryName??
@string/now_no}"
android:textColor=
"@color/
cl_selector_hui
"
android:text=
"@{
!TextUtils.isEmpty(presenter.mDetail.categoryName)?presenter.mDetail.categoryName:
@string/now_no}"
android:textColor=
"@color/
default_text_color
"
android:textSize=
"@dimen/sp_15"
/>
</RelativeLayout>
...
...
@@ -134,7 +136,7 @@
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/sp_15"
/>
<
EditText
<
TextView
android:id=
"@+id/tv_brand"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -142,9 +144,8 @@
android:layout_marginLeft=
"90dp"
android:layout_toRightOf=
"@id/text_two_text"
android:background=
"@null"
android:hint=
"@string/order_brand_name"
android:text=
"@={presenter.mBrandName}"
android:textColor=
"@color/cl_selector_hui"
android:text=
'@{!TextUtils.isEmpty(presenter.mDetail.brandName)?presenter.mDetail.brandName:@string/no_data}'
android:textColor=
"@color/default_text_color"
android:textSize=
"@dimen/sp_15"
/>
</RelativeLayout>
...
...
@@ -171,7 +172,7 @@
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/sp_15"
/>
<
EditText
<
TextView
android:id=
"@+id/et_version"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -179,9 +180,8 @@
android:layout_marginLeft=
"90dp"
android:layout_toRightOf=
"@id/tv_version"
android:background=
"@null"
android:hint=
"@string/order_product_model_hint"
android:text=
"@={presenter.mProductModel}"
android:textColor=
"@color/cl_selector_hui"
android:text=
'@{!TextUtils.isEmpty(presenter.mDetail.productModel)?presenter.mDetail.productModel:@string/no_data}'
android:textColor=
"@color/default_text_color"
android:textSize=
"@dimen/sp_15"
/>
</RelativeLayout>
...
...
@@ -217,7 +217,7 @@
android:textSize=
"@dimen/sp_15"
android:visibility=
"gone"
/>
<
EditText
<
TextView
android:id=
"@+id/et_serial_num"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -225,9 +225,8 @@
android:layout_marginLeft=
"75dp"
android:layout_toRightOf=
"@id/tv_serial_num"
android:background=
"@null"
android:hint=
"@string/order_serail_hint"
android:text=
"@={presenter.mSN}"
android:textColor=
"@color/cl_selector_hui"
android:text=
"@{!TextUtils.isEmpty(presenter.mDetail.sn)?presenter.mDetail.sn:@string/no_data}"
android:textColor=
"@color/default_text_color"
android:textSize=
"@dimen/sp_15"
/>
</RelativeLayout>
...
...
@@ -300,6 +299,7 @@
android:layout_centerVertical=
"true"
android:layout_toRightOf=
"@id/tv_player"
android:text=
"*"
android:visibility=
"gone"
android:textColor=
"#F74848"
android:textSize=
"@dimen/sp_15"
/>
...
...
@@ -314,7 +314,7 @@
android:hint=
"@string/order_select_payer"
android:onClick=
"@{()->presenter.showPayerDialog()}"
android:text=
"@{presenter.mPayer}"
android:textColor=
"@color/
cl_selector_hui
"
android:textColor=
"@color/
default_text_color
"
android:textSize=
"@dimen/sp_15"
/>
<ImageView
...
...
@@ -341,6 +341,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:layout_marginRight=
"@dimen/dp_15"
android:layout_marginTop=
"@dimen/dp_8"
android:visibility=
"gone"
android:text=
"@string/order_select_payer_notice"
android:textColor=
"#F74848"
/>
...
...
@@ -422,6 +423,7 @@
android:layout_height=
"@dimen/dp_147"
android:layout_marginLeft=
"@dimen/dp_8"
android:layout_marginTop=
"@dimen/dp_17"
android:layout_marginRight=
"15dp"
android:layout_toRightOf=
"@id/time_subscribe_remark"
android:background=
"@drawable/subscribe_time_shape"
android:gravity=
"top"
...
...
orderCenter/src/main/res/layout/fragment_multi_detail.xml
View file @
b89ddb7a
...
...
@@ -181,8 +181,9 @@
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_remark"
android:layout_marginTop=
"15dp"
android:text=
"
附件:
"
android:text=
"
@string/order_attachment
"
android:textColor=
"@color/tv_cl"
android:layout_marginBottom=
"10dp"
android:textSize=
"14sp"
/>
<LinearLayout
...
...
@@ -192,6 +193,7 @@
android:layout_below=
"@+id/tv_remark"
android:layout_marginLeft=
"19dp"
android:layout_marginTop=
"@dimen/dp_15"
android:layout_marginBottom=
"10dp"
android:layout_toRightOf=
"@+id/tv_remark"
>
<android.support.v7.widget.RecyclerView
...
...
@@ -298,29 +300,60 @@
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_contact_tel"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/customer_moblie"
android:layout_marginLeft=
"@dimen/dp_10"
android:layout_marginTop=
"@dimen/dp_13"
android:layout_toRightOf=
"@+id/tv_customer_mobile"
android:text=
'@{item.customerTelphome}'
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/sp_13.3"
/>
<TextView
android:id=
"@+id/tv_address"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_c
ustomer_mobile
"
android:layout_below=
"@+id/tv_c
ontact_tel
"
android:layout_marginTop=
"@dimen/dp_15"
android:text=
"客户地址:"
android:textColor=
"@color/tv_cl"
android:textSize=
"14sp"
/>
<
TextView
android:id=
"@+id/
customer_address
"
android:layout_width=
"
wrap_cont
ent"
<
LinearLayout
android:id=
"@+id/
navigation
"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_customer_mobile"
android:layout_marginLeft=
"19dp"
android:layout_marginLeft=
"@dimen/dp_10"
android:layout_marginTop=
"@dimen/dp_15"
android:layout_toRightOf=
"@+id/tv_address"
android:ellipsize=
"end"
android:maxLines=
"2"
android:text=
'@{item.provinceName+item.cityName+item.districtName+item.address}'
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14sp"
/>
android:layout_below=
"@+id/tv_contact_tel"
android:layout_toRightOf=
"@id/tv_address"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/tv_customer_address"
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
android:ellipsize=
"end"
android:maxLines=
"2"
android:text=
'@{item.provinceName+item.cityName+item.districtName+item.address}'
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/sp_13.3"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"15dp"
android:layout_marginRight=
"15dp"
android:paddingBottom=
"5dp"
android:layout_gravity=
"center_vertical"
android:src=
"@drawable/icon_navigation"
/>
</LinearLayout>
<TextView
android:id=
"@+id/tv_end_time"
...
...
@@ -328,6 +361,7 @@
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/tv_address"
android:layout_marginTop=
"@dimen/dp_15"
android:layout_marginBottom=
"10dp"
android:text=
"期望时间:"
android:textColor=
"@color/tv_cl"
android:textSize=
"14sp"
/>
...
...
@@ -339,6 +373,7 @@
android:layout_below=
"@+id/tv_address"
android:layout_marginLeft=
"19dp"
android:layout_marginTop=
"@dimen/dp_15"
android:layout_marginBottom=
"10dp"
android:layout_toRightOf=
"@+id/tv_end_time"
android:text=
'@{!TextUtils.isEmpty(item.appointmentTime)?item.appointmentTime:@string/no_data}'
android:textColor=
"@color/cl_home_title_text_color"
...
...
orderCenter/src/main/res/layout/fragment_order_datails.xml
View file @
b89ddb7a
...
...
@@ -234,9 +234,9 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/rl_info_detail"
android:layout_marginBottom=
"5dp"
android:layout_marginLeft=
"@dimen/dp_13"
android:layout_marginTop=
"@dimen/dp_13"
android:layout_marginBottom=
"5dp"
android:orientation=
"horizontal"
>
<TextView
...
...
@@ -349,29 +349,59 @@
android:textSize=
"@dimen/sp_13.3"
/>
<TextView
android:id=
"@+id/tv_contact_tel"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/tv_contact_mode"
android:layout_marginLeft=
"@dimen/dp_10"
android:layout_marginTop=
"@dimen/dp_13"
android:layout_toRightOf=
"@id/two_text_four"
android:text=
'@{item.customerTelphome}'
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/sp_13.3"
android:visibility=
"@{TextUtils.isEmpty(item.customerTelphome)?View.GONE:View.VISIBLE}"
/>
<TextView
android:id=
"@+id/two_text_five"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/t
wo_text_four
"
android:layout_below=
"@id/t
v_contact_tel
"
android:layout_marginLeft=
"@dimen/dp_13"
android:layout_marginTop=
"@dimen/dp_13"
android:text=
"@string/tv_two_text_foure"
android:textColor=
"@color/cl_order_text_one"
android:textSize=
"@dimen/sp_13.3"
/>
<
TextView
android:id=
"@+id/
tv_customer_address
"
android:layout_width=
"
wrap_cont
ent"
<
LinearLayout
android:id=
"@+id/
navigation
"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/tv_contact_
mode
"
android:layout_below=
"@id/tv_contact_
tel
"
android:layout_marginLeft=
"@dimen/dp_10"
android:layout_marginTop=
"@dimen/dp_13"
android:layout_toRightOf=
"@id/two_text_five"
android:ellipsize=
"end"
android:maxLines=
"2"
android:text=
'@{item.provinceName+item.cityName+item.districtName+item.address}'
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/sp_13.3"
/>
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/tv_customer_address"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:ellipsize=
"end"
android:maxLines=
"2"
android:text=
'@{item.provinceName+item.cityName+item.districtName+item.address}'
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/sp_13.3"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_marginLeft=
"15dp"
android:layout_marginRight=
"15dp"
android:paddingBottom=
"5dp"
android:src=
"@drawable/icon_navigation"
/>
</LinearLayout>
<TextView
android:id=
"@+id/tv_forward_time"
...
...
orderCenter/src/main/res/layout/fragment_order_error_item.xml
View file @
b89ddb7a
...
...
@@ -13,8 +13,8 @@
<LinearLayout
android:id=
"@+id/ll_left"
android:layout_width=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:orientation=
"vertical"
>
<TextView
...
...
@@ -135,21 +135,35 @@
android:visibility=
"visible"
/>
</LinearLayout>
<TextView
android:id=
"@+id/item_text_dizhi"
android:layout_width=
"wrap_content"
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/ll_right"
android:layout_marginBottom=
"13.3dp"
android:layout_marginLeft=
"@dimen/size_order_item_tool_ml"
android:layout_marginRight=
"40dp"
android:layout_marginTop=
"10dp"
android:layout_toRightOf=
"@id/item_line"
android:ellipsize=
"end"
android:maxLines=
"2"
android:text=
"@string/tv_order_item_gps_text"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/size_login_hint_text"
/>
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/item_text_dizhi"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"13.3dp"
android:layout_marginTop=
"15dp"
android:layout_weight=
"1"
android:ellipsize=
"end"
android:maxLines=
"1"
android:text=
"@string/tv_order_item_gps_text"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/size_login_hint_text"
/>
<ImageView
android:id=
"@+id/navigation"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:paddingBottom=
"5dp"
android:paddingLeft=
"15dp"
android:paddingRight=
"15dp"
android:src=
"@drawable/icon_navigation"
/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
...
...
orderCenter/src/main/res/layout/fragment_orderdoing_item.xml
View file @
b89ddb7a
...
...
@@ -64,10 +64,10 @@
android:id=
"@+id/tv_error_state"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right"
android:layout_marginTop=
"3dp"
android:textColor=
"@color/cl_tab_read"
android:textSize=
"@dimen/size_login_hint_text"
android:layout_gravity=
"right"
android:visibility=
"gone"
/>
</LinearLayout>
...
...
@@ -189,18 +189,34 @@
</LinearLayout>
<TextView
android:id=
"@+id/item_text_dizhi"
android:layout_width=
"wrap_content"
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_order_item_tool_ml"
android:layout_marginRight=
"40dp"
android:layout_marginTop=
"5dp"
android:ellipsize=
"end"
android:maxLines=
"2"
android:text=
"@string/tv_order_item_gps_text"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/size_login_hint_text"
/>
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/item_text_dizhi"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_order_item_tool_ml"
android:layout_marginTop=
"5dp"
android:layout_weight=
"1"
android:ellipsize=
"end"
android:maxLines=
"1"
android:text=
"@string/tv_order_item_gps_text"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"@dimen/size_login_hint_text"
/>
<ImageView
android:id=
"@+id/navigation"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:paddingBottom=
"5dp"
android:paddingLeft=
"15dp"
android:paddingRight=
"15dp"
android:src=
"@drawable/icon_navigation"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
...
...
orderCenter/src/main/res/layout/item_multi_process_foot.xml
View file @
b89ddb7a
...
...
@@ -59,7 +59,7 @@
android:layout_toRightOf=
"@id/tv_player"
android:background=
"@null"
android:hint=
"@string/order_select_payer"
android:textColor=
"@color/
cl_selector_hui
"
android:textColor=
"@color/
default_text_color
"
android:textSize=
"@dimen/sp_15"
/>
<ImageView
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomePersonFragment.java
View file @
b89ddb7a
...
...
@@ -86,7 +86,7 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
super
.
lazyLoad
();
ProgressUtil
.
startLoad
(
mActivity
);
mPresenter
.
getAllData
(
userId
,
siteId
);
mPresenter
.
getAlipayAccount
(
userId
);
//
mPresenter.getAlipayAccount(userId);
}
@Override
...
...
userCenter/src/main/res/layout/fragment_personal_center.xml
View file @
b89ddb7a
...
...
@@ -214,8 +214,7 @@
android:layout_width=
"160dp"
android:layout_height=
"100dp"
android:layout_marginLeft=
"@dimen/dp_13.3"
android:background=
"@drawable/personal_center_selector"
android:onClick=
"@{()->presenter.dumpToAccount()}"
>
android:background=
"@drawable/personal_center_selector"
>
<TextView
android:id=
"@+id/text_today_jiedan"
...
...
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