Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
4ba0fe92
Commit
4ba0fe92
authored
Jul 26, 2021
by
shiyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户反馈迁移到BSetting
parent
0afd8e9f
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
18 additions
and
19 deletions
+18
-19
ClientType.kt
...Common/src/main/java/com/yidian/bcommon/sdk/ClientType.kt
+4
-0
JudgeClientUtils.kt
.../src/main/java/com/yidian/bcommon/sdk/JudgeClientUtils.kt
+4
-0
AndroidManifest.xml
Components/BManagerCenter/src/main/AndroidManifest.xml
+0
-1
BManagerCenterApplication.kt
...nghuoquan/bmanagercenter/app/BManagerCenterApplication.kt
+1
-13
AndroidManifest.xml
Components/BSetting/src/main/AndroidManifest.xml
+1
-0
ClassMapUtil.kt
...java/com/yidian/shenghuoquan/bsetting/app/ClassMapUtil.kt
+2
-0
FeedbackActivity.kt
...dian/shenghuoquan/bsetting/ui/setting/FeedbackActivity.kt
+3
-3
FeedbackViewModel.kt
...ian/shenghuoquan/bsetting/ui/setting/FeedbackViewModel.kt
+1
-1
AndroidManifest.xml
Components/BSetting/src/main/manifest/AndroidManifest.xml
+1
-0
activity_feedback.xml
...onents/BSetting/src/main/res/layout/activity_feedback.xml
+1
-1
No files found.
CommonLib/BCommon/src/main/java/com/yidian/bcommon/sdk/ClientType.kt
0 → 100644
View file @
4ba0fe92
package
com.yidian.bcommon.sdk
enum
class
ClientType
{
}
CommonLib/BCommon/src/main/java/com/yidian/bcommon/sdk/JudgeClientUtils.kt
0 → 100644
View file @
4ba0fe92
package
com.yidian.bcommon.sdk
object
JudgeClientUtils
{
}
Components/BManagerCenter/src/main/AndroidManifest.xml
View file @
4ba0fe92
...
@@ -85,7 +85,6 @@
...
@@ -85,7 +85,6 @@
<activity
<activity
android:name=
"com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantAuthManagementActivity"
android:name=
"com.yidian.shenghuoquan.bmanagercenter.ui.center.MerchantAuthManagementActivity"
android:theme=
"@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
/>
android:theme=
"@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
/>
<activity
android:name=
"com.yidian.shenghuoquan.bmanagercenter.ui.setting.FeedbackActivity"
/>
</application>
</application>
</manifest>
</manifest>
\ No newline at end of file
Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/app/
NewsContent
Application.kt
→
Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/app/
BManagerCenter
Application.kt
View file @
4ba0fe92
...
@@ -32,7 +32,6 @@ import com.yidian.shenghuoquan.bmanagercenter.service.LifeNumberListService
...
@@ -32,7 +32,6 @@ import com.yidian.shenghuoquan.bmanagercenter.service.LifeNumberListService
import
com.yidian.shenghuoquan.bmanagercenter.service.SelectStoreService
import
com.yidian.shenghuoquan.bmanagercenter.service.SelectStoreService
import
com.yidian.shenghuoquan.bmanagercenter.ui.auth.*
import
com.yidian.shenghuoquan.bmanagercenter.ui.auth.*
import
com.yidian.shenghuoquan.bmanagercenter.ui.center.*
import
com.yidian.shenghuoquan.bmanagercenter.ui.center.*
import
com.yidian.shenghuoquan.bmanagercenter.ui.setting.FeedbackActivity
import
com.yidian.shenghuoquan.bmanagercenter.ui.store.ChooseStoreActivity
import
com.yidian.shenghuoquan.bmanagercenter.ui.store.ChooseStoreActivity
import
com.yidian.shenghuoquan.bmanagercenter.ui.store.StoreManagementActivity
import
com.yidian.shenghuoquan.bmanagercenter.ui.store.StoreManagementActivity
import
com.yidian.shenghuoquan.bmanagercenter.wallet.ui.*
import
com.yidian.shenghuoquan.bmanagercenter.wallet.ui.*
...
@@ -45,7 +44,7 @@ import com.yidian.yac.core.core.YacModuleSpec
...
@@ -45,7 +44,7 @@ import com.yidian.yac.core.core.YacModuleSpec
import
com.yidian.yac.core.zap.Zap
import
com.yidian.yac.core.zap.Zap
@YacModuleSpec
@YacModuleSpec
class
NewsContent
Application
:
YdBaseApplication
()
{
class
BManagerCenter
Application
:
YdBaseApplication
()
{
override
fun
onCreate
()
{
override
fun
onCreate
()
{
super
.
onCreate
()
super
.
onCreate
()
if
(
ProcessUtil
.
isMainProcess
(
this
))
{
if
(
ProcessUtil
.
isMainProcess
(
this
))
{
...
@@ -368,17 +367,6 @@ class NewsContentApplication : YdBaseApplication() {
...
@@ -368,17 +367,6 @@ class NewsContentApplication : YdBaseApplication() {
context
.
startActivity
(
intent
)
context
.
startActivity
(
intent
)
}
}
}),
}),
XPageNode
(
XRouterPathConstants
.
Companion
.
FEEDBACK
,
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
,
FeedbackActivity
::
class
.
java
)
intent
.
flags
=
Intent
.
FLAG_ACTIVITY_NEW_TASK
context
.
startActivity
(
intent
)
}
}),
)
)
)
)
}
}
...
...
Components/BSetting/src/main/AndroidManifest.xml
View file @
4ba0fe92
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
<application>
<application>
<activity
android:name=
".ui.login.LoginLifeCircleActivity"
/>
<activity
android:name=
".ui.login.LoginLifeCircleActivity"
/>
<activity
android:name=
".ui.setting.SystemSettingActivity"
/>
<activity
android:name=
".ui.setting.SystemSettingActivity"
/>
<activity
android:name=
".ui.setting.FeedbackActivity"
/>
</application>
</application>
</manifest>
</manifest>
\ No newline at end of file
Components/BSetting/src/main/java/com/yidian/shenghuoquan/bsetting/app/ClassMapUtil.kt
View file @
4ba0fe92
...
@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.bsetting.app
...
@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.bsetting.app
import
com.yidian.bcommon.constant.XRouterPathConstants
import
com.yidian.bcommon.constant.XRouterPathConstants
import
com.yidian.shenghuoquan.bsetting.ui.login.LoginLifeCircleActivity
import
com.yidian.shenghuoquan.bsetting.ui.login.LoginLifeCircleActivity
import
com.yidian.shenghuoquan.bsetting.ui.setting.FeedbackActivity
import
com.yidian.shenghuoquan.bsetting.ui.setting.SystemSettingActivity
import
com.yidian.shenghuoquan.bsetting.ui.setting.SystemSettingActivity
...
@@ -13,6 +14,7 @@ object ClassMapUtil {
...
@@ -13,6 +14,7 @@ object ClassMapUtil {
val
xPageNodeMap
=
mapOf
(
val
xPageNodeMap
=
mapOf
(
XRouterPathConstants
.
Companion
.
LOGIN_LIFE_CIRCLE
to
LoginLifeCircleActivity
::
class
.
java
,
// 启动页
XRouterPathConstants
.
Companion
.
LOGIN_LIFE_CIRCLE
to
LoginLifeCircleActivity
::
class
.
java
,
// 启动页
XRouterPathConstants
.
Companion
.
SYSTEM_SETTING
to
SystemSettingActivity
::
class
.
java
,
// 商品管理
XRouterPathConstants
.
Companion
.
SYSTEM_SETTING
to
SystemSettingActivity
::
class
.
java
,
// 商品管理
XRouterPathConstants
.
Companion
.
FEEDBACK
to
FeedbackActivity
::
class
.
java
,
// 用户反馈
)
)
}
}
Components/B
ManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter
/ui/setting/FeedbackActivity.kt
→
Components/B
Setting/src/main/java/com/yidian/shenghuoquan/bsetting
/ui/setting/FeedbackActivity.kt
View file @
4ba0fe92
package
com.yidian.shenghuoquan.b
managercenter
.ui.setting
package
com.yidian.shenghuoquan.b
setting
.ui.setting
import
android.text.Editable
import
android.text.Editable
import
android.text.InputFilter
import
android.text.InputFilter
...
@@ -6,8 +6,8 @@ import android.text.TextWatcher
...
@@ -6,8 +6,8 @@ import android.text.TextWatcher
import
androidx.activity.viewModels
import
androidx.activity.viewModels
import
com.yidian.bcommon.mvvm.BaseMvvmActivity
import
com.yidian.bcommon.mvvm.BaseMvvmActivity
import
com.yidian.bcommon.utils.ToastUtils
import
com.yidian.bcommon.utils.ToastUtils
import
com.yidian.shenghuoquan.b
managercenter
.R
import
com.yidian.shenghuoquan.b
setting
.R
import
com.yidian.shenghuoquan.b
managercenter
.databinding.ActivityFeedbackBinding
import
com.yidian.shenghuoquan.b
setting
.databinding.ActivityFeedbackBinding
/**
/**
* author: yinjiacheng
* author: yinjiacheng
...
...
Components/B
ManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter
/ui/setting/FeedbackViewModel.kt
→
Components/B
Setting/src/main/java/com/yidian/shenghuoquan/bsetting
/ui/setting/FeedbackViewModel.kt
View file @
4ba0fe92
package
com.yidian.shenghuoquan.b
managercenter
.ui.setting
package
com.yidian.shenghuoquan.b
setting
.ui.setting
import
androidx.lifecycle.MutableLiveData
import
androidx.lifecycle.MutableLiveData
import
com.orhanobut.hawk.Hawk
import
com.orhanobut.hawk.Hawk
...
...
Components/BSetting/src/main/manifest/AndroidManifest.xml
View file @
4ba0fe92
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
<application>
<application>
<activity
android:name=
".ui.login.LoginLifeCircleActivity"
/>
<activity
android:name=
".ui.login.LoginLifeCircleActivity"
/>
<activity
android:name=
".ui.setting.SystemSettingActivity"
/>
<activity
android:name=
".ui.setting.SystemSettingActivity"
/>
<activity
android:name=
".ui.setting.FeedbackActivity"
/>
</application>
</application>
</manifest>
</manifest>
Components/B
ManagerCenter
/src/main/res/layout/activity_feedback.xml
→
Components/B
Setting
/src/main/res/layout/activity_feedback.xml
View file @
4ba0fe92
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<variable
<variable
name=
"vm"
name=
"vm"
type=
"com.yidian.shenghuoquan.b
managercenter
.ui.setting.FeedbackViewModel"
/>
type=
"com.yidian.shenghuoquan.b
setting
.ui.setting.FeedbackViewModel"
/>
</data>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
...
...
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