Skip to content

A
android_vediosocial
Commit 94763e68 authored by jyx's avatar jyx
Browse files
Options

B包默认登录同城页

parent 49379a53
Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 149 deletions
video/app/src/main/assets/SDK_Setting_5433630.json deleted 100644 → 0
View file @ 49379a53
{
"init": {
"site_id": "5433630",
"app_id": "540576",
"partner": "pangle_540576",
"secure_key": "49613fa7f77cbbc7dcde36453f40ee0c",
"secure_key_d": "1065a63a3247d665a83e77c26325b203"
},
"feed": {
"news_list_ad_code_id": "",
"news_first_ad_code_id": "",
"news_second_ad_code_id": "",
"video_first_ad_code_id": "",
"video_second_ad_code_id": "",
"related_ad_code_id": "",
"news_draw_ad_code_id": "953638208",
"news_draw_native_ad_code_id": "953638205",
"news_outer_list_ad_code_id": "",
"news_outer_first_ad_code_id": "",
"news_outer_second_ad_code_id": "",
"outer_video_second_ad_code_id": "",
"outer_related_ad_code_id": "",
"news_outer_draw_ad_code_id": "953638207",
"news_outer_draw_native_ad_code_id": "953638217",
"news_interstitial_code_id": ""
},
"small_video": {
"draw_ad_code_id": "953638223",
"draw_native_ad_code_id": "953638204",
"grid_ad_code_id": "953638218",
"grid_draw_ad_code_id": "953638214",
"grid_draw_native_ad_code_id": "953638202",
"video_card_ad_code_id": "953638210",
"video_card_draw_ad_code_id": "953638209",
"video_card_draw_native_ad_code_id": "953638201",
"interstitial_ad_code_id": "",
"interstitial_note_ad_code_id": "953638219",
"staggered_grid_ad_code_id": "953638221",
"staggered_grid_draw_ad_code_id": "953638223",
"staggered_grid_draw_native_ad_code_id": "953638204",
"draw_interstitial_ad_code_id": "953638211",
"draw_fullscreen_interstitial_ad_code_id": "953638220",
"draw_banner_code_id": "953638213",
"drama_rewarded_ad_code_id": "953638215",
"drama_rewarded_ad_code_id_02": "953638206",
"drama_draw_ad_code_id": "953638216",
"staggered_grid_ad_code_id_02": "961667068"
},
"novel": {
"status": 0,
"pre_ad_code_id": "",
"mid_ad_code_id": "",
"exciting_ad_code_id": "",
"interstitial_code_id": "",
"banner_ad_code_id": "",
"end_ad_code_id": ""
},
"live": null,
"license_config": null
}
\ No newline at end of file
video/app/src/main/assets/SDK_Setting_5555658.json 0 → 100644
View file @ 94763e68
{
"init": {
"site_id": "5555658",
"app_id": "643506",
"partner": "pangle_643506",
"secure_key": "43d80ab7aac93a1651a9b1e0dad3679b",
"secure_key_d": "dd95c08de464fbadc2d34ba53947153f"
},
"feed": {
"news_list_ad_code_id": "",
"news_first_ad_code_id": "",
"news_second_ad_code_id": "",
"video_first_ad_code_id": "",
"video_second_ad_code_id": "",
"related_ad_code_id": "",
"news_draw_ad_code_id": "963633121",
"news_draw_native_ad_code_id": "963633124",
"news_outer_list_ad_code_id": "",
"news_outer_first_ad_code_id": "",
"news_outer_second_ad_code_id": "",
"outer_video_second_ad_code_id": "",
"outer_related_ad_code_id": "",
"news_outer_draw_ad_code_id": "963633135",
"news_outer_draw_native_ad_code_id": "963633132",
"news_interstitial_code_id": ""
},
"small_video": {
"draw_ad_code_id": "963633122",
"draw_native_ad_code_id": "963633130",
"grid_ad_code_id": "963633116",
"grid_draw_ad_code_id": "963633118",
"grid_draw_native_ad_code_id": "963633123",
"video_card_ad_code_id": "963633127",
"video_card_draw_ad_code_id": "963633117",
"video_card_draw_native_ad_code_id": "963633131",
"interstitial_ad_code_id": "",
"interstitial_note_ad_code_id": "963633120",
"staggered_grid_ad_code_id": "963633128",
"staggered_grid_draw_ad_code_id": "963633122",
"staggered_grid_draw_native_ad_code_id": "963633130",
"draw_interstitial_ad_code_id": "963633134",
"draw_fullscreen_interstitial_ad_code_id": "963633133",
"draw_banner_code_id": "963633126",
"drama_rewarded_ad_code_id": "963633119",
"drama_rewarded_ad_code_id_02": "963633136",
"drama_draw_ad_code_id": "963633125",
"staggered_grid_ad_code_id_02": "963633129"
},
"novel": {
"status": 0,
"pre_ad_code_id": "",
"mid_ad_code_id": "",
"exciting_ad_code_id": "",
"interstitial_code_id": "",
"banner_ad_code_id": "",
"end_ad_code_id": ""
},
"live": null,
"license_config": [
{
"PackageName": "com.duben.loveplayletd",
"BundleId": "com.duben.loveplayletd",
"StartTime": "20250124T035926Z",
"ExpireTime": "20270124T035926Z",
"CreatedTime": "20250124T035925Z",
"Signature": "sm8FRucvvqb3EcyMXzdybCqtYnzK141JG9ZuFFu52MbvSp14K88tKU5d6JYNmPt8/bSg/72BTnDUP64nRhzGw57W7YS7GHptwYHIn6bqpo3JtDu4p60JuogYInldy7kMpjvIzLMOZD03qKUc/TSkMUyK+9MV9SqE1JGg2+eeh0cd/3kLtrOJ1VvZFNzTPshPggNmPr8VA849CVHnb36e4KGceQ0wYZFcdQ8fxqWnqVUVZumwR6wRSwKhPSryJfVVLslovamYsOpoTByaEy1KXXqE+7W0/3rrU1WOoSlf/vGPRmVfbnqNfJ8Y2mC02uOwjmJ45abstPa8lzrimU0Vkw==",
"Content": "eyJJZCI6IjE4Nzc0MjIxMCIsICJWZXJzaW9uIjoyLCAiQ2hhbm5lbCI6ImFkX2NzaiIsICJUeXBlIjoyLCAiUGFja2FnZU5hbWUiOiJjb20uZHViZW4ubG92ZXBsYXlsZXRkIiwgIkJ1bmRsZUlkIjoiY29tLmR1YmVuLmxvdmVwbGF5bGV0ZCIsICJNb2R1bGVzIjpbeyJOYW1lIjoidm9kX3BsYXkiLCAiRWRpdGlvbiI6InByZW1pdW1fZWRpdGlvbiIsICJTdGFydFRpbWUiOjE3Mzc2OTExNjU5MjgsICJFeHBpcmVUaW1lIjoxODAwNzYzMTY1OTI4LCAiRXhwaXJlQnVmZmVyIjoxNTU1MjAwMDAwMH1dLCAiRmlsZVZlcnNpb24iOiIxNzM3NjkxMTY1OTQ0OTEwNzg0In0=",
"MainURL": "https://vod-license-m.volccdn.com/vod-license/l-187742210-ch-ad_csj-a-643506.lic?lk3s=0d9f7a7d\u0026x-expires=4891291165\u0026x-signature=luVO5NUXwwQNqB7gZ6UBRE68qm4%3D",
"BackupURL": "https://vod-license-b.volccdn.com/vod-license/l-187742210-ch-ad_csj-a-643506.lic?lk3s=0d9f7a7d\u0026x-expires=4891291165\u0026x-signature=lYFC4hfZHnhYz41cnVF4QChjy8o%3D",
"Id": "187742210"
}
]
}
\ No newline at end of file
video/app/src/main/assets/loading.json 0 → 100644
View file @ 94763e68
{"v":"5.8.1","fr":30,"ip":0,"op":46,"w":500,"h":500,"nm":"heart","ddd":0,"assets":[{"id":"comp_0","nm":"Pre-comp 1","fr":30,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"heart 3","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[250,250,0],"to":[0,-8.333,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[250,200,0],"to":[0,0,0],"ti":[0,-8.333,0]},{"t":30,"s":[250,250,0]}],"ix":2,"l":2},"a":{"a":0,"k":[7,6,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"t":15,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.016,0.055],[0.75,-0.75],[-1.606,-1.606],[0,0],[0,0],[-0.192,0.196],[0,0],[0,0],[1.504,1.504],[1.602,-1.606],[0,0],[0,0]],"o":[[-1.016,-0.055],[-1.5,1.504],[0,0],[0,0],[0.196,0.196],[0,0],[0,0],[1.606,-1.606],[-1.5,-1.5],[0,0],[0,0],[-0.801,-0.805]],"v":[[-3.004,-5.996],[-5.789,-4.961],[-5.527,0.676],[-5.016,1.188],[-0.352,5.855],[0.352,5.855],[5.016,1.188],[5.527,0.676],[5.785,-4.961],[0.164,-4.695],[0,-4.531],[-0.164,-4.695]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.952941176471,0.545098039216,0.698039215686,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":20,"s":[9]},{"t":30,"s":[0]}],"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[7,6],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[500,500],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":151,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"heart 2","tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[250,250,0],"to":[0,-8.333,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[250,200,0],"to":[0,0,0],"ti":[0,-8.333,0]},{"t":30,"s":[250,250,0]}],"ix":2,"l":2},"a":{"a":0,"k":[7,6,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.5,0.5,0.5],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"t":15,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.016,0.055],[0.75,-0.75],[-1.606,-1.606],[0,0],[0,0],[-0.192,0.196],[0,0],[0,0],[1.504,1.504],[1.602,-1.606],[0,0],[0,0]],"o":[[-1.016,-0.055],[-1.5,1.504],[0,0],[0,0],[0.196,0.196],[0,0],[0,0],[1.606,-1.606],[-1.5,-1.5],[0,0],[0,0],[-0.801,-0.805]],"v":[[-3.004,-5.996],[-5.789,-4.961],[-5.527,0.676],[-5.016,1.188],[-0.352,5.855],[0.352,5.855],[5.016,1.188],[5.527,0.676],[5.785,-4.961],[0.164,-4.695],[0,-4.531],[-0.164,-4.695]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.909803921569,0.070588235294,0.141176470588,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[7,6],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[500,500],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":151,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"heart","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[250,250,0],"to":[0,-8.333,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[250,200,0],"to":[0,0,0],"ti":[0,-8.333,0]},{"t":30,"s":[250,250,0]}],"ix":2,"l":2},"a":{"a":0,"k":[7,6,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.5,0.5,0.5],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"t":15,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.016,0.055],[0.75,-0.75],[-1.606,-1.606],[0,0],[0,0],[-0.192,0.196],[0,0],[0,0],[1.504,1.504],[1.602,-1.606],[0,0],[0,0]],"o":[[-1.016,-0.055],[-1.5,1.504],[0,0],[0,0],[0.196,0.196],[0,0],[0,0],[1.606,-1.606],[-1.5,-1.5],[0,0],[0,0],[-0.801,-0.805]],"v":[[-3.004,-5.996],[-5.789,-4.961],[-5.527,0.676],[-5.016,1.188],[-0.352,5.855],[0.352,5.855],[5.016,1.188],[5.527,0.676],[5.785,-4.961],[0.164,-4.695],[0,-4.531],[-0.164,-4.695]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.909803921569,0.070588235294,0.141176470588,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":20,"s":[2]},{"t":30,"s":[0]}],"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[7,6],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[500,500],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":151,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Pre-comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[350,275,0],"ix":2,"l":2},"a":{"a":0,"k":[250,250,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":500,"h":500,"ip":4,"op":155,"st":4,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Pre-comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,275,0],"ix":2,"l":2},"a":{"a":0,"k":[250,250,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":500,"h":500,"ip":2,"op":153,"st":2,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"Pre-comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[150,275,0],"ix":2,"l":2},"a":{"a":0,"k":[250,250,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":500,"h":500,"ip":0,"op":151,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
video/app/src/main/java/com/duben/library/net/neterror/CashException.java
View file @ 94763e68
......@@ -119,6 +119,7 @@ public class CashException {
return ex;
} else if (e instanceof NullPointerException) {
ex = new Throwable(e, ERROR.NULL);
LogUtil.d("AAAAAAAAAA" + e.getMessage());
ex.setMessage("数据有空");
return ex;
} else if (e instanceof FormatException) {
......
video/app/src/main/java/com/duben/loveplayletd/common/Constant.kt
View file @ 94763e68
......@@ -68,6 +68,7 @@ object Constant {
const val EDIT_PROFILE_CODE = 29992223
const val EDIT_PROFILE_SIGNATURE_STR = "EDIT_PROFILE_SIGNATURE_STR"
const val USER_LABEL_DATA = "USER_LABEL_DATA"
const val SELECT_USER_LABEL_DATA = "SELECT_USER_LABEL_DATA"
const val ALIPAY_AUTH_DATA = "ALIPAY_AUTH_DATA"
......
video/app/src/main/java/com/duben/loveplayletd/manager/CsjDJXSdkManager.kt
View file @ 94763e68
......@@ -32,7 +32,7 @@ object CsjDJXSdkManager {
fun init(application: Application) {
//初始化，最好放到application.onCreate()执行
val config = DJXSdkConfig.Builder().build()
DJXSdk.init(application, "SDK_Setting_5433630.json", config)
DJXSdk.init(application, "SDK_Setting_5555658.json", config)
}
......
video/app/src/main/java/com/duben/loveplayletd/manager/UserHelper.kt
View file @ 94763e68
......@@ -67,8 +67,7 @@ class UserHelper private constructor() {
when (code) {
COMMON_ERROR_CODE_BASIC_PROFILE -> {
// 缺少基础资料
ToastUtil.show(MintsApplication.getContext(), "缺少基础资料")
// ToastUtil.show(MintsApplication.getContext(), "缺少基础资料")
intent = Intent(appContext, BasicUserProfileActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
appContext.startActivity(intent)
......@@ -83,13 +82,8 @@ class UserHelper private constructor() {
}
COMMON_ERROR_CODE_NO_AUTH -> {
// 未认证
ToastUtil.show(MintsApplication.getContext(), "请完成真人认证")
// ToastUtil.show(MintsApplication.getContext(), "请完成真人认证")
showRealAuthDialog()
// intent = Intent(appContext, RealAuthActivity::class.java)
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
// appContext.startActivity(intent)
}
else -> {}
}
......@@ -135,7 +129,6 @@ class UserHelper private constructor() {
override fun onError(e: Throwable) {}
override fun onNext(baseResponse: BaseResponse<JsonObject>) {
if (baseResponse.status == 200) {
// TODO
}
}
})
......
video/app/src/main/java/com/duben/loveplayletd/mvp/model/ShareRank.kt
View file @ 94763e68
......@@ -26,4 +26,8 @@ data class ShareUserMsg(
val nickName: String = "",
val status: String = "",
val head: String = "",
) : java.io.Serializable
data class ShareCode(
val ruserShareCode: String? = "",
) : java.io.Serializable
\ No newline at end of file
video/app/src/main/java/com/duben/loveplayletd/mvp/presenters/BasicUserProfilePresenter.kt
View file @ 94763e68
......@@ -4,6 +4,7 @@ import com.duben.library.net.neterror.BaseSubscriber
import com.duben.library.net.neterror.Throwable
import com.duben.loveplayletd.manager.AppHttpManager
import com.duben.loveplayletd.mvp.model.BaseResponse
import com.duben.loveplayletd.mvp.model.ShareCode
import com.duben.loveplayletd.mvp.model.UserProfileData
import com.duben.loveplayletd.mvp.views.BasicUserProfileView
import com.google.gson.JsonObject
......@@ -45,7 +46,7 @@ class BasicUserProfilePresenter : BasePresenter<BasicUserProfileView>() {
fun getRuserShareCode() {
AppHttpManager.getInstance(loanApplication)
.call(loanService.ruserShareCode,
object : BaseSubscriber<BaseResponse<JsonObject>>() {
object : BaseSubscriber<BaseResponse<ShareCode>>() {
override fun onCompleted() {
if (isLinkView) return
}
......@@ -56,14 +57,21 @@ class BasicUserProfilePresenter : BasePresenter<BasicUserProfileView>() {
view.getRuserShareCodeFail()
}
override fun onNext(baseResponse: BaseResponse<JsonObject>) {
override fun onNext(baseResponse: BaseResponse<ShareCode>) {
if (isLinkView) return
val code = baseResponse.status
val message = baseResponse.message
when (code) {
200 -> view.getRuserShareCodeSuc()
200 -> {
val string = baseResponse.data.ruserShareCode
if (!string.isNullOrEmpty()) {
view.getRuserShareCodeSuc()
} else {
view.getRuserShareCodeFail()
}
}
else -> {
view.showToast(message)
view.getRuserShareCodeFail()
......
video/app/src/main/java/com/duben/loveplayletd/net/LoanService.java
View file @ 94763e68
......@@ -10,6 +10,7 @@ import com.duben.loveplayletd.mvp.model.FaceParam;
import com.duben.loveplayletd.mvp.model.HallList;
import com.duben.loveplayletd.mvp.model.RecommendBannerList;
import com.duben.loveplayletd.mvp.model.SeeWechat;
import com.duben.loveplayletd.mvp.model.ShareCode;
import com.duben.loveplayletd.mvp.model.SharePageMsg;
import com.duben.loveplayletd.mvp.model.ShareRankList;
import com.duben.loveplayletd.mvp.model.UserHallMsg;
......@@ -513,7 +514,7 @@ public interface LoanService {
* 是否已经绑定分享码
*/
@POST("roseApi/user/getRuserShareCode")
Observable<BaseResponse<JsonObject>> getRuserShareCode();
Observable<BaseResponse<ShareCode>> getRuserShareCode();
/**
* 查看图片
......
video/app/src/main/java/com/duben/loveplayletd/net/OkHttpInterceptor.java
View file @ 94763e68
......@@ -73,20 +73,18 @@ public class OkHttpInterceptor implements Interceptor {
* @return
*/
private String createChannel() {
return "share_mints";
// String channel = MateUtils.INSTANCE.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME");
// try {
// // 穿山甲分包渠道
// String ttChannel = HumeSDK.getChannel(MintsApplication.getContext());
// if (!TextUtils.isEmpty(ttChannel)) {
// // 此处方式不能修改，已和后端约定
// channel = channel + "_" + ttChannel;
// }
// } catch (Exception e) {
// e.printStackTrace();
// }
// return channel;
String channel = MateUtils.INSTANCE.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME");
try {
// 穿山甲分包渠道
String ttChannel = HumeSDK.getChannel(MintsApplication.getContext());
if (!TextUtils.isEmpty(ttChannel)) {
// 此处方式不能修改，已和后端约定
channel = channel + "_" + ttChannel;
}
} catch (Exception e) {
e.printStackTrace();
}
return channel;
}
/**
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/AlbumActivity.kt
View file @ 94763e68
......@@ -11,7 +11,6 @@ import android.os.Handler
import android.os.Looper
import android.text.TextUtils
import android.view.View
import androidx.core.app.ActivityCompat
import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.loveplayletd.R
import com.duben.loveplayletd.common.OssType
......@@ -25,7 +24,6 @@ import com.duben.loveplayletd.ui.widgets.DialogListener
import com.duben.loveplayletd.ui.widgets.nineImage.AddImagesInfo
import com.duben.loveplayletd.ui.widgets.nineImage.AddImagesView
import com.duben.loveplayletd.utils.GlideEngine
import com.duben.loveplayletd.utils.LogUtil
import com.luck.picture.lib.PictureSelector
import com.luck.picture.lib.compress.Luban
import com.luck.picture.lib.config.PictureConfig
......@@ -153,13 +151,6 @@ class AlbumActivity : BaseActivity(), View.OnClickListener, AlbumView {
.imageEngine(GlideEngine.createGlideEngine())// 图片加载引擎
.forResult(PictureConfig.CHOOSE_REQUEST)
} else {
LogUtil.d("AAAAAAAAA" + deniedList)
val shouldShowRequestPermissionRationale =
ActivityCompat.shouldShowRequestPermissionRationale(
this,
Manifest.permission.READ_EXTERNAL_STORAGE
)
showMissingPermissionDialog("[ 存储 相机 ]")
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/EditProfileActivity.kt
View file @ 94763e68
......@@ -574,15 +574,6 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
editProfilePresenter.setUserInfo(it)
}
}
R.id.layout_xhdnstz -> {
val bundle = Bundle()
bundle.putBoolean(Constant.IS_LIKE_FEMALE_LABEL, true)
readyGoForResult(
UserLabelActivity::class.java,
Constant.LIKE_FEMALE_LABEL_REQUEST_CODE,
bundle
)
}
R.id.layout_avatar -> {
showAlbum()
}
......@@ -627,7 +618,33 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
showPickDialog(UserProfile.PROFILE_JYJM.str, userProfileData?.findCity)
}
R.id.layout_gxbq -> {
readyGoForResult(UserLabelActivity::class.java, Constant.USER_LABEL_REQUEST_CODE)
val bundle = Bundle()
userProfileData?.let {
if (!it.tagsCommon.isNullOrEmpty()) {
bundle.putString(Constant.SELECT_USER_LABEL_DATA, it.tagsCommon)
}
}
readyGoForResult(
UserLabelActivity::class.java,
Constant.USER_LABEL_REQUEST_CODE,
bundle
)
}
R.id.layout_xhdnstz -> {
val bundle = Bundle()
userProfileData?.let {
if (!it.findDescribe.isNullOrEmpty()) {
bundle.putString(Constant.SELECT_USER_LABEL_DATA, it.findDescribe)
}
}
bundle.putBoolean(Constant.IS_LIKE_FEMALE_LABEL, true)
readyGoForResult(
UserLabelActivity::class.java,
Constant.LIKE_FEMALE_LABEL_REQUEST_CODE,
bundle
)
}
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/MainActivity.kt
View file @ 94763e68
......@@ -37,6 +37,10 @@ class MainActivity : BaseActivity(), View.OnClickListener {
private var audioManager: AudioManager? = null
private var showAuthDialog1 = true
private var showAuthDialog2 = true
private var showAuthDialog3 = true
// 底部标签切换的Fragment
private var videoFragment: Fragment? = null
private var squareFragment: Fragment? = null
......@@ -57,21 +61,35 @@ class MainActivity : BaseActivity(), View.OnClickListener {
tab_rl_msg.setOnClickListener(this)
tab_rl_my.setOnClickListener(this)
AppConfig.fragmentClickFlag = Constant.FRAGMENT_CLICK_ONE
if (videoFragment == null) {
videoFragment = FirstFragment()
}
if (!videoFragment!!.isAdded) {
// 提交事务
supportFragmentManager.beginTransaction()
.add(R.id.content_layout, videoFragment!!).commitAllowingStateLoss()
// 记录当前Fragment
currentFragment = videoFragment
if (UserHelper.instance.isBpkg()) {
AppConfig.fragmentClickFlag = Constant.FRAGMENT_CLICK_TWO
if (squareFragment == null) {
squareFragment = SquareFragment()
}
if (!squareFragment!!.isAdded) {
// 提交事务
supportFragmentManager.beginTransaction()
.add(R.id.content_layout, squareFragment!!).commitAllowingStateLoss()
// 记录当前Fragment
currentFragment = squareFragment
}
tab_iv_square.isSelected = true
tab_tv_square.isSelected = true
} else {
AppConfig.fragmentClickFlag = Constant.FRAGMENT_CLICK_ONE
if (videoFragment == null) {
videoFragment = FirstFragment()
}
if (!videoFragment!!.isAdded) {
// 提交事务
supportFragmentManager.beginTransaction()
.add(R.id.content_layout, videoFragment!!).commitAllowingStateLoss()
// 记录当前Fragment
currentFragment = videoFragment
}
tab_iv_video.isSelected = true
tab_tv_video.isSelected = true
}
tab_iv_video.isSelected = true
tab_tv_video.isSelected = true
// tab_iv_invite.isSelected = true
// tab_tv_invite.isSelected = true
initUnreadCountReceiver()
}
......@@ -83,7 +101,6 @@ class MainActivity : BaseActivity(), View.OnClickListener {
override fun onDestroy() {
super.onDestroy()
if (unreadCountReceiver != null) {
LocalBroadcastManager.getInstance(this).unregisterReceiver(
unreadCountReceiver!!
......@@ -135,15 +152,36 @@ class MainActivity : BaseActivity(), View.OnClickListener {
override fun onClick(view: View) {
if (!UserHelper.instance.isUserHaveBasic()) return
// 弹出真人认证
UserHelper.instance.isUserAuth()
when (view.id) {
R.id.tab_rl_video -> clickTab1Layout()
R.id.tab_rl_square -> clickTab2Layout()
R.id.tab_rl_invite -> clickTab3Layout()
R.id.tab_rl_msg -> clickTab4Layout()
R.id.tab_rl_my -> clickTab5Layout()
R.id.tab_rl_square -> {
if (showAuthDialog1) {
// 弹出真人认证
UserHelper.instance.isUserAuth()
showAuthDialog1 = false
}
clickTab2Layout()
}
R.id.tab_rl_invite -> {
clickTab3Layout()
}
R.id.tab_rl_msg -> {
if (showAuthDialog2) {
// 弹出真人认证
UserHelper.instance.isUserAuth()
showAuthDialog2 = false
}
clickTab4Layout()
}
R.id.tab_rl_my -> {
if (showAuthDialog3) {
// 弹出真人认证
UserHelper.instance.isUserAuth()
showAuthDialog3 = false
}
clickTab5Layout()
}
}
}
......@@ -172,6 +210,8 @@ class MainActivity : BaseActivity(), View.OnClickListener {
* 点击第二个tab
*/
fun clickTab2Layout() {
showAuthDialog1 = false
AppConfig.fragmentClickFlag = Constant.FRAGMENT_CLICK_TWO
if (squareFragment == null) {
squareFragment = SquareFragment()
......@@ -193,6 +233,7 @@ class MainActivity : BaseActivity(), View.OnClickListener {
* 点击第三个tab
*/
fun clickTab3Layout() {
showAuthDialog2 = false
readyGo(ShareActivity::class.java)
}
......@@ -200,6 +241,8 @@ class MainActivity : BaseActivity(), View.OnClickListener {
* 点击第四个tab
*/
fun clickTab4Layout() {
showAuthDialog3 = false
AppConfig.fragmentClickFlag = Constant.FRAGMENT_CLICK_FOUR
if (msgFragment == null) {
msgFragment = MessageFragment()
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/RealAuthActivity.kt
View file @ 94763e68
......@@ -5,6 +5,7 @@ import android.app.Activity
import android.content.Intent
import android.content.pm.ActivityInfo
import android.graphics.Color
import android.os.Bundle
import android.text.TextUtils
import android.view.View
import android.widget.TextView
......@@ -226,7 +227,17 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
showJobPick()
}
R.id.layout_gxbq -> {
readyGoForResult(UserLabelActivity::class.java, Constant.USER_LABEL_REQUEST_CODE)
val bundle = Bundle()
userProfileData?.let {
if (!it.tagsCommon.isNullOrEmpty()) {
bundle.putString(Constant.SELECT_USER_LABEL_DATA, it.tagsCommon)
}
}
readyGoForResult(
UserLabelActivity::class.java,
Constant.USER_LABEL_REQUEST_CODE,
bundle
)
}
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/UserLabelActivity.kt
View file @ 94763e68
......@@ -28,6 +28,7 @@ class UserLabelActivity : BaseActivity(), View.OnClickListener {
}
private var isLikeFemale = false
private var jsonData: String = ""
private var selectCount = 0
private val usualData = arrayListOf<String>()
......@@ -39,6 +40,7 @@ class UserLabelActivity : BaseActivity(), View.OnClickListener {
super.getBundleExtras(extras)
extras?.let {
isLikeFemale = it.getBoolean(Constant.IS_LIKE_FEMALE_LABEL, false)
jsonData = it.getString(Constant.SELECT_USER_LABEL_DATA, "")
}
}
......@@ -67,6 +69,26 @@ class UserLabelActivity : BaseActivity(), View.OnClickListener {
val likeAdapter = FlowTagAdapter(this, likeData)
flowlayout_usual.adapter = likeAdapter
if (jsonData.isNotEmpty()) {
val sArr = hashSetOf<Int>()
val data = gson.fromJson(jsonData, Array<String>::class.java)
for (i in 0 until likeData.size) {
data.forEach {
if (it == likeData[i]) {
sArr.add(i)
}
}
}
selectCount = data.size
tv_select.text =
SpanUtils()
.append("已选择")
.append("${selectCount}/${MAX_SELECT_COUNT}")
.setForegroundColor(ContextCompat.getColor(this, R.color.color_E8CF83))
.create()
likeAdapter.setSelectedList(sArr)
}
flowlayout_usual.setOnTagClickListener { _, _, _ ->
updateData()
false
......@@ -86,6 +108,46 @@ class UserLabelActivity : BaseActivity(), View.OnClickListener {
val specialAdapter = FlowTagAdapter(this, specialData)
flowlayout_special.adapter = specialAdapter
if (jsonData.isNotEmpty()) {
val sArr = hashSetOf<Int>()
val data = gson.fromJson(jsonData, Array<String>::class.java)
for (i in 0 until usualData.size) {
data.forEach {
if (it == usualData[i]) {
sArr.add(i)
}
}
}
selectCount = data.size
tv_select.text =
SpanUtils()
.append("已选择")
.append("${selectCount}/${MAX_SELECT_COUNT}")
.setForegroundColor(ContextCompat.getColor(this, R.color.color_E8CF83))
.create()
usualAdapter.setSelectedList(sArr)
}
if (jsonData.isNotEmpty()) {
val sArr = hashSetOf<Int>()
val data = gson.fromJson(jsonData, Array<String>::class.java)
for (i in 0 until specialData.size) {
data.forEach {
if (it == specialData[i]) {
sArr.add(i)
}
}
}
selectCount = data.size
tv_select.text =
SpanUtils()
.append("已选择")
.append("${selectCount}/${MAX_SELECT_COUNT}")
.setForegroundColor(ContextCompat.getColor(this, R.color.color_E8CF83))
.create()
specialAdapter.setSelectedList(sArr)
}
flowlayout_usual.setOnTagClickListener { _, _, _ ->
updateData()
false
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/WalletActivity.kt
View file @ 94763e68
......@@ -34,7 +34,6 @@ import com.jobo.wxpay.WXPayInfoImpl
import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram
import com.tencent.mm.opensdk.openapi.IWXAPI
import com.tencent.mm.opensdk.openapi.WXAPIFactory
import kotlinx.android.synthetic.main.activity_new_vip.*
import kotlinx.android.synthetic.main.activity_wallet.*
import kotlinx.android.synthetic.main.header_layout.*
import java.net.URLEncoder
......@@ -190,8 +189,8 @@ class WalletActivity : BaseActivity(), View.OnClickListener, DrawCashView {
private fun setVipContent() {
ll_vip_agreement.visibility = View.VISIBLE
ll_vip_alipay.visibility = View.VISIBLE
ll_vip_wx.visibility = View.GONE
btn_alipay.visibility = View.VISIBLE
btn_wxpay.visibility = View.GONE
}
private fun vipAgreementDialog(bean: VipBean.ListBean, payType: String) {
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/base/BaseActivity.java
View file @ 94763e68
......@@ -21,6 +21,7 @@ import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.duben.loveplayletd.ui.widgets.NewLoadingDialog;
import com.duben.loveplayletd.utils.StatusBarUtil;
import com.gyf.barlibrary.ImmersionBar;
import com.duben.loveplayletd.MintsApplication;
......@@ -33,7 +34,7 @@ import com.duben.library.base.BaseAppCompatActivity;
public abstract class BaseActivity extends BaseAppCompatActivity implements BaseView {
protected LoadingDialog progressDialog;
protected NewLoadingDialog progressDialog;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -181,7 +182,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
public void showLoading(String message) {
if (this.getWindow() != null && !this.isFinishing()) {
if (progressDialog == null) {
progressDialog = new LoadingDialog(this);
progressDialog = new NewLoadingDialog(this);
progressDialog.setLoadText(message);
}
......
video/app/src/main/java/com/duben/loveplayletd/ui/adapter/CoinAdapter.kt
View file @ 94763e68
......@@ -31,7 +31,6 @@ class CoinAdapter : BaseQuickAdapter<VipBean.ListBean, BaseViewHolder>(R.layout.
val itemView = holder.getView<View>(R.id.item_view)
if (holder.adapterPosition == selectPosition) {
itemView.setBackgroundResource(R.mipmap.bg_drawcash_item)
viewCoin.setTextColor(ContextCompat.getColor(context, R.color.color_7E4A17))
view.setTextColor(ContextCompat.getColor(context, R.color.color_7E4A17))
} else {
......
video/app/src/main/java/com/duben/loveplayletd/ui/adapter/SquareAdapter.kt
View file @ 94763e68
......@@ -67,7 +67,7 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
holder.itemView.context,
item.headerUrl,
holder.getView(R.id.iv_recommend_header),
R.mipmap.ic_default_avatar_rect
R.mipmap.ic_default_avatar_male
)
holder.getView<TextView>(R.id.tv_status).visibility = View.GONE
holder.getView<TextView>(R.id.tv_recommend_age).visibility = View.VISIBLE
......@@ -108,7 +108,7 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
holder.itemView.context,
item.headerUrl,
holder.getView(R.id.iv_recommend_header),
10f,
R.mipmap.ic_default_avatar_female
)
val blurViewHead = holder.getView<BlurView>(R.id.item_blurview_head)
......
video/app/src/main/java/com/duben/loveplayletd/ui/fragment/MyFragment.kt
View file @ 94763e68
......@@ -19,7 +19,6 @@ import com.duben.loveplayletd.mvp.presenters.MyPresenter
import com.duben.loveplayletd.mvp.views.MyView
import com.duben.loveplayletd.ui.activitys.*
import com.duben.loveplayletd.ui.fragment.base.LazyLoadBaseFragment
import com.duben.loveplayletd.utils.LogUtil
import com.duben.loveplayletd.utils.SpanUtils
import com.duben.loveplayletd.utils.TimeRender
import com.duben.loveplayletd.utils.UIUtils
......@@ -164,9 +163,12 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
// 男性展示充值的金币
tv_my_coin.text = "" + data.beans
} else {
if (data.idcardStatus == 2) {
ll_my_auth.visibility = View.VISIBLE
}
// 女性展示奖励的金币
tv_my_coin.text = "" + data.rewardCoin
ll_my_auth.visibility = View.VISIBLE
// if (data.idcardStatus == 0) {
// // 女性展示认证页面
// ll_my_auth.visibility = View.VISIBLE
......@@ -214,10 +216,6 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
override fun renderSuccess(adView: FrameLayout?): Boolean {
adView?.let {
it.post {
LogUtil.d("AAAAAAAA" + it.width + "---" + it.height)
}
UIUtils.removeFromParent(it)
fl_ad.removeAllViews()
fl_ad.addView(it)
......
video/app/src/main/java/com/duben/loveplayletd/ui/fragment/SquareFragment.kt
View file @ 94763e68
......@@ -4,6 +4,7 @@ import android.Manifest
import android.os.Build
import android.os.Handler
import android.os.Looper
import android.text.TextUtils
import android.view.LayoutInflater
import android.view.View
import android.widget.TextView
......@@ -19,6 +20,7 @@ import com.duben.loveplayletd.MintsApplication
import com.duben.loveplayletd.R
import com.duben.loveplayletd.common.AppConfig
import com.duben.loveplayletd.common.Constant
import com.duben.loveplayletd.manager.TrackManager
import com.duben.loveplayletd.manager.UserManager
import com.duben.loveplayletd.mvp.model.*
import com.duben.loveplayletd.mvp.presenters.SquarePresenter
......@@ -81,6 +83,11 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
super.onFragmentResume()
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_TWO) {
banner?.start()
if (TextUtils.isEmpty(UserManager.getInstance().userID)) {
TrackManager.getInstance().visitorlogin()
} else {
TrackManager.getInstance().getBaseMsg()
}
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ui/fragment/SquareListFragment.kt
View file @ 94763e68
......@@ -2,6 +2,7 @@ package com.duben.loveplayletd.ui.fragment
import android.app.Dialog
import android.os.Bundle
import android.text.TextUtils
import android.view.LayoutInflater
import android.view.View
import androidx.fragment.app.Fragment
......@@ -66,7 +67,9 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
override fun onFragmentFirstVisible() {
super.onFragmentFirstVisible()
if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_TWO) {
srl_square.autoRefresh()
if (!TextUtils.isEmpty(UserManager.getInstance().userID)) {
srl_square.autoRefresh()
}
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ui/fragment/base/BaseFragment.java
View file @ 94763e68
......@@ -14,6 +14,7 @@ import android.view.View;
import com.duben.loveplayletd.MintsApplication;
import com.duben.loveplayletd.R;
import com.duben.loveplayletd.ui.widgets.LoadingDialog;
import com.duben.loveplayletd.ui.widgets.NewLoadingDialog;
import com.duben.loveplayletd.utils.ToastUtil;
import com.duben.library.base.BaseAppFragment;
......@@ -25,7 +26,7 @@ import com.duben.library.base.BaseAppFragment;
*/
public abstract class BaseFragment extends BaseAppFragment {
private LoadingDialog progressDialog;
private NewLoadingDialog progressDialog;
@Override
public void onCreate(Bundle savedInstanceState) {
......@@ -53,7 +54,7 @@ public abstract class BaseFragment extends BaseAppFragment {
public void showLoading(String message) {
if (getActivity().getWindow() != null && !getActivity().isFinishing()) {
if (progressDialog == null) {
progressDialog = new LoadingDialog(getActivity());
progressDialog = new NewLoadingDialog(getActivity());
progressDialog.setLoadText(message);
}
progressDialog.show();
......
video/app/src/main/java/com/duben/loveplayletd/ui/widgets/NewLoadingDialog.java 0 → 100644
View file @ 94763e68
package com.duben.loveplayletd.ui.widgets;
import android.content.Context;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager.LayoutParams;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieCompositionFactory;
import com.airbnb.lottie.LottieDrawable;
import com.duben.loveplayletd.R;
/**
* 描述：加载中dialog
* 作者：孟崔广
* 时间：2017/10/10 17:51
* 邮箱：mengcuiguang@cashbang.cn
*/
public class NewLoadingDialog extends BaseDialog {
private Context mContext;
private LayoutInflater inflater;
private LayoutParams lp;
private TextView loadtext;
private LinearLayout loading_ll;
public NewLoadingDialog(Context context) {
super(context, R.style.dialog);
this.mContext = context;
inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View layout = inflater.inflate(R.layout.new_loadingdialog, null);
playCollectAnim(layout.findViewById(R.id.lav));
loadtext = (TextView) layout.findViewById(R.id.loading_text);
loading_ll = (LinearLayout) layout.findViewById(R.id.loading_ll);
setContentView(layout);
// 设置window属性
lp = getWindow().getAttributes();
lp.gravity = Gravity.CENTER;
lp.dimAmount = 0; // 去背景遮盖
// lp.alpha = 1.0f;//透明效果
getWindow().setAttributes(lp);
}
private void playCollectAnim(LottieAnimationView view) {
view.setImageDrawable(null);
LottieDrawable lottieDrawable = new LottieDrawable();
LottieCompositionFactory.fromAsset(mContext, "loading.json")
.addListener(result -> {
lottieDrawable.setComposition(result);
lottieDrawable.setRepeatCount(-1);
lottieDrawable.playAnimation();
});
view.setImageDrawable(lottieDrawable);
}
/**
* 设置显示文字
*
* @param content 文字内容
*/
public void setLoadText(String content) {
if (TextUtils.isEmpty(content)) {
loading_ll.setVisibility(View.GONE);
} else {
loading_ll.setVisibility(View.VISIBLE);
loadtext.setText(content);
}
}
}
\ No newline at end of file
video/app/src/main/res/drawable/shape_coin_gray.xml
View file @ 94763e68
......@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_424446" />
<corners android:radius="15dip" />
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_new_loading_bg.xml 0 → 100755
View file @ 94763e68
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/half_transparent20" />
<stroke
android:width="1dp"
android:color="@color/full_transparent" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
video/app/src/main/res/layout/activity_main.xml
View file @ 94763e68
......@@ -75,7 +75,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/tab_iv_square"
android:layout_centerHorizontal="true"
android:text="广场"
android:text="同城"
android:textColor="@color/item_text_sel"
android:textSize="16sp" />
</RelativeLayout>
......
video/app/src/main/res/layout/loadingdialog.xml
View file @ 94763e68
......@@ -8,7 +8,7 @@
android:paddingLeft="14dp"
android:paddingRight="14dp"
android:paddingTop="10dp">
<!-- 正在加载 -->
<ProgressBar
......
video/app/src/main/res/layout/new_loadingdialog.xml 0 → 100755
View file @ 94763e68
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_new_loading_bg"
android:gravity="center"
android:orientation="vertical">
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/lav"
android:layout_width="150dp"
android:layout_height="150dp" />
<LinearLayout
android:id="@+id/loading_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-30dp">
<TextView
android:id="@+id/loading_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="加载中..."
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
video/app/src/main/res/values/colors.xml
View file @ 94763e68
......@@ -11,6 +11,7 @@
<color name="full_transparent">#00000000</color>
<color name="half_transparent">#80000000</color>
<color name="half_transparent2">#99000000</color>
<color name="half_transparent20">#CC000000</color>
<color name="title_bg">#2B3238</color>
<color name="loading_bg">#600c224b</color>
<color name="btn_enabled">#F1F2F8</color>
......
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