Skip to content

S
ShenghuoquanBusiness
Commit e9d061bc authored by shiyl's avatar shiyl
Browse files
Options

add搭建人员管理相关页面

parent 29c894a2
Hide whitespace changes
Inline Side-by-side
Showing with 534 additions and 236 deletions
CommonLib/Common/src/main/java/com/yidian/common/XRouterPathConstants.kt
View file @ e9d061bc
...@@ -4,29 +4,47 @@ package com.yidian.common ...@@ -4,29 +4,47 @@ package com.yidian.common
* Describe:生活圈项目如果名称和之前的有重复的，就在后面加上"_LIFE_CIRCLE" * Describe:生活圈项目如果名称和之前的有重复的，就在后面加上"_LIFE_CIRCLE"
*/ */
class XRouterPathConstants { class XRouterPathConstants {
companion object { companion object {
const val ParamsKey = "ParamsMap" const val ParamsKey = "ParamsMap"
const val NEWS_MAIN = "/MainActivity" const val NEWS_MAIN = "/MainActivity"
const val NEWS_CONTENT = "/news" const val NEWS_CONTENT = "/news"
const val GALLERY = "/imageGallery" const val GALLERY = "/imageGallery"
const val PROTOCOL = "/protocol" const val PROTOCOL = "/protocol"
const val SUPPORT = "/productSupport" const val SUPPORT = "/productSupport"
const val FLASH = "/flash" const val FLASH = "/flash"
const val LOGIN_LIFE_CIRCLE = "/loginLifeCircle" const val LOGIN_LIFE_CIRCLE = "/loginLifeCircle"
const val LIFE_ACCOUNT_IDENTITY = "/lifeAccountIdentity" const val LIFE_ACCOUNT_IDENTITY = "/lifeAccountIdentity"
const val LIFE_ACCOUNT_AUTH = "/lifeAccountAuth" const val LIFE_ACCOUNT_AUTH = "/lifeAccountAuth"
const val ID_CARD_TEST = "/idCardTest" const val ID_CARD_TEST = "/idCardTest"
const val LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION = "/lifeAccountEnterpriseCertification" const val LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION = "/lifeAccountEnterpriseCertification"
const val LIFE_ACCOUNT_PERSONAL_AUTH = "/lifeAccountPersonalAuth" const val LIFE_ACCOUNT_PERSONAL_AUTH = "/lifeAccountPersonalAuth"
const val LIFE_ACCOUNT_CREATE = "/createLiveAccountActivity" const val LIFE_ACCOUNT_CREATE = "/createLiveAccountActivity"
const val LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE = "/lifeAccountPersonalAuthComplete" const val LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE = "/lifeAccountPersonalAuthComplete"
const val LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE = "/lifeAccountEnterpriseAuthComplete" const val LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE = "/lifeAccountEnterpriseAuthComplete"
const val LIFE_ACCOUNT_ENTERPRISE_AUTH = "/lifeAccountEnterpriseAuth" const val LIFE_ACCOUNT_ENTERPRISE_AUTH = "/lifeAccountEnterpriseAuth"
const val LIFE_NUMBER = "/lifeNumberActivity" const val LIFE_NUMBER = "/lifeNumberActivity"
// 人员管理 —— 我的员工 // 人员管理 —— 我的员工
const val PERSONAL_MY_STAFF = "/personal/myStaffActivity" const val PERSONAL_MY_STAFF = "/personal/myStaffActivity"
}
} // 人员管理 —— 管理员信息
\ No newline at end of file const val PERSONAL_MANAGER_INFO = "/personal/ManagerInfoActivity"
// 人员管理 —— 管理员变更
const val PERSONAL_MANAGER_CHANGE = "/personal/ManagerChangeActivity"
// 人员管理 —— 员工信息
const val PERSONAL_STAFF_INFO = "/personal/StaffInfoActivity"
// 人员管理 —— 员工管理
const val PERSONAL_STAFF_MANAGE = "/personal/StaffManageActivity"
// 人员管理 —— 添加员工
const val PERSONAL_ADD_STAFF = "/personal/AddStaffActivity"
// 系统设置 —— 设置
const val SYSTEM_SETTING = "/setting/SettingActivity"
}
}
Components/newscontent/src/main/AndroidManifest.xml
View file @ e9d061bc
...@@ -99,6 +99,24 @@ ...@@ -99,6 +99,24 @@
<activity <activity
android:name=".personnel.ui.MyStaffActivity" android:name=".personnel.ui.MyStaffActivity"
android:theme="@style/Transparent" /> android:theme="@style/Transparent" />
<activity
android:name=".personnel.ui.ManagerInfoActivity"
android:theme="@style/Transparent" />
<activity
android:name=".personnel.ui.ManagerChangeActivity"
android:theme="@style/Transparent" />
<activity
android:name=".personnel.ui.StaffInfoActivity"
android:theme="@style/Transparent" />
<activity
android:name=".personnel.ui.StaffManageActivity"
android:theme="@style/Transparent" />
<activity
android:name=".personnel.ui.AddStaffActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.setting.SystemSetting"
android:theme="@style/Transparent" />
</application> </application>
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt
View file @ e9d061bc
...@@ -15,17 +15,24 @@ import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AU ...@@ -15,17 +15,24 @@ import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AU
import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
import com.yidian.common.XRouterPathConstants.Companion.NEWS_CONTENT import com.yidian.common.XRouterPathConstants.Companion.NEWS_CONTENT
import com.yidian.common.XRouterPathConstants.Companion.NEWS_MAIN import com.yidian.common.XRouterPathConstants.Companion.NEWS_MAIN
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MANAGER_INFO
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MY_STAFF import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MY_STAFF
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
import com.yidian.common.XRouterPathConstants.Companion.PROTOCOL import com.yidian.common.XRouterPathConstants.Companion.PROTOCOL
import com.yidian.common.XRouterPathConstants.Companion.SUPPORT import com.yidian.common.XRouterPathConstants.Companion.SUPPORT
import com.yidian.common.XRouterPathConstants.Companion.SYSTEM_SETTING
import com.yidian.common.YdBaseApplication import com.yidian.common.YdBaseApplication
import com.yidian.news.util.ProcessUtil import com.yidian.news.util.ProcessUtil
import com.yidian.nightmode.util.NightModeUtil import com.yidian.nightmode.util.NightModeUtil
import com.yidian.shenghuoquan.newscontent.personnel.ui.MyStaffActivity import com.yidian.shenghuoquan.newscontent.personnel.ui.*
import com.yidian.shenghuoquan.newscontent.service.* import com.yidian.shenghuoquan.newscontent.service.*
import com.yidian.shenghuoquan.newscontent.ui.* import com.yidian.shenghuoquan.newscontent.ui.*
import com.yidian.shenghuoquan.newscontent.ui.auth.* import com.yidian.shenghuoquan.newscontent.ui.auth.*
import com.yidian.shenghuoquan.newscontent.ui.idcard.IDCardTestActivity import com.yidian.shenghuoquan.newscontent.ui.idcard.IDCardTestActivity
import com.yidian.shenghuoquan.newscontent.ui.setting.SystemSetting
import com.yidian.utils.DensityUtil import com.yidian.utils.DensityUtil
import com.yidian.xpage.XPageManager import com.yidian.xpage.XPageManager
import com.yidian.xpage.node.XPageHandler import com.yidian.xpage.node.XPageHandler
...@@ -36,217 +43,283 @@ import com.yidian.yac.core.zap.Zap ...@@ -36,217 +43,283 @@ import com.yidian.yac.core.zap.Zap
@YacModuleSpec @YacModuleSpec
class NewsContentApplication : YdBaseApplication() { class NewsContentApplication : YdBaseApplication() {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
if (ProcessUtil.isMainProcess(this)) { if (ProcessUtil.isMainProcess(this)) {
registerXPage() registerXPage()
initService() initService()
NightModeUtil.setContext(this) NightModeUtil.setContext(this)
DensityUtil.init(this) DensityUtil.init(this)
}
} }
}
private fun registerXPage() { private fun registerXPage() {
XPageManager.registeredNodes( XPageManager.registeredNodes(
arrayListOf( arrayListOf(
XPageNode(FLASH, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(FLASH, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, FlashActivity::class.java) intent.setClass(context, FlashActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(NEWS_MAIN, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(NEWS_MAIN, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, MainActivity::class.java) intent.setClass(context, MainActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(LOGIN_LIFE_CIRCLE, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(LOGIN_LIFE_CIRCLE, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LoginLifeCircleActivity::class.java) intent.setClass(context, LoginLifeCircleActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(LIFE_ACCOUNT_IDENTITY, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(LIFE_ACCOUNT_IDENTITY, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LifeAccountIdentityActivity::class.java) intent.setClass(context, LifeAccountIdentityActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(LIFE_ACCOUNT_AUTH, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(LIFE_ACCOUNT_AUTH, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LifeAccountAuthActivity::class.java) intent.setClass(context, LifeAccountAuthActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(ID_CARD_TEST, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(ID_CARD_TEST, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, IDCardTestActivity::class.java) intent.setClass(context, IDCardTestActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LifeAccountEnterpriseCertificationActivity::class.java) intent.setClass(context, LifeAccountEnterpriseCertificationActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(LIFE_ACCOUNT_PERSONAL_AUTH, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(LIFE_ACCOUNT_PERSONAL_AUTH, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LifeAccountPersonalAuthActivity::class.java) intent.setClass(context, LifeAccountPersonalAuthActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(LIFE_ACCOUNT_ENTERPRISE_AUTH, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(LIFE_ACCOUNT_ENTERPRISE_AUTH, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LifeAccountEnterpriseAuthActivity::class.java) intent.setClass(context, LifeAccountEnterpriseAuthActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LifeAccountPersonalAuthCompleteActivity::class.java) intent.setClass(context, LifeAccountPersonalAuthCompleteActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LifeAccountEnterpriseAuthCompleteActivity::class.java) intent.setClass(context, LifeAccountEnterpriseAuthCompleteActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(NEWS_CONTENT, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(NEWS_CONTENT, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, NewsContentActivity::class.java) intent.setClass(context, NewsContentActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(PROTOCOL, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(PROTOCOL, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, ProtocolActivity::class.java) intent.setClass(context, ProtocolActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(SUPPORT, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(SUPPORT, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, ProductSupportActivity::class.java) intent.setClass(context, ProductSupportActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
XPageNode(GALLERY, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(GALLERY, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, GalleryActivity::class.java) intent.setClass(context, GalleryActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
// 人员管理 —— 我的员工 // 人员管理 —— 我的员工
XPageNode(PERSONAL_MY_STAFF, XPageNodePageType.NATIVE, object : XPageHandler { XPageNode(PERSONAL_MY_STAFF, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) { override fun handler(params: Map<String, Any?>?) {
val intent = Intent() val intent = Intent()
if (params != null) { if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, MyStaffActivity::class.java) intent.setClass(context, MyStaffActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent) context.startActivity(intent)
} }
}) }),
) XPageNode(PERSONAL_MANAGER_INFO, XPageNodePageType.NATIVE, object : XPageHandler {
) override fun handler(params: Map<String, Any?>?) {
} val intent = Intent()
if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
}
intent.setClass(context, ManagerInfoActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent)
}
}),
XPageNode (PERSONAL_MANAGER_CHANGE, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
}
intent.setClass(context, ManagerChangeActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent)
}
}),
XPageNode (PERSONAL_STAFF_INFO, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
}
intent.setClass(context, StaffInfoActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent)
}
}),
XPageNode (PERSONAL_STAFF_MANAGE, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
}
intent.setClass(context, StaffManageActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent)
}
}),
XPageNode (PERSONAL_ADD_STAFF, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
}
intent.setClass(context, AddStaffActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent)
}
}),
XPageNode (SYSTEM_SETTING, XPageNodePageType.NATIVE, object : XPageHandler {
override fun handler(params: Map<String, Any?>?) {
val intent = Intent()
if (params != null) {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
}
intent.setClass(context, SystemSetting::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent)
}
})
)
)
}
private fun initService() { private fun initService() {
Zap.addService(RequestService.serviceName, RequestService()) Zap.addService(RequestService.serviceName, RequestService())
Zap.addService(CommentService.serviceName, CommentService()) Zap.addService(CommentService.serviceName, CommentService())
Zap.addService(UniversalService.serviceName, UniversalService()) Zap.addService(UniversalService.serviceName, UniversalService())
Zap.addService(UserService.serviceName, UserService()) Zap.addService(UserService.serviceName, UserService())
Zap.addService(CacheService.serviceName, CacheService()) Zap.addService(CacheService.serviceName, CacheService())
Zap.addService(DeepLinkService.serviceName, DeepLinkService()) Zap.addService(DeepLinkService.serviceName, DeepLinkService())
} }
} }
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/http/PersonalRemoteDataSource.kt
View file @ e9d061bc
...@@ -18,11 +18,12 @@ object PersonalRemoteDataSource { ...@@ -18,11 +18,12 @@ object PersonalRemoteDataSource {
/** /**
* 获取账号列表 * 获取账号列表
*/ */
fun getAccountList(apiCallback: IPersonalAccountListCallback) { fun getAccountList(apiCallback: IPersonalAccountListCallback, requestParams: HashMap<String, String?>) {
val timeStamp = System.currentTimeMillis() val timeStamp = System.currentTimeMillis()
val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp) val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
ServiceFactory.getInstance().createService(PersonalService::class.java) ServiceFactory.getInstance().createService(PersonalService::class.java)
.getAccountList(publicParamsMap) .getAccountList(publicParamsMap, privateParamsMap)
.compose(TransformUtil.defaultSchedulers()) .compose(TransformUtil.defaultSchedulers())
.subscribe(object : HttpResultSubscriber<AccountListDto?>() { .subscribe(object : HttpResultSubscriber<AccountListDto?>() {
override fun onSuccess(result: HttpResult<AccountListDto?>?) { override fun onSuccess(result: HttpResult<AccountListDto?>?) {
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/http/PersonalService.kt
View file @ e9d061bc
...@@ -22,7 +22,7 @@ interface PersonalService { ...@@ -22,7 +22,7 @@ interface PersonalService {
* 获取账号列表 * 获取账号列表
*/ */
@GET(accountList) @GET(accountList)
fun getAccountList(@QueryMap commonParams: Map<String, String>): Observable<HttpResult<Any?>> fun getAccountList(@QueryMap commonParams: Map<String, String>, @QueryMap params: Map<String, String?>): Observable<HttpResult<Any?>>
/** /**
* 更换生活号管理员 * 更换生活号管理员
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/AddStaffActivity.kt 0 → 100644
View file @ e9d061bc
package com.yidian.shenghuoquan.newscontent.personnel.ui
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_ADD_STAFF
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.databinding.ActivityAddStaffBinding
/**
* 人员管理 —— 添加员工
*/
class AddStaffActivity : BaseActivity<ActivityAddStaffBinding>() {
override fun createViewBinding(): ActivityAddStaffBinding {
return ActivityAddStaffBinding.inflate(layoutInflater)
}
override fun getXPageName(): String {
return PERSONAL_ADD_STAFF
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerChangeActivity.kt 0 → 100644
View file @ e9d061bc
package com.yidian.shenghuoquan.newscontent.personnel.ui
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.databinding.ActivityManagerChangeBinding
/**
* 人员管理 —— 管理员变更
*/
class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
override fun createViewBinding(): ActivityManagerChangeBinding {
return ActivityManagerChangeBinding.inflate(layoutInflater)
}
override fun getXPageName(): String {
return PERSONAL_MANAGER_CHANGE
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerInfoActivity.kt 0 → 100644
View file @ e9d061bc
package com.yidian.shenghuoquan.newscontent.personnel.ui
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MANAGER_INFO
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.databinding.ActivityManagerInfoBinding
/**
* 人员管理 —— 管理员信息
*/
class ManagerInfoActivity: BaseActivity<ActivityManagerInfoBinding>() {
override fun createViewBinding(): ActivityManagerInfoBinding {
return ActivityManagerInfoBinding.inflate(layoutInflater)
}
override fun getXPageName(): String {
return PERSONAL_MANAGER_INFO
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/MyStaffActivity.kt
View file @ e9d061bc
package com.yidian.shenghuoquan.newscontent.personnel.ui package com.yidian.shenghuoquan.newscontent.personnel.ui
import android.os.Bundle import android.os.Bundle
import com.yidian.common.XRouterPathConstants
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MY_STAFF import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MY_STAFF
import com.yidian.common.base.BaseActivity import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.R import com.yidian.shenghuoquan.newscontent.R
...@@ -10,7 +11,6 @@ import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountAdmin ...@@ -10,7 +11,6 @@ import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountAdmin
import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountListDto import com.yidian.shenghuoquan.newscontent.personnel.bean.AccountListDto
import com.yidian.shenghuoquan.newscontent.personnel.http.IPersonalAccountListCallback import com.yidian.shenghuoquan.newscontent.personnel.http.IPersonalAccountListCallback
import com.yidian.shenghuoquan.newscontent.personnel.http.PersonalRemoteDataSource import com.yidian.shenghuoquan.newscontent.personnel.http.PersonalRemoteDataSource
import com.yidian.utils.ToastUtil
import com.yidian.xpage.XPageManager import com.yidian.xpage.XPageManager
/** /**
...@@ -18,6 +18,8 @@ import com.yidian.xpage.XPageManager ...@@ -18,6 +18,8 @@ import com.yidian.xpage.XPageManager
*/ */
class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccountListCallback { class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccountListCallback {
private var managerInfo: AccountAdmin? = null
private val myStaffAdapter: MyStaffListAdapter by lazy { MyStaffListAdapter() } private val myStaffAdapter: MyStaffListAdapter by lazy { MyStaffListAdapter() }
override fun createViewBinding(): ActivityMyStaffBinding { override fun createViewBinding(): ActivityMyStaffBinding {
...@@ -32,7 +34,13 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount ...@@ -32,7 +34,13 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
super.init(savedInstanceState) super.init(savedInstanceState)
initClick() initClick()
initView() initView()
PersonalRemoteDataSource.getAccountList(this) requestAccountList()
}
private fun requestAccountList() {
val paramsMap = HashMap<String, String?>()
paramsMap["life_account_id"] = "7470213157388289"
PersonalRemoteDataSource.getAccountList(this, paramsMap)
} }
private fun initView() { private fun initView() {
...@@ -44,19 +52,34 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount ...@@ -44,19 +52,34 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
viewBind.layoutCommonHeader.ivBack.setOnClickListener { viewBind.layoutCommonHeader.ivBack.setOnClickListener {
XPageManager.pop(null) XPageManager.pop(null)
} }
// 管理员信息
viewBind.clManager.setOnClickListener {
managerInfo?.let {
val hashMap = HashMap<String, Any?>()
hashMap["managerInfo"] = it
XPageManager.push(XRouterPathConstants.PERSONAL_MANAGER_INFO, hashMap)
}
}
// 更新管理员 // 更新管理员
viewBind.tvChange.setOnClickListener { viewBind.tvChange.setOnClickListener {
ToastUtil.showToast(this, "更换管理员") managerInfo?.let {
val hashMap = HashMap<String, String?>()
hashMap["mobile"] = it.mobile
XPageManager.push(XRouterPathConstants.PERSONAL_MANAGER_CHANGE, hashMap)
}
} }
// 点击添加 // 点击添加
viewBind.tvAddStaff.setOnClickListener { viewBind.tvAddStaff.setOnClickListener {
ToastUtil.showToast(this, "管理员工") XPageManager.push(XRouterPathConstants.PERSONAL_ADD_STAFF, null)
} }
} }
override fun getAccountListSuccess(response: AccountListDto?) { override fun getAccountListSuccess(response: AccountListDto?) {
response?.let { response?.let {
it.admin?.get(0)?.let { it1 -> initManager(it1) } it.admin?.get(0)?.let { admin ->
managerInfo = admin
initManager(admin)
}
myStaffAdapter.setList(it.users) myStaffAdapter.setList(it.users)
} }
} }
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/StaffInfoActivity.kt 0 → 100644
View file @ e9d061bc
package com.yidian.shenghuoquan.newscontent.personnel.ui
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_STAFF_INFO
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.databinding.ActivityStaffInfoBinding
/**
* 员工信息
*/
class StaffInfoActivity : BaseActivity<ActivityStaffInfoBinding>() {
override fun createViewBinding(): ActivityStaffInfoBinding {
return ActivityStaffInfoBinding.inflate(layoutInflater)
}
override fun getXPageName(): String {
return PERSONAL_STAFF_INFO
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/StaffManageActivity.kt 0 → 100644
View file @ e9d061bc
package com.yidian.shenghuoquan.newscontent.personnel.ui
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_STAFF_MANAGE
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.databinding.ActivityStaffManageBinding
/**
* 人员管理 —— 员工管理页面
*/
class StaffManageActivity : BaseActivity<ActivityStaffManageBinding>() {
override fun createViewBinding(): ActivityStaffManageBinding {
return ActivityStaffManageBinding.inflate(layoutInflater)
}
override fun getXPageName(): String {
return PERSONAL_STAFF_MANAGE
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/setting/SystemSetting.kt 0 → 100644
View file @ e9d061bc
package com.yidian.shenghuoquan.newscontent.ui.setting
import com.yidian.common.XRouterPathConstants.Companion.SYSTEM_SETTING
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.databinding.ActivitySystemSettingBinding
/**
* 系统设置页面
*/
class SystemSetting : BaseActivity<ActivitySystemSettingBinding>() {
override fun createViewBinding(): ActivitySystemSettingBinding {
return ActivitySystemSettingBinding.inflate(layoutInflater)
}
override fun getXPageName(): String {
return SYSTEM_SETTING
}
}
Components/newscontent/src/main/res/drawable/svg_baseline_add_24.xml 0 → 100644
View file @ e9d061bc
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/black"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>
Components/newscontent/src/main/res/layout/activity_add_staff.xml 0 → 100644
View file @ e9d061bc
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_manager_change.xml 0 → 100644
View file @ e9d061bc
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_manager_info.xml 0 → 100644
View file @ e9d061bc
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_my_staff.xml
View file @ e9d061bc
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
android:textSize="18sp" /> android:textSize="18sp" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_manager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
...@@ -108,7 +109,8 @@ ...@@ -108,7 +109,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginEnd="10dp" android:layout_marginEnd="30dp"
android:drawableStart="@drawable/svg_baseline_add_24"
android:text="添加" android:text="添加"
android:textColor="@color/black_333333" android:textColor="@color/black_333333"
android:textSize="16sp" /> android:textSize="16sp" />
......
Components/newscontent/src/main/res/layout/activity_staff_info.xml 0 → 100644
View file @ e9d061bc
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_staff_manage.xml 0 → 100644
View file @ e9d061bc
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_system_setting.xml 0 → 100644
View file @ e9d061bc
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment