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
c42f35e5
authored
Aug 24, 2020
by
mReturn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
知识库&师傅认证
parent
cb8110ce
Hide whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
1234 additions
and
80 deletions
app/src/main/AndroidManifest.xml
baseSDK/src/main/java/com/dayu/common/Constants.java
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
baseSDK/src/main/java/com/dayu/utils/GlideImageLoader.java
baseSDK/src/main/res/drawable-xhdpi/ic_phone_white.png
baseSDK/src/main/res/drawable-xhdpi/ic_search_white.png
baseSDK/src/main/res/values/strings.xml
build.gradle
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
orderCenter/src/main/java/com/dayu/order/api/protocol/bean/KnowledgeListBean.java
orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeActivity.java
orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeDetailActivity.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
orderCenter/src/main/release/AndroidManifest.xml
orderCenter/src/main/res/layout/activity_konwledge_detail.xml
orderCenter/src/main/res/layout/activity_konwledge_query.xml
orderCenter/src/main/res/layout/fragment_operate_detail.xml
orderCenter/src/main/res/layout/item_knowledge_list.xml
orderCenter/src/main/res/values/strings.xml
provider/src/main/java/com/dayu/provider/router/RouterPath.java
userCenter/src/main/java/com/dayu/usercenter/adapter/SelfLicenceAdapter.java
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
userCenter/src/main/java/com/dayu/usercenter/event/UploadSelfLicenceEvent.java
userCenter/src/main/java/com/dayu/usercenter/model/UploadSelfLicenceData.java
userCenter/src/main/java/com/dayu/usercenter/model/bean/SelfLicenceBean.java
userCenter/src/main/java/com/dayu/usercenter/presenter/userlicence/UserLicencePresent.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UserLicenceActivity.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SelfLicenceFragment.java
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/UserLicenceFragment.java
userCenter/src/main/release/AndroidManifest.xml
userCenter/src/main/res/layout/activity_upload_self_licence.xml
userCenter/src/main/res/layout/activity_user_licence.xml
userCenter/src/main/res/layout/item_user_licence.xml
app/src/main/AndroidManifest.xml
View file @
c42f35e5
...
...
@@ -51,6 +51,7 @@
android:label=
"@string/tv_dayu"
android:supportsRtl=
"true"
android:theme=
"@style/AppTheme"
android:resizeableActivity=
"false"
tools:ignore=
"GoogleAppIndexingWarning"
tools:replace=
"android:label,icon,theme,allowBackup"
>
<!--<provider-->
...
...
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @
c42f35e5
...
...
@@ -59,36 +59,36 @@ public class Constants {
/**
* uat测试环境配置.
*/
//
public static String ENVIROMENT = "uat";
//
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
//
public static String BASE_URL = "http://47.95.223.6:3112";
//
public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
//
public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
//
public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
//
public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
//
public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
//
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
//
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
//
public static final boolean IS_DEBUG = false;
//
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public
static
String
ENVIROMENT
=
"uat"
;
public
static
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
public
static
String
BASE_URL
=
"http://47.95.223.6:3112"
;
public
static
String
WEB_SOP
=
"http://47.95.223.6:9004/#/sop"
;
public
static
String
WEB_SOP_DETAIL
=
"http://47.95.223.6:9004/#/sopdetail"
;
public
static
String
WEB_ZHI_SHI
=
"http://47.95.223.6:9004/#/detail"
;
public
static
String
CHECK_MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manyServiceResult"
;
public
static
String
MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manySop"
;
public
static
final
String
UP_PHOTO
=
"/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"
;
public
static
final
String
UP_VIDEO
=
"/file/uploadVideoOne?targetPath=test/video"
;
public
static
final
boolean
IS_DEBUG
=
false
;
public
static
String
VIDEO_SHARE_URL
=
"http://uat.kf.ai:9099/#/shareVideo?type=_type&id="
;
//uat 学习视频分享链接 type(课程: course 直播: live)
/**
* 正式环境.
*/
public
static
String
ENVIROMENT
=
"release"
;
public
static
int
LOG_LEVEL
=
LogUtils
.
LEVEL_OFF
;
public
static
String
BASE_URL
=
"https://mobile.kf.ai"
;
public
static
String
WEB_SOP
=
"https://sop.kf.ai/#/sop"
;
public
static
String
WEB_SOP_DETAIL
=
"https://sop.kf.ai/#/sopdetail"
;
public
static
String
WEB_ZHI_SHI
=
"https://sop.kf.ai/#/detail"
;
public
static
String
CHECK_MULTI_WEB_SOP
=
"https://sop.kf.ai/#/manyServiceResult"
;
public
static
String
MULTI_WEB_SOP
=
"https://sop.kf.ai/#/manySop"
;
public
static
final
String
UP_PHOTO
=
"/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"
;
public
static
final
String
UP_VIDEO
=
"/file/uploadVideoOne?targetPath=online/video"
;
public
static
final
boolean
IS_DEBUG
=
false
;
public
static
String
VIDEO_SHARE_URL
=
"http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="
;
//学习视频分享链接 type(课程: course 直播: live)
//
public static String ENVIROMENT = "release";
//
public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
//
public static String BASE_URL = "https://mobile.kf.ai";
//
public static String WEB_SOP = "https://sop.kf.ai/#/sop";
//
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
//
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
//
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
//
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
//
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
//
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
//
public static final boolean IS_DEBUG = false;
//
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
/**
...
...
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
View file @
c42f35e5
...
...
@@ -8,9 +8,12 @@ import android.content.Intent;
import
android.graphics.Bitmap
;
import
android.media.MediaMetadataRetriever
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.view.inputmethod.InputMethodManager
;
import
android.webkit.WebSettings
;
import
android.webkit.WebView
;
import
com.dayu.baselibrary.R
;
import
com.dayu.common.BaseApplication
;
...
...
@@ -423,4 +426,26 @@ public class CommonUtils {
}
dir
.
delete
();
// 删除目录本身
}
/**
* 初始化webview
* @param webView
*/
public
static
void
initWebView
(
WebView
webView
)
{
WebSettings
webSettings
=
webView
.
getSettings
();
webSettings
.
setUseWideViewPort
(
true
);
webSettings
.
setLoadWithOverviewMode
(
true
);
webSettings
.
setAllowFileAccess
(
true
);
webSettings
.
setJavaScriptEnabled
(
true
);
webSettings
.
setSupportZoom
(
true
);
webSettings
.
setDisplayZoomControls
(
true
);
webSettings
.
setJavaScriptCanOpenWindowsAutomatically
(
true
);
webSettings
.
setLoadsImagesAutomatically
(
true
);
webSettings
.
setDefaultTextEncodingName
(
"utf-8"
);
webSettings
.
setBlockNetworkImage
(
false
);
if
(
Build
.
VERSION
.
SDK_INT
>=
21
)
{
webSettings
.
setMixedContentMode
(
0
);
}
}
}
baseSDK/src/main/java/com/dayu/utils/GlideImageLoader.java
View file @
c42f35e5
...
...
@@ -58,6 +58,9 @@ public class GlideImageLoader {
.
apply
(
options
)
.
into
(
view
);
}
public
static
void
loadFit
(
Context
context
,
ImageView
view
,
String
imageRes
)
{
loadFit
(
context
,
view
,
imageRes
,-
1
);
}
public
static
void
loadFit
(
Context
context
,
ImageView
view
,
String
imageRes
,
int
defaultRes
)
{
RequestOptions
options
=
new
RequestOptions
()
.
placeholder
(
defaultRes
)
...
...
baseSDK/src/main/res/drawable-xhdpi/ic_phone_white.png
0 → 100644
View file @
c42f35e5
2.07 KB
baseSDK/src/main/res/drawable-xhdpi/ic_search_white.png
0 → 100644
View file @
c42f35e5
1.3 KB
baseSDK/src/main/res/values/strings.xml
View file @
c42f35e5
...
...
@@ -792,6 +792,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string
name=
"be_takeed_price"
>
代收款项
</string>
<string
name=
"take_price_subsidy"
>
工费补贴
</string>
<string
name=
"contact_seller_support"
>
联系商家技术支持
</string>
<string
name=
"seller_support"
>
商家技术支持
</string>
<string
name=
"stand_operate_step_"
>
标准操作步骤:
</string>
<string
name=
"no_mobile"
>
暂无联系方式
</string>
<string
name=
"send_str"
>
发送
</string>
...
...
@@ -803,6 +804,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string
name=
"min_ago"
>
分钟前
</string>
<string
name=
"just_before"
>
刚刚
</string>
<string
name=
"public_pay"
>
对公结算
</string>
<string
name=
"konwledge_querry"
>
知识库查询
</string>
<!--sale-->
...
...
@@ -968,6 +970,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string
name=
"pls_set_business_choose_type"
>
请设置自己能提供服务的产品类型
</string>
<string
name=
"licence_haved"
>
已获认证资质
</string>
<string
name=
"licence_all"
>
全部认证资质
</string>
<string
name=
"licence_self"
>
师傅自传
</string>
<string
name=
"licence_apply_str"
>
申请
</string>
<string
name=
"week_str"
>
周
</string>
<string
name=
"month_str"
>
月
</string>
...
...
build.gradle
View file @
c42f35e5
...
...
@@ -5,8 +5,8 @@ buildscript {
ext
.
build_tools_version
=
"27.0.3"
ext
.
min_sdk_version
=
17
ext
.
target_sdk_version
=
26
ext
.
version_code
=
26
2
ext
.
verson_name
=
"2.6.
2
"
ext
.
version_code
=
26
3
ext
.
verson_name
=
"2.6.
3
"
ext
.
gradle_version
=
'3.1.4'
ext
.
isReleaseMinify
=
false
ext
.
isDebugMinify
=
false
...
...
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
View file @
c42f35e5
...
...
@@ -60,9 +60,8 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
public
void
initView
()
{
initUser
();
tabDesc
=
UIUtils
.
getStrings
(
R
.
array
.
learn_top_tab_item
);
// mBind.ivPubCourse.setOnClickListener(view -> startActivity(TCAnchorPrepareActivity.class));
mBind
.
ivPubCourse
.
setOnClickListener
(
view
->
startActivity
(
PubCourseActivity
.
class
));
// mBind.ivPubCourse.setOnClickListener(view ->
startActivity(PrepareLiveActivity.class
));
// mBind.ivPubCourse.setOnClickListener(view ->
ARouter.getInstance().build(RouterPath.PATH_ORDER_KONWLEDGE).navigation(
));
initTabPage
();
getTabData
();
EventBus
.
getDefault
().
register
(
this
);
...
...
orderCenter/src/main/java/com/dayu/order/api/OrderService.java
View file @
c42f35e5
...
...
@@ -13,6 +13,7 @@ import com.dayu.order.api.protocol.OperateInfo;
import
com.dayu.order.api.protocol.Order
;
import
com.dayu.order.api.protocol.OrderDetail
;
import
com.dayu.order.api.protocol.OrderPart
;
import
com.dayu.order.api.protocol.bean.KnowledgeListBean
;
import
com.dayu.order.api.protocol.bean.OrderPardDeatilBean
;
import
com.dayu.order.api.protocol.bean.OrderPartBean
;
import
com.dayu.order.api.protocol.Pay
;
...
...
@@ -497,4 +498,19 @@ public interface OrderService {
*/
@POST
(
Constants
.
API_7200
+
"/orderDialRecord"
)
Observable
<
BaseResponse
<
Boolean
>>
addDialRecord
(
@Body
AddDialRecordData
data
);
/**
* 知识库查询
* @param keyword
* @param page
* @param pageSize
* @return
*/
@GET
(
Constants
.
API_7900
+
"/knowledge"
)
Observable
<
BaseResponse
<
BasePageBean
<
KnowledgeListBean
>>>
queryKnowledge
(
@Query
(
"keyword"
)
String
keyword
,
@Query
(
"page"
)
int
page
,
@Query
(
"pageSize"
)
int
pageSize
);
@GET
(
Constants
.
API_7900
+
"/knowledge/{id}"
)
Observable
<
BaseResponse
<
KnowledgeListBean
>>
getKnowledgeDetail
(
@Path
(
"id"
)
int
id
);
}
orderCenter/src/main/java/com/dayu/order/api/protocol/bean/KnowledgeListBean.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
order
.
api
.
protocol
.
bean
;
public
class
KnowledgeListBean
{
/**
* id : 1
* title : 标题
* brief : 知识内容
* detail : <div>知识内容</div>
* accessories : null
* createTime : 2020-08-19 16:21:40
* created : admin
* updateTime : null
* updated : null
* status : 1
* providerId : 1
* keyword : null
* kcateName : 分类1
* kcateId : 1
*/
private
int
id
;
private
String
title
;
private
String
brief
;
private
String
detail
;
private
Object
accessories
;
private
String
createTime
;
private
String
created
;
private
Object
updateTime
;
private
Object
updated
;
private
int
status
;
private
int
providerId
;
private
Object
keyword
;
private
String
kcateName
;
private
int
kcateId
;
public
int
getId
()
{
return
id
;
}
public
void
setId
(
int
id
)
{
this
.
id
=
id
;
}
public
String
getTitle
()
{
return
title
;
}
public
void
setTitle
(
String
title
)
{
this
.
title
=
title
;
}
public
String
getBrief
()
{
return
brief
;
}
public
void
setBrief
(
String
brief
)
{
this
.
brief
=
brief
;
}
public
String
getDetail
()
{
return
detail
;
}
public
void
setDetail
(
String
detail
)
{
this
.
detail
=
detail
;
}
public
Object
getAccessories
()
{
return
accessories
;
}
public
void
setAccessories
(
Object
accessories
)
{
this
.
accessories
=
accessories
;
}
public
String
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
String
createTime
)
{
this
.
createTime
=
createTime
;
}
public
String
getCreated
()
{
return
created
;
}
public
void
setCreated
(
String
created
)
{
this
.
created
=
created
;
}
public
Object
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Object
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
Object
getUpdated
()
{
return
updated
;
}
public
void
setUpdated
(
Object
updated
)
{
this
.
updated
=
updated
;
}
public
int
getStatus
()
{
return
status
;
}
public
void
setStatus
(
int
status
)
{
this
.
status
=
status
;
}
public
int
getProviderId
()
{
return
providerId
;
}
public
void
setProviderId
(
int
providerId
)
{
this
.
providerId
=
providerId
;
}
public
Object
getKeyword
()
{
return
keyword
;
}
public
void
setKeyword
(
Object
keyword
)
{
this
.
keyword
=
keyword
;
}
public
String
getKcateName
()
{
return
kcateName
;
}
public
void
setKcateName
(
String
kcateName
)
{
this
.
kcateName
=
kcateName
;
}
public
int
getKcateId
()
{
return
kcateId
;
}
public
void
setKcateId
(
int
kcateId
)
{
this
.
kcateId
=
kcateId
;
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeActivity.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
order
.
ui
.
activity
;
import
android.os.Bundle
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.text.TextUtils
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.dayu.base.api.Api
;
import
com.dayu.base.ui.activity.BaseActivity
;
import
com.dayu.base.ui.presenter.SImplePresenter
;
import
com.dayu.common.Constants
;
import
com.dayu.order.R
;
import
com.dayu.order.api.OrderService
;
import
com.dayu.order.api.protocol.bean.KnowledgeListBean
;
import
com.dayu.order.databinding.ActivityKonwledgeQueryBinding
;
import
com.dayu.provider.router.RouterPath
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* 知识查询
*/
@Route
(
path
=
RouterPath
.
PATH_ORDER_KONWLEDGE
)
public
class
KnowledgeActivity
extends
BaseActivity
<
SImplePresenter
,
ActivityKonwledgeQueryBinding
>
{
List
<
KnowledgeListBean
>
knowledgeList
=
new
ArrayList
<>();
BaseQuickAdapter
<
KnowledgeListBean
,
BaseViewHolder
>
knowledgeAdapter
;
int
mPage
=
1
;
private
String
keyStr
;
//搜索关键字
@Override
public
void
setPresenter
()
{
}
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
activity_konwledge_query
;
}
@Override
public
void
initView
()
{
mBind
.
refreshLayout
.
setEnableRefresh
(
false
);
mBind
.
refreshLayout
.
setOnLoadMoreListener
(
refreshLayout
->
{
queryKnowledge
();
});
mBind
.
btnQuery
.
setOnClickListener
(
view
->
{
String
content
=
mBind
.
edtContent
.
getText
().
toString
();
keyStr
=
content
;
mPage
=
1
;
queryKnowledge
();
});
mBind
.
titleBack
.
setOnClickListener
(
v
->
dumpBack
());
}
public
void
setResultCount
(
int
count
)
{
mBind
.
tvResult
.
setText
(
String
.
format
(
getString
(
R
.
string
.
query_result_count
),
count
));
}
//查询
private
void
queryKnowledge
()
{
if
(
TextUtils
.
isEmpty
(
keyStr
)){
showToast
(
"请输入关键字"
);
return
;
}
showDialog
();
Api
.
getService
(
OrderService
.
class
).
queryKnowledge
(
keyStr
,
mPage
,
Constants
.
PAGESIZE
)
.
compose
(
Api
.
applySchedulers
()).
subscribe
(
mPresenter
.
baseObserver
(
data
->
{
setResultCount
(
data
.
getTotalRows
());
mBind
.
refreshLayout
.
finishRefresh
();
mBind
.
refreshLayout
.
finishLoadMore
();
if
(
mPage
==
1
)
{
knowledgeList
.
clear
();
}
knowledgeList
.
addAll
(
data
.
getData
());
setAdapter
();
mBind
.
refreshLayout
.
setEnableLoadMore
(
mPage
<
data
.
getTotalPages
());
mPage
+=
1
;
},
responeThrowable
->
{
mBind
.
refreshLayout
.
finishRefresh
();
mBind
.
refreshLayout
.
finishLoadMore
();
setResultCount
(
0
);
}));
}
private
void
setAdapter
()
{
if
(
knowledgeAdapter
!=
null
)
{
knowledgeAdapter
.
notifyDataSetChanged
();
}
else
{
knowledgeAdapter
=
new
BaseQuickAdapter
<
KnowledgeListBean
,
BaseViewHolder
>(
R
.
layout
.
item_knowledge_list
,
knowledgeList
)
{
@Override
protected
void
convert
(
BaseViewHolder
helper
,
KnowledgeListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_title
,
item
.
getTitle
());
helper
.
setText
(
R
.
id
.
tv_detail
,
item
.
getBrief
());
helper
.
setOnClickListener
(
R
.
id
.
tv_to_detail
,
view
->
{
Bundle
bundle
=
new
Bundle
();
bundle
.
putInt
(
Constants
.
ID
,
item
.
getId
());
startActivity
(
KnowledgeDetailActivity
.
class
,
bundle
);
});
}
};
mBind
.
rvKnowledge
.
setLayoutManager
(
new
LinearLayoutManager
(
mActivity
));
mBind
.
rvKnowledge
.
setAdapter
(
knowledgeAdapter
);
}
}
}
orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeDetailActivity.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
order
.
ui
.
activity
;
import
com.dayu.base.api.Api
;
import
com.dayu.base.ui.activity.BaseActivity
;
import
com.dayu.base.ui.presenter.SImplePresenter
;
import
com.dayu.common.Constants
;
import
com.dayu.order.R
;
import
com.dayu.order.api.OrderService
;
import
com.dayu.order.databinding.ActivityKonwledgeDetailBinding
;
import
com.dayu.utils.CommonUtils
;
public
class
KnowledgeDetailActivity
extends
BaseActivity
<
SImplePresenter
,
ActivityKonwledgeDetailBinding
>
{
@Override
public
void
setPresenter
()
{
}
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
activity_konwledge_detail
;
}
@Override
public
void
initView
()
{
mBind
.
titleBack
.
setOnClickListener
(
view
->
dumpBack
());
int
id
=
getBundle
().
getInt
(
Constants
.
ID
);
getData
(
id
);
CommonUtils
.
initWebView
(
mBind
.
webView
);
mBind
.
webView
.
getSettings
().
setTextZoom
(
200
);
}
private
void
getData
(
int
id
)
{
showDialog
();
Api
.
getService
(
OrderService
.
class
).
getKnowledgeDetail
(
id
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
mPresenter
.
baseObserver
(
data
->{
String
detailHtml
=
data
.
getDetail
();
mBind
.
webView
.
loadData
(
detailHtml
,
"text/html; charset=UTF-8"
,
null
);
}));
}
}
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
View file @
c42f35e5
...
...
@@ -20,6 +20,7 @@ import com.dayu.order.R;
import
com.dayu.order.api.OrderApiFactory
;
import
com.dayu.order.api.protocol.OperateInfo
;
import
com.dayu.order.databinding.FragmentOperateDetailBinding
;
import
com.dayu.order.ui.activity.KnowledgeActivity
;
import
com.dayu.utils.CommonUtils
;
import
com.dayu.utils.GlideImageLoader
;
import
com.dayu.utils.ProgressUtil
;
...
...
@@ -88,6 +89,7 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
CommonUtils
.
setVideoThumb
(
mActivity
,
mBind
.
jzVideo
,
url
);
setListener
();
mBind
.
tvKonwledge
.
setOnClickListener
(
view
->
startActivity
(
KnowledgeActivity
.
class
));
}
//下拉刷新
...
...
orderCenter/src/main/release/AndroidManifest.xml
View file @
c42f35e5
...
...
@@ -108,6 +108,15 @@
android:screenOrientation=
"portrait"
android:windowSoftInputMode=
"stateHidden|adjustPan"
/>
<activity
android:name=
".ui.activity.KnowledgeActivity"
android:screenOrientation=
"portrait"
android:windowSoftInputMode=
"stateHidden|adjustPan"
/>
<activity
android:name=
".ui.activity.KnowledgeDetailActivity"
android:screenOrientation=
"portrait"
/>
</application>
</manifest>
orderCenter/src/main/res/layout/activity_konwledge_detail.xml
0 → 100644
View file @
c42f35e5
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<RelativeLayout
android:id=
"@+id/rl_title"
style=
"@style/title"
>
<TextView
android:id=
"@+id/tv_title"
style=
"@style/text_title"
android:text=
"知识详情"
/>
<ImageView
android:id=
"@+id/title_back"
style=
"@style/title_image_back"
/>
</RelativeLayout>
<ImageView
style=
"@style/card_line"
/>
<WebView
android:id=
"@+id/webView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/activity_konwledge_query.xml
0 → 100644
View file @
c42f35e5
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<RelativeLayout
android:id=
"@+id/rl_title"
style=
"@style/title"
>
<TextView
android:id=
"@+id/tv_title"
style=
"@style/text_title"
android:text=
"@string/konwledge_querry"
/>
<ImageView
android:id=
"@+id/title_back"
style=
"@style/title_image_back"
/>
</RelativeLayout>
<ImageView
style=
"@style/card_line"
/>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"35dp"
android:background=
"@color/color_ee"
android:gravity=
"center_vertical"
android:paddingLeft=
"10dp"
android:text=
"@string/pls_input_query_key"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"13sp"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"5dp"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<EditText
android:id=
"@+id/edt_content"
style=
"@style/learn_course_edit"
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:gravity=
"center_vertical"
android:hint=
"@string/limit_10_words"
android:maxLength=
"10"
/>
<Button
android:id=
"@+id/btn_query"
style=
"@style/btn_common"
android:layout_width=
"70dp"
android:layout_height=
"33dp"
android:layout_marginLeft=
"10dp"
android:layout_marginRight=
"10dp"
android:background=
"@drawable/btn_blue_commom"
android:text=
"@string/query_str"
/>
</LinearLayout>
<TextView
android:id=
"@+id/tv_result"
android:layout_width=
"match_parent"
android:layout_height=
"35dp"
android:layout_marginTop=
"5dp"
android:background=
"@color/color_ee"
android:gravity=
"center_vertical"
android:paddingLeft=
"10dp"
android:text=
"相关联的知识共有0条"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"13sp"
/>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id=
"@+id/refresh_layout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#f5f5f5"
>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/rv_knowledge"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:overScrollMode=
"never"
/>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/fragment_operate_detail.xml
View file @
c42f35e5
...
...
@@ -12,15 +12,13 @@
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:paddingBottom=
"3dp"
>
android:paddingBottom=
"3dp"
>
<android.support.v4.widget.NestedScrollView
android:id=
"@+id/nsv_operate"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginBottom=
"3dp"
>
android:layout_marginBottom=
"3dp"
>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -41,18 +39,7 @@
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_contact_seller"
android:layout_width=
"140dp"
android:layout_height=
"30dp"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:layout_marginRight=
"10dp"
android:background=
"@color/cl_home_button"
android:gravity=
"center"
android:text=
"@string/contact_seller_support"
android:textColor=
"@color/white"
android:textSize=
"12sp"
/>
</RelativeLayout>
<android.support.v7.widget.RecyclerView
...
...
@@ -73,11 +60,67 @@
android:layout_height=
"200dp"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
android:padding=
"5dp"
>
<RelativeLayout
android:layout_width=
"0dp"
android:layout_height=
"35dp"
android:layout_marginLeft=
"10dp"
android:layout_weight=
"1"
android:background=
"@drawable/btn_blue_commom"
>
<TextView
android:id=
"@+id/tv_contact_seller"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:paddingLeft=
"30dp"
android:text=
"@string/seller_support"
android:textColor=
"@color/white"
android:textSize=
"12sp"
/>
<ImageView
android:layout_width=
"18dp"
android:layout_height=
"18dp"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"30dp"
android:src=
"@drawable/ic_phone_white"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"0dp"
android:layout_height=
"35dp"
android:layout_marginLeft=
"30dp"
android:layout_marginRight=
"10dp"
android:layout_weight=
"1"
android:background=
"@drawable/btn_blue_commom"
>
<TextView
android:id=
"@+id/tv_konwledge"
android:layout_height=
"match_parent"
android:layout_width=
"match_parent"
android:background=
"@drawable/btn_blue_commom"
android:gravity=
"center"
android:text=
"@string/konwledge_querry"
android:paddingLeft=
"20dp"
android:textColor=
"@color/white"
android:textSize=
"12sp"
/>
<ImageView
android:layout_width=
"18dp"
android:layout_height=
"18dp"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"30dp"
android:src=
"@drawable/ic_search_white"
/>
</RelativeLayout>
</LinearLayout>
<TextView
android:id=
"@+id/tv_component"
android:layout_width=
"match_parent"
android:layout_height=
"43dp"
android:layout_marginTop=
"10dp"
android:background=
"@color/color_ee"
android:gravity=
"center_vertical"
android:paddingLeft=
"15dp"
...
...
@@ -137,7 +180,6 @@
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<Button
android:visibility=
"gone"
android:id=
"@+id/btn_comment"
android:layout_width=
"match_parent"
android:layout_height=
"35dp"
...
...
@@ -149,6 +191,7 @@
android:gravity=
"center"
android:text=
"@string/ask_detail"
android:textColor=
"@color/white"
android:textSize=
"13sp"
/>
android:textSize=
"13sp"
android:visibility=
"gone"
/>
</LinearLayout>
</layout>
\ No newline at end of file
orderCenter/src/main/res/layout/item_knowledge_list.xml
0 → 100644
View file @
c42f35e5
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_13.3"
android:layout_marginTop=
"5dp"
android:layout_marginRight=
"@dimen/dp_13.3"
android:background=
"@drawable/item_shape"
android:orientation=
"vertical"
android:padding=
"10dp"
>
<LinearLayout
style=
"@style/ll_horizontal"
>
<TextView
style=
"@style/common_text_style"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"【知识标题】:"
/>
<TextView
android:id=
"@+id/tv_title"
style=
"@style/common_text_style"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:ellipsize=
"end"
android:singleLine=
"true"
android:text=
""
/>
</LinearLayout>
<LinearLayout
style=
"@style/ll_horizontal"
android:layout_marginTop=
"5dp"
android:gravity=
"top"
>
<TextView
style=
"@style/common_text_style"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"【知识详情】:"
/>
<TextView
android:id=
"@+id/tv_detail"
style=
"@style/common_text_style"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:ellipsize=
"end"
android:maxLines=
"3"
android:text=
""
/>
</LinearLayout>
<TextView
android:id=
"@+id/tv_to_detail"
style=
"@style/common_text_style"
android:layout_width=
"65dp"
android:layout_height=
"30dp"
android:layout_gravity=
"right"
android:layout_marginTop=
"5dp"
android:background=
"@drawable/btn_blue_whitecontent"
android:gravity=
"center"
android:text=
"详情"
android:textColor=
"@color/text_common_blue"
/>
</LinearLayout>
orderCenter/src/main/res/values/strings.xml
View file @
c42f35e5
...
...
@@ -47,4 +47,7 @@
<string
name=
"pls_fill_goods_list"
>
请填写货物清单
</string>
<string
name=
"pls_fill_trans_code"
>
请填写物流单号
</string>
<string
name=
"pls_fill_trans_company"
>
请选择物流公司
</string>
<string
name=
"pls_input_query_key"
>
请输入查询关键字:
</string>
<string
name=
"query_str"
>
查询
</string>
<string
name=
"query_result_count"
>
相关联的知识共有%d条
</string>
</resources>
provider/src/main/java/com/dayu/provider/router/RouterPath.java
View file @
c42f35e5
...
...
@@ -19,8 +19,8 @@ public class RouterPath {
* 工单模块.
*/
public
final
static
String
PATH_ORDER_DETAIL
=
"/order/detail"
;
public
final
static
String
PATH_ORDER_HISTORY
=
"/order/history"
;
public
final
static
String
PATH_ORDER_KONWLEDGE
=
"/order/konwledge"
;
/**
* 我的模块.
...
...
userCenter/src/main/java/com/dayu/usercenter/adapter/SelfLicenceAdapter.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
usercenter
.
adapter
;
import
android.view.View
;
import
com.dayu.base.ui.adapter.CoreAdapter
;
import
com.dayu.usercenter.R
;
import
com.dayu.usercenter.databinding.ItemUserLicenceBinding
;
import
com.dayu.usercenter.model.bean.SelfLicenceBean
;
import
com.dayu.usercenter.presenter.userlicence.UserLicencePresent
;
import
com.dayu.utils.GlideImageLoader
;
public
class
SelfLicenceAdapter
extends
CoreAdapter
<
SelfLicenceBean
,
ItemUserLicenceBinding
>
{
private
UserLicencePresent
mPresent
;
public
SelfLicenceAdapter
(
boolean
needFoot
)
{
super
(
needFoot
);
}
@Override
protected
void
onBind
(
ItemUserLicenceBinding
holder
,
SelfLicenceBean
item
,
int
position
)
{
super
.
onBind
(
holder
,
item
,
position
);
GlideImageLoader
.
load
(
mContext
,
holder
.
ivImg
,
item
.
getUrl
(),
R
.
drawable
.
icon_img_default
);
holder
.
tvTitle
.
setText
(
item
.
getName
());
holder
.
tvCompany
.
setText
(
getStatusDesc
(
item
.
getStatus
()));
holder
.
tvCompany
.
setTextColor
(
mContext
.
getResources
().
getColor
(
R
.
color
.
color_69
));
holder
.
ivArrow
.
setVisibility
(
View
.
GONE
);
holder
.
btnApply
.
setVisibility
(
View
.
GONE
);
}
private
String
getStatusDesc
(
int
status
)
{
switch
(
status
)
{
case
1
:
return
"待审核"
;
case
2
:
return
"审核通过"
;
case
3
:
return
"审核未通过"
;
default
:
return
""
;
}
}
public
void
setPresent
(
UserLicencePresent
mPresent
)
{
this
.
mPresent
=
mPresent
;
}
}
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
View file @
c42f35e5
...
...
@@ -10,6 +10,7 @@ import com.dayu.usercenter.model.ApplyWithdrawData;
import
com.dayu.usercenter.model.ChangeNickData
;
import
com.dayu.usercenter.model.EditBankData
;
import
com.dayu.usercenter.model.SaveSceneData
;
import
com.dayu.usercenter.model.UploadSelfLicenceData
;
import
com.dayu.usercenter.model.bean.BusinessSceneBean
;
import
com.dayu.usercenter.model.bean.CommonRecordListBean
;
import
com.dayu.usercenter.model.bean.GlobelRateBean
;
...
...
@@ -17,6 +18,7 @@ import com.dayu.usercenter.model.bean.InviteRecordBean;
import
com.dayu.usercenter.model.bean.SaleArriveListBean
;
import
com.dayu.usercenter.model.bean.SaleRecordBean
;
import
com.dayu.usercenter.model.bean.SaleRecordListBean
;
import
com.dayu.usercenter.model.bean.SelfLicenceBean
;
import
com.dayu.usercenter.model.bean.ServiceTypeBean
;
import
com.dayu.usercenter.model.bean.StarRatioBean
;
import
com.dayu.usercenter.model.bean.UserBankInfoBean
;
...
...
@@ -150,6 +152,16 @@ public interface UserService2 {
@Query
(
"pageSize"
)
int
pageSize
);
/**
* 全部认证资质
*
* @return
*/
@GET
(
Constants
.
API_7100
+
"/engineerCertificate"
)
Observable
<
BaseResponse
<
BasePageBean
<
SelfLicenceBean
>>>
getSelfLicence
(
@Query
(
"engineerId"
)
int
engineerId
,
@Query
(
"page"
)
int
page
,
@Query
(
"pageSize"
)
int
pageSize
);
/**
* 已获认证资质
*
* @return
...
...
@@ -291,4 +303,10 @@ public interface UserService2 {
@GET
(
"/api-third/WXUser/getWxQrCode"
)
Call
<
ResponseBody
>
createWxUrl
(
@Query
(
"path"
)
String
path
,
@Query
(
"width"
)
int
width
);
/**
* 上传个人认证
*/
@POST
(
Constants
.
API_7100
+
"/engineerCertificate"
)
Observable
<
BaseResponse
<
Boolean
>>
uploadSelfLicence
(
@Body
UploadSelfLicenceData
data
);
}
userCenter/src/main/java/com/dayu/usercenter/event/UploadSelfLicenceEvent.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
usercenter
.
event
;
public
class
UploadSelfLicenceEvent
{
}
userCenter/src/main/java/com/dayu/usercenter/model/UploadSelfLicenceData.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
usercenter
.
model
;
public
class
UploadSelfLicenceData
{
public
int
engineerId
;
public
String
engineerName
;
public
String
engineerMobile
;
public
String
name
;
public
String
url
;
public
int
status
=
1
;
public
UploadSelfLicenceData
()
{
}
public
UploadSelfLicenceData
(
int
engineerId
,
String
name
,
String
url
)
{
this
.
engineerId
=
engineerId
;
this
.
name
=
name
;
this
.
url
=
url
;
}
public
UploadSelfLicenceData
(
int
engineerId
,
String
engineerName
,
String
engineerMobile
,
String
name
,
String
url
)
{
this
.
engineerId
=
engineerId
;
this
.
engineerName
=
engineerName
;
this
.
engineerMobile
=
engineerMobile
;
this
.
name
=
name
;
this
.
url
=
url
;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/SelfLicenceBean.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
usercenter
.
model
.
bean
;
public
class
SelfLicenceBean
{
/**
* id : 1
* name : 你好
* url : http://dl.kf.ai/dev/sp/account/protocolfile/e6b2ad8c0e0cd677af04058dd7e431be.jpg
* status : 0
* createTime : 2020-08-19 17:44:45
* created : string
* updateTime : null
* updated : 小明
* engineerName : 小明
* engineerMobile : 1341312412412
* engineerId : 0
*/
private
int
id
;
private
String
name
;
private
String
url
;
private
int
status
;
private
String
createTime
;
private
String
created
;
private
Object
updateTime
;
private
String
updated
;
private
String
engineerName
;
private
String
engineerMobile
;
private
int
engineerId
;
public
int
getId
()
{
return
id
;
}
public
void
setId
(
int
id
)
{
this
.
id
=
id
;
}
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
String
getUrl
()
{
return
url
;
}
public
void
setUrl
(
String
url
)
{
this
.
url
=
url
;
}
public
int
getStatus
()
{
return
status
;
}
public
void
setStatus
(
int
status
)
{
this
.
status
=
status
;
}
public
String
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
String
createTime
)
{
this
.
createTime
=
createTime
;
}
public
String
getCreated
()
{
return
created
;
}
public
void
setCreated
(
String
created
)
{
this
.
created
=
created
;
}
public
Object
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Object
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
String
getUpdated
()
{
return
updated
;
}
public
void
setUpdated
(
String
updated
)
{
this
.
updated
=
updated
;
}
public
String
getEngineerName
()
{
return
engineerName
;
}
public
void
setEngineerName
(
String
engineerName
)
{
this
.
engineerName
=
engineerName
;
}
public
String
getEngineerMobile
()
{
return
engineerMobile
;
}
public
void
setEngineerMobile
(
String
engineerMobile
)
{
this
.
engineerMobile
=
engineerMobile
;
}
public
int
getEngineerId
()
{
return
engineerId
;
}
public
void
setEngineerId
(
int
engineerId
)
{
this
.
engineerId
=
engineerId
;
}
}
userCenter/src/main/java/com/dayu/usercenter/presenter/userlicence/UserLicencePresent.java
View file @
c42f35e5
...
...
@@ -11,13 +11,12 @@ import com.dayu.usercenter.model.bean.UserLicenceBean;
import
com.dayu.utils.SPUtils
;
import
com.dayu.utils.ToastUtils
;
import
com.dayu.utils.UserManager
;
import
com.megvii.idcardlib.util.Constant
;
public
class
UserLicencePresent
extends
UserLicenceContract
.
Presenter
{
private
int
mPage
;
private
int
mUserId
;
private
String
mUserName
;
public
int
type
;
//1.已获得 2.全部
public
int
type
;
//1.已获得 2.全部
3.自传
private
ObservableField
<
Object
>
datas
=
new
ObservableField
<>();
@Override
...
...
@@ -38,18 +37,36 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{
@Override
public
void
refresh
()
{
super
.
refresh
();
if
(
type
==
1
)
{
getHasedLicence
();
}
else
{
mPage
=
1
;
getAllLicence
();
switch
(
type
){
case
1
:
getHasedLicence
();
break
;
case
2
:
mPage
=
1
;
getAllLicence
();
break
;
case
3
:
mPage
=
1
;
getSelfLicence
();
break
;
}
}
@Override
public
void
loadMore
()
{
getAllLicence
();
switch
(
type
){
case
1
:
getHasedLicence
();
break
;
case
2
:
getAllLicence
();
break
;
case
3
:
getSelfLicence
();
break
;
}
}
//已获认证
...
...
@@ -68,6 +85,14 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{
mPage
++;
},
responeThrowable
->
datas
.
set
(
Constants
.
FAILED
)));
}
//全部认证
private
void
getSelfLicence
()
{
Api
.
getService
(
UserService2
.
class
).
getSelfLicence
(
mUserId
,
mPage
,
Constants
.
PAGESIZE
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
baseObserver
(
licences
->{
datas
.
set
(
licences
);
mPage
++;
},
responeThrowable
->
datas
.
set
(
Constants
.
FAILED
)));
}
//申请认证
public
void
applyAllLicence
(
UserLicenceBean
item
)
{
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
usercenter
.
ui
.
activity2
;
import
android.content.Intent
;
import
android.text.TextUtils
;
import
com.dayu.base.api.Api
;
import
com.dayu.base.api.BaseApiFactory
;
import
com.dayu.base.ui.activity.BaseActivity
;
import
com.dayu.base.ui.presenter.SImplePresenter
;
import
com.dayu.usercenter.R
;
import
com.dayu.usercenter.api.UserService2
;
import
com.dayu.usercenter.databinding.ActivityUploadSelfLicenceBinding
;
import
com.dayu.usercenter.event.UploadSelfLicenceEvent
;
import
com.dayu.usercenter.model.UploadSelfLicenceData
;
import
com.dayu.utils.GlideImageLoader
;
import
com.dayu.utils.MediaChooseUtils
;
import
com.luck.picture.lib.PictureSelector
;
import
com.luck.picture.lib.config.PictureConfig
;
import
com.luck.picture.lib.entity.LocalMedia
;
import
org.greenrobot.eventbus.EventBus
;
import
java.io.File
;
import
java.util.List
;
import
okhttp3.MediaType
;
import
okhttp3.MultipartBody
;
import
okhttp3.RequestBody
;
public
class
UploadSelfLicenceActivity
extends
BaseActivity
<
SImplePresenter
,
ActivityUploadSelfLicenceBinding
>
{
private
String
imgPath
;
private
String
imgUrl
;
private
String
content
;
@Override
public
void
setPresenter
()
{
}
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
activity_upload_self_licence
;
}
@Override
public
void
initView
()
{
initUser
();
mBind
.
titleBack
.
setOnClickListener
(
view
->{
dumpBack
();
});
mBind
.
btnUpload
.
setOnClickListener
(
view
->
toUplad
());
mBind
.
rlImg
.
setOnClickListener
(
view
->
MediaChooseUtils
.
chooseSigleImg
(
this
));
}
private
void
toUplad
()
{
content
=
mBind
.
edtContent
.
getText
().
toString
();
if
(
TextUtils
.
isEmpty
(
content
.
trim
()))
{
showToast
(
"请输入认证名称"
);
return
;
}
if
(
TextUtils
.
isEmpty
(
imgPath
))
{
showToast
(
"请选择图片"
);
return
;
}
File
file
=
new
File
(
imgPath
);
RequestBody
requestFile
=
RequestBody
.
create
(
MediaType
.
parse
(
"multipart/form-data"
),
file
);
MultipartBody
.
Part
body
=
MultipartBody
.
Part
.
createFormData
(
"fileUpload"
,
file
.
getName
(),
requestFile
);
showDialog
();
BaseApiFactory
.
uploadPhoto
(
body
).
subscribe
(
mPresenter
.
baseObserver
(
list
->
{
if
(
list
!=
null
&&
list
.
size
()
>
0
)
{
imgUrl
=
list
.
get
(
0
);
upload
();
}
else
{
showToast
(
"图片上传失败"
);
}
}));
}
//上传认证资料
private
void
upload
()
{
UploadSelfLicenceData
data
=
new
UploadSelfLicenceData
(
mUserId
,
mUserInfo
.
getAccountName
(),
mUserInfo
.
getMobile
(),
content
,
imgUrl
);
Api
.
getService
(
UserService2
.
class
).
uploadSelfLicence
(
data
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
mPresenter
.
baseObserver
(
success
->
{
if
(
success
)
{
showToast
(
"上传成功"
);
EventBus
.
getDefault
().
post
(
new
UploadSelfLicenceEvent
());
finish
();
}
}));
}
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
if
(
resultCode
==
RESULT_OK
)
{
switch
(
requestCode
)
{
case
PictureConfig
.
CHOOSE_REQUEST
:
List
<
LocalMedia
>
mSelectList
=
PictureSelector
.
obtainMultipleResult
(
data
);
if
(
mSelectList
!=
null
)
{
for
(
int
a
=
0
;
a
<
mSelectList
.
size
();
a
++)
{
if
(!
TextUtils
.
isEmpty
(
mSelectList
.
get
(
a
).
getCompressPath
()))
{
imgPath
=
mSelectList
.
get
(
a
).
getCompressPath
();
}
else
{
imgPath
=
mSelectList
.
get
(
a
).
getPath
();
}
GlideImageLoader
.
loadFit
(
UploadSelfLicenceActivity
.
this
,
mBind
.
ivImg
,
imgPath
);
}
}
break
;
}
}
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UserLicenceActivity.java
View file @
c42f35e5
...
...
@@ -3,11 +3,13 @@ package com.dayu.usercenter.ui.activity2;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentTransaction
;
import
android.view.View
;
import
com.dayu.base.ui.activity.BaseActivity
;
import
com.dayu.base.ui.presenter.SImplePresenter
;
import
com.dayu.usercenter.R
;
import
com.dayu.usercenter.databinding.ActivityUserLicenceBinding
;
import
com.dayu.usercenter.ui.fragment.SelfLicenceFragment
;
import
com.dayu.usercenter.ui.fragment.UserLicenceFragment
;
import
com.umeng.analytics.MobclickAgent
;
...
...
@@ -17,7 +19,7 @@ import java.util.ArrayList;
/**
* Created by mReturn
**/
public
class
UserLicenceActivity
extends
BaseActivity
<
SImplePresenter
,
ActivityUserLicenceBinding
>
{
public
class
UserLicenceActivity
extends
BaseActivity
<
SImplePresenter
,
ActivityUserLicenceBinding
>
{
private
FragmentManager
mFragmentManger
;
private
ArrayList
<
Fragment
>
mFragments
=
new
ArrayList
<>();
...
...
@@ -35,11 +37,14 @@ public class UserLicenceActivity extends BaseActivity<SImplePresenter,ActivityUs
@Override
public
void
initView
()
{
MobclickAgent
.
onEvent
(
mActivity
,
"look_certification"
);
mBind
.
receivingBack
.
setOnClickListener
(
v
->
dumpBack
());
MobclickAgent
.
onEvent
(
mActivity
,
"look_certification"
);
mBind
.
receivingBack
.
setOnClickListener
(
v
->
dumpBack
());
mBind
.
ivAdd
.
setOnClickListener
(
v
->
startActivity
(
UploadSelfLicenceActivity
.
class
));
mFragments
.
add
(
UserLicenceFragment
.
newInstance
(
1
));
mFragments
.
add
(
UserLicenceFragment
.
newInstance
(
2
));
mFragments
.
add
(
new
SelfLicenceFragment
());
initBtn
();
addFragment
();
...
...
@@ -47,20 +52,26 @@ public class UserLicenceActivity extends BaseActivity<SImplePresenter,ActivityUs
//初始化tab
public
void
initBtn
()
{
mBind
.
btn
Goods
.
setSelected
(
true
);
mBind
.
btn
Goods
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
white
));
mBind
.
btn
Goods
.
setOnClickListener
((
view
)
->
{
mBind
.
btn
Have
.
setSelected
(
true
);
mBind
.
btn
Have
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
white
));
mBind
.
btn
Have
.
setOnClickListener
((
view
)
->
{
reSelected
();
mBind
.
btn
Goods
.
setSelected
(
true
);
mBind
.
btn
Goods
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
white
));
mBind
.
btn
Have
.
setSelected
(
true
);
mBind
.
btn
Have
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
white
));
showHideFragment
(
0
,
mPosition
);
});
mBind
.
btn
Sale
.
setOnClickListener
((
view
)
->
{
mBind
.
btn
All
.
setOnClickListener
((
view
)
->
{
reSelected
();
mBind
.
btn
Sale
.
setSelected
(
true
);
mBind
.
btn
Sale
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
white
));
mBind
.
btn
All
.
setSelected
(
true
);
mBind
.
btn
All
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
white
));
showHideFragment
(
1
,
mPosition
);
});
mBind
.
btnSelf
.
setOnClickListener
((
view
)
->
{
reSelected
();
mBind
.
btnSelf
.
setSelected
(
true
);
mBind
.
btnSelf
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
white
));
showHideFragment
(
2
,
mPosition
);
});
}
public
void
addFragment
()
{
...
...
@@ -79,15 +90,18 @@ public class UserLicenceActivity extends BaseActivity<SImplePresenter,ActivityUs
//充值
private
void
reSelected
()
{
mBind
.
btnGoods
.
setSelected
(
false
);
mBind
.
btnSale
.
setSelected
(
false
);
mBind
.
btnGoods
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_home_button
));
mBind
.
btnSale
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_home_button
));
mBind
.
btnHave
.
setSelected
(
false
);
mBind
.
btnAll
.
setSelected
(
false
);
mBind
.
btnSelf
.
setSelected
(
false
);
mBind
.
btnHave
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_home_button
));
mBind
.
btnAll
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_home_button
));
mBind
.
btnSelf
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_home_button
));
}
//切换页面
private
void
showHideFragment
(
int
showPosition
,
int
hidePosition
)
{
if
(
showPosition
==
hidePosition
)
return
;
mBind
.
ivAdd
.
setVisibility
(
showPosition
==
2
?
View
.
VISIBLE
:
View
.
GONE
);
mFragmentManger
.
beginTransaction
()
.
show
(
mFragments
.
get
(
showPosition
))
.
hide
(
mFragments
.
get
(
hidePosition
))
...
...
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SelfLicenceFragment.java
0 → 100644
View file @
c42f35e5
package
com
.
dayu
.
usercenter
.
ui
.
fragment
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
com.dayu.base.ui.fragment.BaseFragment
;
import
com.dayu.usercenter.R
;
import
com.dayu.usercenter.adapter.SelfLicenceAdapter
;
import
com.dayu.usercenter.databinding.FragmentUserLicenceBinding
;
import
com.dayu.usercenter.event.UploadSelfLicenceEvent
;
import
com.dayu.usercenter.presenter.userlicence.UserLicenceContract
;
import
com.dayu.usercenter.presenter.userlicence.UserLicencePresent
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.Subscribe
;
/**
* Created by mReturn
* on 2020/2/15
**/
public
class
SelfLicenceFragment
extends
BaseFragment
<
UserLicencePresent
,
FragmentUserLicenceBinding
>
implements
UserLicenceContract
.
View
{
private
SelfLicenceAdapter
mAdapter
;
@Override
public
int
getLayoutId
()
{
return
R
.
layout
.
fragment_user_licence
;
}
@Override
public
void
setPresenter
()
{
mBind
.
setPresenter
(
mPresenter
);
}
@Override
public
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
EventBus
.
getDefault
().
register
(
this
);
}
@Override
public
void
initView
()
{
mPresenter
.
setType
(
3
);
mAdapter
=
new
SelfLicenceAdapter
(
true
);
mAdapter
.
setViewType
(
R
.
layout
.
item_user_licence
);
mAdapter
.
setPresent
(
mPresenter
);
mBind
.
recyclerView
.
setAdapter
(
mAdapter
);
showDialog
();
mPresenter
.
refresh
();
}
@Override
public
void
onDestroy
()
{
super
.
onDestroy
();
EventBus
.
getDefault
().
unregister
(
this
);
}
@Subscribe
public
void
afterUpload
(
UploadSelfLicenceEvent
event
){
mPresenter
.
refresh
();
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/UserLicenceFragment.java
View file @
c42f35e5
...
...
@@ -7,12 +7,9 @@ import com.dayu.common.Constants;
import
com.dayu.usercenter.R
;
import
com.dayu.usercenter.adapter.UserLicenceAdapter
;
import
com.dayu.usercenter.databinding.FragmentUserLicenceBinding
;
import
com.dayu.usercenter.databinding.ItemUserLicenceBinding
;
import
com.dayu.usercenter.model.bean.UserLicenceBean
;
import
com.dayu.usercenter.presenter.userlicence.UserLicenceContract
;
import
com.dayu.usercenter.presenter.userlicence.UserLicencePresent
;
import
com.dayu.usercenter.ui.activity.LicenceDetailActivity
;
import
com.dayu.widgets.listener.OnItemClickListener
;
/**
* Created by mReturn
...
...
@@ -21,7 +18,7 @@ import com.dayu.widgets.listener.OnItemClickListener;
public
class
UserLicenceFragment
extends
BaseFragment
<
UserLicencePresent
,
FragmentUserLicenceBinding
>
implements
UserLicenceContract
.
View
{
private
int
type
;
//1.已获得 2.全部
private
int
type
;
//1.已获得 2.全部
3.自传
private
UserLicenceAdapter
mAdapter
;
public
static
UserLicenceFragment
newInstance
(
int
type
)
{
...
...
userCenter/src/main/release/AndroidManifest.xml
View file @
c42f35e5
...
...
@@ -110,6 +110,9 @@
<activity
android:name=
".ui.activity2.EditNickActivity"
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activity2.UploadSelfLicenceActivity"
android:screenOrientation=
"portrait"
/>
</application>
</manifest>
userCenter/src/main/res/layout/activity_upload_self_licence.xml
0 → 100644
View file @
c42f35e5
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<RelativeLayout
android:id=
"@+id/rl_title"
style=
"@style/title"
>
<TextView
android:id=
"@+id/tv_title"
style=
"@style/text_title"
android:text=
"认证上传"
/>
<ImageView
android:id=
"@+id/title_back"
style=
"@style/title_image_back"
/>
</RelativeLayout>
<ImageView
style=
"@style/card_line"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"25dp"
android:layout_marginBottom=
"20dp"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
style=
"@style/common_text_style"
android:text=
"认证名称"
android:layout_marginLeft=
"10dp"
android:layout_marginRight=
"10dp"
/>
<EditText
android:id=
"@+id/edt_content"
style=
"@style/learn_course_edit"
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_marginRight=
"10dp"
android:gravity=
"center_vertical"
android:singleLine=
"true"
android:maxLength=
"30"
/>
</LinearLayout>
<RelativeLayout
android:id=
"@+id/rl_img"
android:layout_width=
"match_parent"
android:layout_height=
"200dp"
android:layout_margin=
"10dp"
android:background=
"@drawable/bg_input_gray_react"
android:padding=
"1dp"
>
<TextView
style=
"@style/common_text_style"
android:textSize=
"30sp"
android:textColor=
"#999"
android:text=
"+"
android:layout_centerInParent=
"true"
/>
<ImageView
android:id=
"@+id/iv_img"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
<ImageView
android:visibility=
"gone"
android:id=
"@+id/iv_delete"
android:layout_width=
"25dp"
android:layout_height=
"25dp"
android:layout_alignParentRight=
"true"
android:layout_alignParentTop=
"true"
android:src=
"@drawable/img_photo_delete"
/>
</RelativeLayout>
<Button
android:id=
"@+id/btn_upload"
android:layout_width=
"match_parent"
style=
"@style/btn_common_blue"
android:layout_marginLeft=
"40dp"
android:layout_marginTop=
"20dp"
android:layout_marginRight=
"40dp"
android:text=
"上传"
/>
</LinearLayout>
</layout>
\ No newline at end of file
userCenter/src/main/res/layout/activity_user_licence.xml
View file @
c42f35e5
...
...
@@ -20,6 +20,14 @@
android:id=
"@+id/receiving_back"
style=
"@style/title_image_back"
/>
<ImageView
android:visibility=
"gone"
android:id=
"@+id/iv_add"
style=
"@style/title_image_back"
android:layout_alignParentRight=
"true"
android:src=
"@drawable/icon_add_sn"
android:layout_marginRight=
"10dp"
/>
</RelativeLayout>
...
...
@@ -29,10 +37,12 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/cl_white"
android:layout_marginLeft=
"1dp"
android:layout_marginRight=
"1dp"
android:gravity=
"center"
>
<Button
android:id=
"@+id/btn_
goods
"
android:id=
"@+id/btn_
have
"
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"35dp"
...
...
@@ -41,13 +51,21 @@
android:text=
"@string/licence_haved"
/>
<Button
android:id=
"@+id/btn_
sale
"
android:id=
"@+id/btn_
all
"
android:layout_width=
"0dp"
android:layout_height=
"35dp"
android:layout_weight=
"1"
android:background=
"@drawable/detail_
end
_selector"
android:background=
"@drawable/detail_
center
_selector"
android:gravity=
"center"
android:text=
"@string/licence_all"
/>
<Button
android:id=
"@+id/btn_self"
android:layout_width=
"0dp"
android:layout_height=
"35dp"
android:layout_weight=
"1"
android:background=
"@drawable/detail_end_selector"
android:gravity=
"center"
android:text=
"@string/licence_self"
/>
</LinearLayout>
<FrameLayout
...
...
userCenter/src/main/res/layout/item_user_licence.xml
View file @
c42f35e5
...
...
@@ -35,7 +35,7 @@
<TextView
android:id=
"@+id/tv_company"
style=
"@style/sale_item_text"
android:text=
"
company
"
android:text=
""
/>
</LinearLayout>
...
...
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