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
338519d1
authored
Jul 13, 2018
by
罗翻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.9版本bug修改
parent
12dbb195
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
147 additions
and
112 deletions
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingContract.java
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
app/src/main/java/com/dayu/bigfish/utils/HxManager.java
app/src/main/res/layout/activity_setting.xml
baseSDK/src/main/java/com/dayu/common/Constants.java
baseSDK/src/main/java/com/dayu/utils/UserManager.java
baseSDK/src/main/res/values/strings.xml
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderPart.java
orderCenter/src/main/java/com/dayu/order/presenter/returnpart/ReturnPartPresenter.java
orderCenter/src/main/java/com/dayu/order/ui/activity/ReceivingActivity.java
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
orderCenter/src/main/res/layout/activity_order_record.xml
orderCenter/src/main/res/layout/fragment_order_datails.xml
userCenter/src/main/java/com/dayu/usercenter/presenter/personinfo/PersonInfoContract.java
userCenter/src/main/java/com/dayu/usercenter/presenter/personinfo/PersonInfoPresenter.java
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity/LoginActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsCodeActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsLoginActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomePersonFragment.java
userCenter/src/main/res/layout/activity_certification_result.xml
userCenter/src/main/res/layout/activity_person_info.xml
userCenter/src/main/res/layout/activity_pwlogin_layout.xml
userCenter/src/main/res/layout/activity_sms_login.xml
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingContract.java
View file @
338519d1
...
...
@@ -57,10 +57,5 @@ public interface SettingContract {
* 跳转到问题反馈.
*/
public
abstract
void
dumpToFeed
();
/**
* 修改密码.
*/
public
abstract
void
modifyPwd
();
}
}
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
View file @
338519d1
...
...
@@ -13,8 +13,6 @@ import com.dayu.bigfish.ui.AboutUsActivity;
import
com.dayu.bigfish.ui.FeedBackActivity
;
import
com.dayu.common.Constants
;
import
com.dayu.event.UserInfo
;
import
com.dayu.usercenter.common.UserConstant
;
import
com.dayu.usercenter.ui.activity.ModifyPwdActivity
;
import
com.dayu.usercenter.ui.activity.SmsLoginActivity
;
import
com.dayu.utils.AppManager
;
import
com.dayu.utils.AppUtils
;
...
...
@@ -145,12 +143,4 @@ public class SettingPresenter extends SettingContract.Presenter {
mView
.
startActivity
(
FeedBackActivity
.
class
,
bundle
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
(),
"feed_back"
);
}
@Override
public
void
modifyPwd
()
{
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
UserConstant
.
PHONE
,
UserManager
.
getInstance
().
getUserPhone
());
mView
.
startActivity
(
ModifyPwdActivity
.
class
,
bundle
);
}
}
app/src/main/java/com/dayu/bigfish/utils/HxManager.java
View file @
338519d1
...
...
@@ -115,7 +115,7 @@ public class HxManager {
}
});
}
else
{
if
(
(
boolean
)
SPUtils
.
get
(
Constants
.
HX_STATE
,
fals
e
))
{
if
(
!(
boolean
)
SPUtils
.
get
(
Constants
.
HX_STATE
,
tru
e
))
{
return
;
}
Intent
intent
=
new
Intent
(
mContext
,
MainActivity
.
class
);
...
...
app/src/main/res/layout/activity_setting.xml
View file @
338519d1
...
...
@@ -218,31 +218,6 @@
<TextView
style=
"@style/line"
/>
<RelativeLayout
android:id=
"@+id/modify_pwd"
android:layout_width=
"match_parent"
android:layout_height=
"54dp"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.modifyPwd()}"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"13.3dp"
android:text=
"@string/modify_pwd"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14.7sp"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:layout_marginRight=
"13.3dp"
android:src=
"@mipmap/list_more"
/>
</RelativeLayout>
<Button
android:id=
"@+id/exit_button"
android:layout_width=
"match_parent"
...
...
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @
338519d1
...
...
@@ -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/java/com/dayu/utils/UserManager.java
View file @
338519d1
...
...
@@ -54,6 +54,7 @@ public class UserManager {
public
void
clearUserInfo
()
{
SPUtils
.
remove
(
"USER_INFO"
);
SPUtils
.
remove
(
"token"
);
SPUtils
.
remove
(
"USER_IDENTITY"
);
}
/**
...
...
baseSDK/src/main/res/values/strings.xml
View file @
338519d1
...
...
@@ -31,7 +31,7 @@
<string
name=
"tv_person_center_fen"
>
3.5分
</string>
<string
name=
"tv_person_center_jinriyeji"
>
今日业绩(元)
</string>
<string
name=
"tv_person_center_licence"
>
认证资质
</string>
<string
name=
"tv_person_center_jinrijiedan"
>
账户余额
</string>
<string
name=
"tv_person_center_jinrijiedan"
>
账户余额
(元)
</string>
<string
name=
"tv_person_center_jinriyeji_value"
>
8
</string>
<string
name=
"tv_login"
>
登
 
录
</string>
<string
name=
"tv_exit_login"
>
退
 
出
 
当
 
前
 
账
 
号
</string>
...
...
@@ -71,9 +71,9 @@
<string
name=
"order_goumai_date"
>
购买日期
</string>
<string
name=
"order_serve_type"
>
服务类型
</string>
<string
name=
"order_photo_text"
>
服务照片(故障及解决照片,限5张)
</string>
<string
name=
"order_hint"
>
故障现象或服务需求描述,及解决方案描述,若没有解决请说明原因。
</string>
<string
name=
"order_hint"
>
故障现象或服务需求描述,及解决方案描述,若没有解决请说明原因
(最多200字)
。
</string>
<string
name=
"tv_about"
>
关于我们
</string>
<string
name=
"tv_about_us"
>
客服
扫码关注我们的微信服务号
</string>
<string
name=
"tv_about_us"
>
扫码关注我们的微信服务号
</string>
<string
name=
"tv_about_us_text"
>
    
传统低效的客服体系,正在成为厂商、服务商、消费者的包袱。大鱼准备以科技之力进行客服产业革命。运用Ai、云和大数据等技术,连接厂商、销售商、服务商和消费者,打造去中心化的智能共享客户服务解决方案。
</string>
<string
name=
"tv_about_dayu"
>
大鱼创想
  
版权所有
</string>
<string
name=
"tv_about_user_feiyong"
>
收取客户费用(元)
</string>
...
...
@@ -145,6 +145,7 @@
<string
name=
"login_state_no"
>
登录状态已失效,请重新登录!
</string>
<string
name=
"login_again"
>
重新登录
</string>
<string
name=
"submit_again"
>
重新提交
</string>
<string
name=
"go_certification"
>
去认证
</string>
<string
name=
"please_open__permission"
>
没有此权限将无法使用此app,请允许权限打开。
</string>
<string
name=
"cancle"
>
取消
</string>
<string
name=
"go_setting"
>
前往设置
</string>
...
...
@@ -283,25 +284,25 @@
<string
name=
"modify_part_info"
>
修改信息
</string>
<string
name=
"customer_acceptance"
>
客户验收
</string>
<string
name=
"scan_code_for_appointment"
>
请扫描二维码关注大鱼服务公众号
</string>
<string
name=
"scan_code_for_appointment_two"
>
点击-我的服务-进行绑定登录后,选择工单
付款
</string>
<string
name=
"scan_code_for_appointment_two"
>
点击-我的服务-进行绑定登录后,选择工单
验收
</string>
<string
name=
"order_record"
>
工单记录
</string>
<string
name=
"order_num"
>
工单编号
</string>
<string
name=
"order_state"
>
工单状态
</string>
<string
name=
"server_name"
>
服务名称
</string>
<string
name=
"prodcut"
>
产
      
  
品
</string>
<string
name=
"prodcut_type"
>
类
      
  
型
</string>
<string
name=
"prodcut"
>
产
      
品
</string>
<string
name=
"prodcut_type"
>
类
      
型
</string>
<string
name=
"door_time"
>
上门时间
</string>
<string
name=
"order_remark"
>
工单备注
</string>
<string
name=
"order_attachment"
>
附
      
  
件
</string>
<string
name=
"order_attachment"
>
附
      
件
</string>
<string
name=
"customer_info"
>
客户信息
</string>
<string
name=
"customer_type"
>
客户类型
</string>
<string
name=
"customer_name"
>
客户姓名
</string>
<string
name=
"lookforword_time"
>
期望时间
</string>
<string
name=
"prodcut_info"
>
产品信息
</string>
<string
name=
"prodcut_brand"
>
品
      
  
牌
</string>
<string
name=
"prodcut_num"
>
型
      
  
号
</string>
<string
name=
"prodcut_brand"
>
品
      
牌
</string>
<string
name=
"prodcut_num"
>
型
      
号
</string>
<string
name=
"quality_assurance_info"
>
质保信息
</string>
<string
name=
"sn_num"
>
SN
    
  
码
</string>
<string
name=
"sn_num"
>
SN
    
码
</string>
<string
name=
"charge_record"
>
收费记录
</string>
<string
name=
"total_money"
>
总金额数
</string>
<string
name=
"total_price"
>
总金额
</string>
...
...
@@ -309,7 +310,7 @@
<string
name=
"server_money"
>
服务费用
</string>
<string
name=
"material_money"
>
材料费用
</string>
<string
name=
"other_money"
>
其他费用
</string>
<string
name=
"remark"
>
备
       
 
注
</string>
<string
name=
"remark"
>
备
       
注
</string>
<string
name=
"no_charge_record"
>
暂无收费记录
</string>
<string
name=
"order_brand_name"
>
品牌名称
</string>
<string
name=
"order_product_model"
>
型号
</string>
...
...
@@ -391,7 +392,7 @@
<string
name=
"is_newversion"
>
当前为最新版本,无需更新
</string>
<string
name=
"subcribe_time_success"
>
预约时间成功,请移至带服务列表查看
</string>
<string
name=
"input_day_first"
>
请先输入日期
</string>
<string
name=
"input_right_time"
>
请选择合法的
时间
</string>
<string
name=
"input_right_time"
>
预约时间必须大于当前
时间
</string>
<string
name=
"input_subcribe_time"
>
请输入预约时间
</string>
<string
name=
"input_subcribe_info"
>
请输入预约信息
</string>
<string
name=
"input_day_time"
>
请输入日期和时间
</string>
...
...
@@ -408,7 +409,7 @@
<string
name=
"customer_server_mobile"
>
客服电话
</string>
<string
name=
"abount_us"
>
关于我们
</string>
<string
name=
"problem_feedback"
>
问题反馈
</string>
<string
name=
"personal_info"
>
个人
资料
</string>
<string
name=
"personal_info"
>
我的
资料
</string>
<string
name=
"modify_personal_info"
>
修改资料
</string>
<string
name=
"submission_of_audit"
>
提交审核
</string>
<string
name=
"title_my_header"
>
我的头像
</string>
...
...
@@ -486,14 +487,15 @@
<string
name=
"error_pdf"
>
上传文件格式错误,请重新上传此文件。
</string>
<string
name=
"engineer_identity_auditing"
>
您的身份认证正在审核中,请耐心等待
</string>
<string
name=
"engineer_identity_not_audite"
>
您
的身份认证审核未通过,请重新修改再次提交
</string>
<string
name=
"engineer_not_have_site"
>
您
目前没有工作站,加入工作站之后才能接单
</string>
<string
name=
"engineer_identity_not_audite"
>
您
还没有进行身份认证
</string>
<string
name=
"engineer_not_have_site"
>
您
未加入服务站,请联系站点
</string>
<string
name=
"audite_tip"
>
资料已经提交审核\n审核结果会通过短信通知您
</string>
<string
name=
"audite_tip_title"
>
提交成功
</string>
<string
name=
"audite_tip_submite_title"
>
重新提交
</string>
<string
name=
"audite_tip_submite"
>
修改资料需要大鱼客服重新审核\n您确定要修改吗?
</string>
<string
name=
"think_again"
>
我再想想
</string>
<string
name=
"identity_not_audite"
>
审核未通过
</string>
<string
name=
"certification"
>
认证
</string>
<string
name=
"engineer_acount_notavialibe"
>
工程师账号不存在
</string>
<string
name=
"user_on_blackilst"
>
用户被列入黑名单
</string>
<string
name=
"not_engineer"
>
该账号尚不是工程师
</string>
...
...
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
View file @
338519d1
...
...
@@ -51,7 +51,7 @@ public class OrderDetail implements Serializable {
private
String
doorPriceComment
;
private
Double
servicePrice
;
private
Object
servicePriceComment
;
private
Integer
materialCost
;
private
Double
materialCost
;
private
Object
materialCostComment
;
private
double
otherPrice
;
private
Object
otherPriceComment
;
...
...
@@ -460,11 +460,11 @@ public class OrderDetail implements Serializable {
this
.
servicePriceComment
=
servicePriceComment
;
}
public
Integer
getMaterialCost
()
{
public
Double
getMaterialCost
()
{
return
materialCost
;
}
public
void
setMaterialCost
(
Integer
materialCost
)
{
public
void
setMaterialCost
(
Double
materialCost
)
{
this
.
materialCost
=
materialCost
;
}
...
...
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderPart.java
View file @
338519d1
...
...
@@ -49,9 +49,9 @@ public class OrderPart implements Serializable {
*/
private
Integer
sources
;
private
int
recoveryCompanyAddressId
;
private
Integer
recoveryCompanyAddressId
;
public
int
getRecoveryCompanyAddressID
()
{
public
Integer
getRecoveryCompanyAddressID
()
{
return
recoveryCompanyAddressId
;
}
...
...
orderCenter/src/main/java/com/dayu/order/presenter/returnpart/ReturnPartPresenter.java
View file @
338519d1
...
...
@@ -106,7 +106,7 @@ public class ReturnPartPresenter extends ReturnPartContract.Presenter {
public
void
dumpToKaInfo
()
{
Bundle
bundle
=
new
Bundle
();
bundle
.
putInt
(
Constants
.
ID
,
mKaId
);
if
(
mPart
!=
null
)
{
if
(
mPart
!=
null
&&
mPart
.
getRecoveryCompanyAddressID
()
!=
null
)
{
bundle
.
putInt
(
OrderConstant
.
KAADDRESSID
,
mPart
.
getRecoveryCompanyAddressID
());
}
mView
.
startActivity
(
KaAddressActivity
.
class
,
bundle
);
...
...
orderCenter/src/main/java/com/dayu/order/ui/activity/ReceivingActivity.java
View file @
338519d1
...
...
@@ -78,8 +78,8 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter, Activity
ARouter
.
getInstance
().
build
(
RouterPath
.
PATH_CERTIFICAITON
).
withBundle
(
Constants
.
BUNDLE
,
bundle
).
navigation
();
}
});
customDialog
.
setTitle
(
getString
(
R
.
string
.
identity_not_audite
))
.
setPositiveButton
(
getString
(
R
.
string
.
submit_agai
n
))
customDialog
.
setTitle
(
getString
(
R
.
string
.
certification
))
.
setPositiveButton
(
getString
(
R
.
string
.
go_certificatio
n
))
.
setNegativeButton
(
getString
(
R
.
string
.
cancle
));
customDialog
.
show
();
}
...
...
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
View file @
338519d1
...
...
@@ -414,8 +414,8 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
ARouter
.
getInstance
().
build
(
RouterPath
.
PATH_CERTIFICAITON
).
navigation
();
}
});
customDialog
.
setTitle
(
UIUtils
.
getString
(
R
.
string
.
identity_not_audite
))
.
setPositiveButton
(
UIUtils
.
getString
(
R
.
string
.
submit_agai
n
))
customDialog
.
setTitle
(
UIUtils
.
getString
(
R
.
string
.
certification
))
.
setPositiveButton
(
UIUtils
.
getString
(
R
.
string
.
go_certificatio
n
))
.
setNegativeButton
(
UIUtils
.
getString
(
R
.
string
.
cancle
));
customDialog
.
show
();
}
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
View file @
338519d1
...
...
@@ -43,7 +43,9 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
@Override
public
void
initView
()
{
mDetail
=
(
OrderDetail
)
getArguments
().
getSerializable
(
Constants
.
ORDER_DETAIL
);
if
(
getArguments
()
!=
null
)
{
mDetail
=
(
OrderDetail
)
getArguments
().
getSerializable
(
Constants
.
ORDER_DETAIL
);
}
if
(
mDetail
!=
null
)
{
mBind
.
setItem
(
mDetail
);
initDataView
(
mDetail
);
...
...
@@ -95,9 +97,9 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
Intent
intent
=
new
Intent
(
mActivity
,
PdfWebViewActivity
.
class
);
intent
.
putExtra
(
Constants
.
PICURL
,
item
.
getUrl
());
intent
.
putExtra
(
OrderConstant
.
TITLE
,
item
.
getName
());
if
(!
item
.
getUrl
().
contains
(
".pdf"
)){
if
(!
item
.
getUrl
().
contains
(
".pdf"
))
{
ToastUtils
.
showShortToast
(
R
.
string
.
error_pdf
);
}
else
{
}
else
{
startActivity
(
intent
);
}
}
...
...
orderCenter/src/main/res/layout/activity_order_record.xml
View file @
338519d1
...
...
@@ -52,16 +52,18 @@
<RelativeLayout
android:id=
"@+id/rl_seacher"
style=
"@style/title"
android:visibility=
"
gon
e"
>
android:visibility=
"
visibl
e"
>
<EditText
android:id=
"@+id/et_seacher"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10dp"
android:layout_toRightOf=
"@+id/iv"
android:background=
"@null"
android:textSize=
"16sp"
android:inputType=
"phone"
android:hint=
"@string/find_customer_mobile"
android:text=
"@={presenter.serchStr}"
/>
...
...
orderCenter/src/main/res/layout/fragment_order_datails.xml
View file @
338519d1
...
...
@@ -236,6 +236,7 @@
android:layout_below=
"@id/rl_info_detail"
android:layout_marginLeft=
"@dimen/dp_13"
android:layout_marginTop=
"@dimen/dp_13"
android:layout_marginBottom=
"5dp"
android:orientation=
"horizontal"
>
<TextView
...
...
userCenter/src/main/java/com/dayu/usercenter/presenter/personinfo/PersonInfoContract.java
View file @
338519d1
...
...
@@ -21,5 +21,10 @@ public interface PersonInfoContract {
public
abstract
void
queryInfo
(
int
accountId
);
/**
* 修改密码.
*/
public
abstract
void
modifyPwd
();
}
}
userCenter/src/main/java/com/dayu/usercenter/presenter/personinfo/PersonInfoPresenter.java
View file @
338519d1
package
com
.
dayu
.
usercenter
.
presenter
.
personinfo
;
import
android.databinding.ObservableField
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
com.dayu.common.BaseApplication
;
import
com.dayu.event.UserInfo
;
import
com.dayu.usercenter.api.UserApiFactory
;
import
com.dayu.usercenter.common.UserConstant
;
import
com.dayu.usercenter.data.protocol.EngineerInfo
;
import
com.dayu.usercenter.ui.activity.IdentityCertificationActivity
;
import
com.dayu.usercenter.ui.activity.ModifyPwdActivity
;
import
com.dayu.usercenter.ui.activity.MyHeaderIvActivity
;
import
com.dayu.utils.UserManager
;
import
com.umeng.analytics.MobclickAgent
;
...
...
@@ -57,4 +60,11 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
}
}));
}
@Override
public
void
modifyPwd
()
{
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
UserConstant
.
PHONE
,
UserManager
.
getInstance
().
getUserPhone
());
mView
.
startActivity
(
ModifyPwdActivity
.
class
,
bundle
);
}
}
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
View file @
338519d1
...
...
@@ -87,6 +87,9 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
case
"USER0023"
:
message
=
BaseApplication
.
getContext
().
getString
(
com
.
dayu
.
baselibrary
.
R
.
string
.
engineer_acount_notavialibe
);
break
;
case
"USER0024"
:
message
=
BaseApplication
.
getContext
().
getString
(
com
.
dayu
.
baselibrary
.
R
.
string
.
engineer_not_have_site
);
break
;
}
mView
.
setError
(
message
);
}));
...
...
@@ -116,6 +119,7 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
@Override
public
void
dumpAndSave
(
UserInfo
info
)
{
// mView.setError("");
UserManager
.
getInstance
().
saveUser
(
info
);
ARouter
.
getInstance
().
build
(
RouterPath
.
PATH_MAIN
).
navigation
();
}
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/activity/LoginActivity.java
View file @
338519d1
...
...
@@ -2,9 +2,7 @@ package com.dayu.usercenter.ui.activity;
import
android.view.View
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.dayu.base.ui.activity.BaseActivity
;
import
com.dayu.common.BaseConstant
;
import
com.dayu.common.Constants
;
import
com.dayu.usercenter.LoginBinding
;
import
com.dayu.usercenter.R
;
...
...
@@ -22,7 +20,6 @@ import com.umeng.analytics.MobclickAgent;
* 2017/11/08.
*/
@Route
(
path
=
BaseConstant
.
PATH_LOGIN
)
public
class
LoginActivity
extends
BaseActivity
<
LoginPresenter
,
LoginBinding
>
implements
LoginContract
.
View
{
@Override
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsCodeActivity.java
View file @
338519d1
package
com
.
dayu
.
usercenter
.
ui
.
activity
;
import
android.text.TextUtils
;
import
com.dayu.base.ui.activity.BaseActivity
;
import
com.dayu.usercenter.R
;
import
com.dayu.usercenter.databinding.ActivitySmsCodeBinding
;
...
...
@@ -55,16 +57,20 @@ public class SmsCodeActivity extends BaseActivity<SmsLoginPresenter, ActivitySms
public
void
showLoginDialog
(
OnCloseListener
listener
)
{
CustomDialog
customDialog
=
new
CustomDialog
(
mActivity
,
R
.
style
.
CustomDialog
,
getString
(
R
.
string
.
engineer_identity_not_audite
)
,
listener
);
customDialog
.
setTitle
(
getString
(
R
.
string
.
identity_not_audite
))
.
setPositiveButton
(
getString
(
R
.
string
.
submit_agai
n
))
customDialog
.
setTitle
(
getString
(
R
.
string
.
certification
))
.
setPositiveButton
(
getString
(
R
.
string
.
go_certificatio
n
))
.
setNegativeButton
(
getString
(
R
.
string
.
skip
));
customDialog
.
show
();
}
@Override
public
void
setError
(
String
str
)
{
mBind
.
error
.
setText
(
str
);
mBind
.
smsCode
.
clear
();
UIUtils
.
setShakeAnimation
(
mBind
.
error
);
if
(
TextUtils
.
isEmpty
(
str
)){
mBind
.
smsCode
.
clear
();
}
else
{
mBind
.
error
.
setText
(
str
);
mBind
.
smsCode
.
clear
();
UIUtils
.
setShakeAnimation
(
mBind
.
error
);
}
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsLoginActivity.java
View file @
338519d1
...
...
@@ -7,8 +7,10 @@ import android.text.Editable;
import
android.text.TextUtils
;
import
android.view.View
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.dayu.base.ui.activity.DataBindingActivity
;
import
com.dayu.common.BaseApplication
;
import
com.dayu.common.BaseConstant
;
import
com.dayu.common.Constants
;
import
com.dayu.common.MyTextWatcher
;
import
com.dayu.usercenter.R
;
...
...
@@ -26,6 +28,7 @@ import com.umeng.analytics.MobclickAgent;
* on 2018/7/2.
*/
@Route
(
path
=
BaseConstant
.
PATH_LOGIN
)
public
class
SmsLoginActivity
extends
DataBindingActivity
<
ActivitySmsLoginBinding
>
{
@Override
public
int
getLayoutId
()
{
...
...
@@ -36,14 +39,14 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin
public
void
initView
()
{
String
versionCode
=
AppUtils
.
getPackageNum
();
if
(
Constants
.
ENVIROMENT
.
equals
(
"debug"
))
{
mBind
.
environment
.
setText
(
String
.
format
(
getString
(
R
.
string
.
enviroment_debug
),
versionCode
));
mBind
.
environment
.
setText
(
String
.
format
(
getString
(
R
.
string
.
enviroment_debug
),
versionCode
));
mBind
.
environment
.
setVisibility
(
View
.
VISIBLE
);
}
else
if
(
Constants
.
ENVIROMENT
.
equals
(
"uat"
))
{
mBind
.
environment
.
setVisibility
(
View
.
VISIBLE
);
mBind
.
environment
.
setText
(
String
.
format
(
getString
(
R
.
string
.
enviroment_uat
),
versionCode
));
mBind
.
environment
.
setText
(
String
.
format
(
getString
(
R
.
string
.
enviroment_uat
),
versionCode
));
}
else
if
(
Constants
.
ENVIROMENT
.
equals
(
"demons"
))
{
mBind
.
environment
.
setVisibility
(
View
.
VISIBLE
);
mBind
.
environment
.
setText
(
String
.
format
(
getString
(
R
.
string
.
enviroment_demons
),
versionCode
));
mBind
.
environment
.
setText
(
String
.
format
(
getString
(
R
.
string
.
enviroment_demons
),
versionCode
));
}
mBind
.
tvAgreement
.
setOnClickListener
(
v
->
{
Intent
intent
=
new
Intent
(
mActivity
,
AgreementActivity
.
class
);
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomePersonFragment.java
View file @
338519d1
...
...
@@ -91,18 +91,27 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
@Override
public
void
getPersonalInfoSuccess
(
EngineerInfo
info
)
{
if
(
TextUtils
.
isEmpty
(
info
.
getIdentity
()))
{
SPUtils
.
put
(
"USER_IDENTITY"
,
""
);
}
else
{
SPUtils
.
put
(
"USER_IDENTITY"
,
info
.
getIdentity
());
}
mUserName
=
info
.
getRealName
();
mBind
.
tvName
.
setText
(
mUserName
);
mBind
.
tvAge
.
setText
(
info
.
getAge
()
+
mActivity
.
getString
(
R
.
string
.
age
));
if
(
info
.
getGender
()
==
1
)
{
mBind
.
tvSex
.
setText
(
mActivity
.
getString
(
R
.
string
.
man
));
}
else
if
(
info
.
getGender
()
==
0
)
{
mBind
.
tvSex
.
setText
(
mActivity
.
getString
(
R
.
string
.
female
));
}
else
if
(
TextUtils
.
isEmpty
(
info
.
getIdentity
()))
{
}
if
(
TextUtils
.
isEmpty
(
mUserName
))
{
mBind
.
tvName
.
setText
(
mActivity
.
getString
(
R
.
string
.
unknown
));
}
else
{
mBind
.
tvName
.
setText
(
mUserName
);
}
if
(
TextUtils
.
isEmpty
(
info
.
getIdentity
()))
{
mBind
.
tvSex
.
setText
(
mActivity
.
getString
(
R
.
string
.
unknown
));
mBind
.
tvAge
.
setText
(
mActivity
.
getString
(
R
.
string
.
unknown
));
}
SPUtils
.
put
(
"USER_IDENTITY"
,
info
.
getIdentity
());
if
(
UserManager
.
getInstance
().
getUser
().
getDetectStatus
()
==
1
&&
!
TextUtils
.
isEmpty
((
String
)
SPUtils
.
get
(
"USER_IDENTITY"
,
""
)))
{
mBind
.
ivAudited
.
setImageResource
(
R
.
drawable
.
icon_authentication
);
}
else
{
...
...
@@ -116,7 +125,9 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
@Override
public
void
getAchievementSuccess
(
TodayAchievement
achievement
)
{
mBind
.
tvAchivement
.
setText
(
achievement
.
getAchievement
()
+
""
);
if
(
achievement
.
getAchievement
()
!=
0
)
{
mBind
.
tvAchivement
.
setText
(
achievement
.
getAchievement
()
+
""
);
}
}
@Override
...
...
userCenter/src/main/res/layout/activity_certification_result.xml
View file @
338519d1
...
...
@@ -77,8 +77,8 @@
<TextView
android:id=
"@+id/tv_commite"
android:layout_width=
"
wrap_cont
ent"
android:layout_height=
"
wrap_content
"
android:layout_width=
"
match_par
ent"
android:layout_height=
"
47dp
"
android:layout_gravity=
"center"
android:layout_marginTop=
"90dp"
android:background=
"@drawable/tab_blue_react"
...
...
userCenter/src/main/res/layout/activity_person_info.xml
View file @
338519d1
...
...
@@ -87,7 +87,6 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
android:layout_marginBottom=
"@dimen/dp_10"
android:background=
"@color/white"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
...
...
@@ -111,6 +110,38 @@
android:textSize=
"15sp"
/>
</LinearLayout>
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"15dp"
android:layout_marginRight=
"15dp"
/>
<RelativeLayout
android:id=
"@+id/modify_pwd"
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
android:layout_marginBottom=
"@dimen/dp_10"
android:background=
"@color/cl_white"
android:onClick=
"@{()->presenter.modifyPwd()}"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10dp"
android:text=
"@string/modify_pwd"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14.7sp"
/>
<ImageView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:layout_marginRight=
"15dp"
android:src=
"@drawable/icon_arrow_right"
/>
</RelativeLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
...
...
userCenter/src/main/res/layout/activity_pwlogin_layout.xml
View file @
338519d1
...
...
@@ -66,7 +66,7 @@
<View
android:id=
"@+id/line"
android:layout_width=
"match_parent"
android:layout_height=
"
2
dp"
android:layout_height=
"
1
dp"
android:layout_below=
"@+id/mobile"
android:layout_marginTop=
"7.5dp"
android:background=
"@color/cl_line"
/>
...
...
@@ -102,7 +102,7 @@
<View
android:id=
"@+id/line_phone"
android:layout_width=
"match_parent"
android:layout_height=
"
2
dp"
android:layout_height=
"
1
dp"
android:layout_below=
"@id/ll_pwd"
android:layout_marginTop=
"7.5dp"
android:background=
"@color/cl_line"
/>
...
...
userCenter/src/main/res/layout/activity_sms_login.xml
View file @
338519d1
...
...
@@ -53,7 +53,7 @@
<View
android:id=
"@+id/line"
android:layout_width=
"250dp"
android:layout_height=
"
2
dp"
android:layout_height=
"
1
dp"
android:layout_below=
"@+id/mobile"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"7.5dp"
...
...
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