Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
X
xxsq
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
xxsq
Commits
d7dde877
Commit
d7dde877
authored
May 21, 2022
by
王雪伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[提交人]:王雪伟
[提交简述] :小象省钱 [实现方案] :
parent
9b16c1f1
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
181 additions
and
33 deletions
+181
-33
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+40
-3
styles.xml
app/src/main/res/values/styles.xml
+6
-1
NetConfig.java
cms/src/main/java/com/zxhl/cms/common/NetConfig.java
+4
-4
ApiClient.kt
cms/src/main/java/com/zxhl/cms/net/ApiClient.kt
+0
-1
IHomeApi.kt
cms/src/main/java/com/zxhl/cms/net/api/IHomeApi.kt
+8
-0
IShopApi.kt
cms/src/main/java/com/zxhl/cms/net/api/IShopApi.kt
+0
-20
TabEntity.kt
cms/src/main/java/com/zxhl/cms/net/model/box/TabEntity.kt
+2
-2
build.gradle
moduleMain/build.gradle
+2
-1
HomeFragment.kt
...rc/main/java/com/zxbw/modulemain/fragment/HomeFragment.kt
+44
-1
RecommendFragment.kt
...in/java/com/zxbw/modulemain/fragment/RecommendFragment.kt
+38
-0
fragment_layout_home.xml
moduleMain/src/main/res/layout/fragment_layout_home.xml
+21
-0
fragment_layout_recommend.xml
moduleMain/src/main/res/layout/fragment_layout_recommend.xml
+16
-0
No files found.
app/src/main/AndroidManifest.xml
View file @
d7dde877
...
@@ -11,15 +11,15 @@
...
@@ -11,15 +11,15 @@
<!-- 允许程序向外部存储设备写数据 -->
<!-- 允许程序向外部存储设备写数据 -->
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<!-- 允许程序写音频数据 -->
<!-- 允许程序写音频数据 -->
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" />-->
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" />-->
<!-- 允许程序使用PowerManager WakeLocks以防止处理器休眠或者屏幕锁屏 -->
<!-- 允许程序使用PowerManager WakeLocks以防止处理器休眠或者屏幕锁屏 -->
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<!-- 允许程序获取Wifi网络状态信息 -->
<!-- 允许程序获取Wifi网络状态信息 -->
<uses-permission
android:name=
"android.permission.ACCESS_WIFI_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_WIFI_STATE"
/>
<!-- 允许程序使用设备的camera -->
<!-- 允许程序使用设备的camera -->
<!-- <uses-permission android:name="android.permission.CAMERA" />-->
<!-- <uses-permission android:name="android.permission.CAMERA" />-->
<!-- 允许程序使用闪光灯 -->
<!-- 允许程序使用闪光灯 -->
<!-- <uses-permission android:name="android.permission.FLASHLIGHT" />-->
<!-- <uses-permission android:name="android.permission.FLASHLIGHT" />-->
<!-- 允许程序获得设备信息 -->
<!-- 允许程序获得设备信息 -->
<uses-permission
android:name=
"android.permission.READ_PHONE_STATE"
/>
<uses-permission
android:name=
"android.permission.READ_PHONE_STATE"
/>
<uses-permission
android:name=
"android.permission.VIBRATE"
/>
<uses-permission
android:name=
"android.permission.VIBRATE"
/>
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
android:icon=
"@mipmap/ic_launcher"
android:icon=
"@mipmap/ic_launcher"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:largeHeap=
"true"
android:largeHeap=
"true"
android:networkSecurityConfig=
"@xml/network_security_config"
android:requestLegacyExternalStorage=
"true"
android:requestLegacyExternalStorage=
"true"
android:supportsRtl=
"true"
android:supportsRtl=
"true"
android:theme=
"@style/AppTheme"
android:theme=
"@style/AppTheme"
...
@@ -61,6 +62,42 @@
...
@@ -61,6 +62,42 @@
</intent-filter>
</intent-filter>
</activity>
</activity>
<provider
android:name=
"androidx.core.content.FileProvider"
android:authorities=
"${applicationId}.fileprovider"
android:exported=
"false"
android:grantUriPermissions=
"true"
>
<meta-data
android:name=
"android.support.FILE_PROVIDER_PATHS"
android:resource=
"@xml/file_paths"
/>
</provider>
<provider
android:name=
"com.bytedance.sdk.openadsdk.TTFileProvider"
android:authorities=
"${applicationId}.TTFileProvider"
android:exported=
"false"
android:grantUriPermissions=
"true"
>
<meta-data
android:name=
"android.support.FILE_PROVIDER_PATHS"
android:resource=
"@xml/file_paths"
/>
</provider>
<provider
android:name=
"com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
android:authorities=
"${applicationId}.TTMultiProvider"
android:exported=
"false"
/>
<!-- <uses-library-->
<!-- android:name="org.apache.http.legacy"-->
<!-- android:required="false" />-->
<!-- <meta-data-->
<!-- android:name="design_width_in_dp"-->
<!-- android:value="420"/>-->
<!-- <meta-data-->
<!-- android:name="design_height_in_dp"-->
<!-- android:value="740"/>-->
</application>
</application>
</manifest>
</manifest>
\ No newline at end of file
app/src/main/res/values/styles.xml
View file @
d7dde877
<resources>
<resources>
<!-- Base application theme. -->
<!-- Base application theme. -->
<style
name=
"AppTheme"
parent=
"Theme.AppCompat.Light.DarkActionBar"
>
<style
name=
"AppTheme"
parent=
"Theme.AppCompat.Light.DarkActionBar"
>
<!-- Customize your theme here. -->
<!-- Customize your theme here. -->
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"android:textColorPrimary"
>
@color/color_000000
</item>
<item
name=
"windowNoTitle"
>
true
</item>
<item
name=
"colorPrimary"
>
@color/colorPrimary
</item>
<item
name=
"colorPrimary"
>
@color/colorPrimary
</item>
<item
name=
"colorPrimaryDark"
>
@color/colorPrimaryDark
</item>
<item
name=
"colorPrimaryDark"
>
@color/colorPrimaryDark
</item>
<item
name=
"colorAccent"
>
@color/colorAccent
</item>
<item
name=
"colorAccent"
>
@color/colorPrimary
</item>
<item
name=
"android:windowBackground"
>
@color/colorPrimary
</item>
</style>
</style>
</resources>
</resources>
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/common/NetConfig.java
View file @
d7dde877
...
@@ -263,10 +263,10 @@ public class NetConfig {
...
@@ -263,10 +263,10 @@ public class NetConfig {
}
}
//
商场
//
权益卡
public
static
class
Shop
{
public
static
class
QY
{
public
static
final
String
SHOP_GOODS_LIST
=
"app/v2/game/box/goodsList"
;
//商品
列表
public
static
final
String
QY_JGQ_CARD_LIST
=
"app/v1/game/xiaoxiang/equitCardList"
;
//金刚区权益
列表
public
static
final
String
QY_JGQ_CARD_DETAIL
=
"app/v1/game/xiaoxiang/equitCardList/detail"
;
//获取权益详情
}
}
...
...
cms/src/main/java/com/zxhl/cms/net/ApiClient.kt
View file @
d7dde877
...
@@ -63,5 +63,4 @@ object ApiClient {
...
@@ -63,5 +63,4 @@ object ApiClient {
val
cfgInfoAPi
by
lazy
{
retrofit
.
create
(
ICfgInfoApi
::
class
.
java
)
}
val
cfgInfoAPi
by
lazy
{
retrofit
.
create
(
ICfgInfoApi
::
class
.
java
)
}
val
adApi
by
lazy
{
retrofit
.
create
(
IAdApi
::
class
.
java
)
}
val
adApi
by
lazy
{
retrofit
.
create
(
IAdApi
::
class
.
java
)
}
val
homeApi
by
lazy
{
retrofit
.
create
(
IHomeApi
::
class
.
java
)
}
val
homeApi
by
lazy
{
retrofit
.
create
(
IHomeApi
::
class
.
java
)
}
val
shopApi
by
lazy
{
retrofit
.
create
(
IShopApi
::
class
.
java
)
}
}
}
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/net/api/IHomeApi.kt
View file @
d7dde877
...
@@ -326,4 +326,12 @@ interface IHomeApi {
...
@@ -326,4 +326,12 @@ interface IHomeApi {
@Query
(
"userId"
)
userId
:
String
@Query
(
"userId"
)
userId
:
String
):
Observable
<
Response
<
List
<
GoodList
>>>
):
Observable
<
Response
<
List
<
GoodList
>>>
@GET
(
NetConfig
.
QY
.
QY_JGQ_CARD_LIST
)
fun
getQyJgqCardList
():
Observable
<
Response
<
List
<
Any
>>>
@GET
(
NetConfig
.
QY
.
QY_JGQ_CARD_DETAIL
)
fun
getQyJgqCardDetail
():
Observable
<
Response
<
Any
>>
}
}
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/net/api/IShopApi.kt
deleted
100644 → 0
View file @
9b16c1f1
package
com.zxhl.cms.net.api
import
com.zxhl.cms.ad.upload.model.Response
import
com.zxhl.cms.common.NetConfig
import
com.zxhl.cms.net.model.shop.ShopEntity
import
io.reactivex.Observable
import
retrofit2.http.*
interface
IShopApi
{
@GET
(
NetConfig
.
Shop
.
SHOP_GOODS_LIST
)
fun
getGoodsList
(
@Query
(
"page"
)
page
:
Int
,
@Query
(
"size"
)
size
:
Int
,
@Query
(
"category"
)
category
:
String
):
Observable
<
Response
<
ShopEntity
>>
}
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/net/model/box/TabEntity.kt
View file @
d7dde877
package
com.zxhl.cms.net.model.box
package
com.zxhl.cms.net.model.box
class
TabEntity
{
class
TabEntity
{
var
name
:
String
?
=
""
var
name
:
String
?
=
"
推荐
"
var
id
:
String
?
=
""
var
id
:
String
?
=
"
1
"
}
}
\ No newline at end of file
moduleMain/build.gradle
View file @
d7dde877
...
@@ -40,7 +40,8 @@ dependencies {
...
@@ -40,7 +40,8 @@ dependencies {
api
project
(
':cms'
)
api
project
(
':cms'
)
implementation
'com.airbnb.android:lottie:3.1.0'
implementation
'com.airbnb.android:lottie:3.1.0'
implementation
'androidx.viewpager2:viewpager2:1.0.0'
implementation
'androidx.viewpager2:viewpager2:1.0.0'
implementation
'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
//tab 指示器
implementation
'io.github.h07000223:flycoTabLayout:3.0.0'
implementation
'com.contrarywind:Android-PickerView:4.1.9'
implementation
'com.contrarywind:Android-PickerView:4.1.9'
implementation
'androidx.appcompat:appcompat:1.2.0'
implementation
'androidx.appcompat:appcompat:1.2.0'
implementation
'androidx.constraintlayout:constraintlayout:2.0.4'
implementation
'androidx.constraintlayout:constraintlayout:2.0.4'
...
...
moduleMain/src/main/java/com/zxbw/modulemain/fragment/HomeFragment.kt
View file @
d7dde877
package
com.zxbw.modulemain.fragment
package
com.zxbw.modulemain.fragment
import
android.util.Log
import
android.view.View
import
android.view.View
import
com.zxbw.modulemain.R
import
com.zxbw.modulemain.R
import
com.zxhl.cms.common.FragmentAdapter
import
com.zxhl.cms.common.base.BaseFragment
import
com.zxhl.cms.common.base.BaseFragment
import
com.zxhl.cms.net.ApiClient
import
com.zxhl.cms.net.RxSchedulers
import
com.zxhl.cms.net.callback.BaseObserver
import
com.zxhl.cms.net.model.box.TabEntity
import
kotlinx.android.synthetic.main.fragment_layout_home.*
/**
/**
...
@@ -24,7 +31,7 @@ class HomeFragment : BaseFragment() {
...
@@ -24,7 +31,7 @@ class HomeFragment : BaseFragment() {
}
}
override
fun
init
(
view
:
View
?)
{
override
fun
init
(
view
:
View
?)
{
getTabList
()
}
}
companion
object
{
companion
object
{
...
@@ -32,4 +39,40 @@ class HomeFragment : BaseFragment() {
...
@@ -32,4 +39,40 @@ class HomeFragment : BaseFragment() {
}
}
private
fun
getTabList
()
{
ApiClient
.
homeApi
.
getBoxTab
().
compose
(
RxSchedulers
.
observableIO2Main
())
.
subscribe
(
object
:
BaseObserver
<
List
<
TabEntity
>>()
{
override
fun
onSuccess
(
result
:
List
<
TabEntity
>?)
{
if
(
result
!=
null
)
{
initViewPager
(
result
)
}
}
override
fun
onFailure
(
e
:
Throwable
?,
code
:
String
?,
errorMsg
:
String
?)
{
Log
.
e
(
"wxw"
,
"ERROR"
+
code
+
errorMsg
)
val
createTitles
=
ArrayList
<
TabEntity
>().
apply
{
add
(
TabEntity
())
add
(
TabEntity
())
add
(
TabEntity
())
add
(
TabEntity
())
add
(
TabEntity
())
}
initViewPager
(
createTitles
)
}
})
}
private
fun
initViewPager
(
result
:
List
<
TabEntity
>)
{
Log
.
d
(
"wxw"
,
"result"
+
result
.
size
)
val
adapter
=
FragmentAdapter
(
childFragmentManager
)
for
(
i
in
0
until
(
result
?.
size
?:
0
))
{
val
title
=
result
[
i
].
name
?:
""
adapter
.
addFrag
(
RecommendFragment
.
newInstance
(
title
),
title
)
}
viewPager
?.
adapter
=
adapter
id_fragment_home_tab
?.
setViewPager
(
viewPager
)
id_fragment_home_tab
?.
overScrollMode
=
View
.
OVER_SCROLL_NEVER
}
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/fragment/RecommendFragment.kt
0 → 100644
View file @
d7dde877
package
com.zxbw.modulemain.fragment
import
android.view.View
import
com.zxbw.modulemain.R
import
com.zxhl.cms.common.base.BaseFragment
/**
* @author (wangXuewei)
* @datetime 2022-05-20 19:01 GMT+8
* @detail : 首页推荐
*/
class
RecommendFragment
:
BaseFragment
{
private
val
title
:
String
override
fun
layoutID
():
Int
{
return
R
.
layout
.
fragment_layout_recommend
}
override
fun
init
(
view
:
View
?)
{
}
companion
object
{
fun
newInstance
(
string
:
String
):
RecommendFragment
{
return
RecommendFragment
(
string
)
}
}
constructor
(
title
:
String
)
:
super
()
{
this
.
title
=
title
}
constructor
()
:
super
()
{
this
.
title
=
""
}
}
\ No newline at end of file
moduleMain/src/main/res/layout/fragment_layout_home.xml
View file @
d7dde877
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tl=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#F6F6F6"
>
android:background=
"#F6F6F6"
>
<com.flyco.tablayout.SlidingTabLayout
android:id=
"@+id/id_fragment_home_tab"
android:layout_width=
"match_parent"
android:layout_height=
"48dp"
android:paddingLeft=
"5dp"
android:background=
""
android:paddingRight=
"5dp"
tl:tl_textSelectColor=
"@color/white"
tl:tl_indicator_color=
"@color/white"
tl:tl_indicator_corner_radius=
"5dp"
tl:tl_indicator_margin_left=
"2dp"
tl:tl_indicator_margin_right=
"2dp"
tl:tl_indicator_style=
"NORMAL"
/>
<androidx.viewpager.widget.ViewPager
android:id=
"@+id/viewPager"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_below=
"@+id/id_fragment_home_tab"
/>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
moduleMain/src/main/res/layout/fragment_layout_recommend.xml
0 → 100644
View file @
d7dde877
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tl=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#F6F6F6"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerInParent=
"true"
android:text=
"ssssssssssssss"
/>
</RelativeLayout>
\ No newline at end of file
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