Skip to content

A
android_vediosocial
Commit 9c1ee8d2 authored by jyx's avatar jyx
Browse files
Options

更新二级UI样式

parent 41a35b14
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1372 additions and 961 deletions
video/app/src/main/java/com/duben/library/net/neterror/CashException.java
View file @ 9c1ee8d2
......@@ -2,6 +2,7 @@ package com.duben.library.net.neterror;
import android.net.ParseException;
import com.duben.roseplaylet.utils.LogUtil;
import com.google.gson.JsonParseException;
import org.apache.http.conn.ConnectTimeoutException;
......
video/app/src/main/java/com/duben/library/utils/GlideUtils.kt
View file @ 9c1ee8d2
......@@ -2,7 +2,6 @@ package com.duben.library.utils
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.Bitmap
import android.graphics.drawable.Drawable
import android.widget.ImageView
import com.bumptech.glide.Glide
......@@ -12,10 +11,8 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.CenterInside
import com.bumptech.glide.load.resource.bitmap.FitCenter
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.bumptech.glide.load.resource.gif.GifDrawable
import com.bumptech.glide.request.RequestOptions
import com.bumptech.glide.request.target.SimpleTarget
import com.bumptech.glide.request.target.ViewTarget
import com.bumptech.glide.request.transition.Transition
import com.bumptech.glide.signature.ObjectKey
import com.duben.roseplaylet.utils.BubbleUtils
......
video/app/src/main/java/com/duben/library/utils/json/JsonUtil.java
View file @ 9c1ee8d2
......@@ -6,14 +6,20 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
import java.lang.reflect.Type;
public class JsonUtil {
private static Gson gson = new GsonBuilder()
.registerTypeAdapter(String.class, new StringNullAdapter())
.addSerializationExclusionStrategy(new FooAnnotationExclusionStrategy())
.create();
@SuppressWarnings("hiding")
public static <T> T parseJson(String response, Class<T> clazz) {
......@@ -76,4 +82,27 @@ public class JsonUtil {
return null;
}
}
public static class StringNullAdapter extends TypeAdapter<String> {
@Override
public void write(JsonWriter jsonWriter, String s) throws IOException {
//将对象转成json对象时，若有字段为null ，则转为""
if (s == null) {
jsonWriter.value("");
return;
}
jsonWriter.value(s);
}
@Override
public String read(JsonReader jsonReader) throws IOException {
//将json对象转成对象时，若有字段为null ，则转为""
if (jsonReader.peek() == JsonToken.NULL) {
jsonReader.nextNull();
return "";
}
return jsonReader.nextString();
}
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/common/AppConfig.java
View file @ 9c1ee8d2
package com.duben.roseplaylet.common;
import com.duben.roseplaylet.manager.GenerateTestUserSig;
/**
* 描述：配置app设置开关
* 作者：孟崔广
......@@ -33,6 +31,4 @@ public class AppConfig {
public static long splashTime = 0L;
public static double firstVipPrice = 0.0;
public static int IM_SDK_APPID = GenerateTestUserSig.SDKAPPID;
}
video/app/src/main/java/com/duben/roseplaylet/manager/GenerateTestUserSig.java deleted 100644 → 0
View file @ 41a35b14
package com.duben.roseplaylet.manager;
import android.text.TextUtils;
import android.util.Base64;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.zip.Deflater;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
/**
* Module: GenerateTestUserSig
*
* Function: Used to generate UserSig for testing. UserSig is a security signature designed by Tencent Cloud for its cloud services.
* It is calculated based on SDKAppID, UserID, and EXPIRETIME using the HMAC-SHA256 encryption algorithm.
*
* Attention: Do not use the code below in your commercial application. This is because:
*
* The code may be able to calculate UserSig correctly, but it is only for quick testing of the SDK’s basic features, not for commercial applications.
* SECRETKEY in client code can be easily decompiled and reversed, especially on web.
* Once your key is disclosed, attackers will be able to steal your Tencent Cloud traffic.
*
* The correct method is to deploy the UserSig calculation code and encryption key on your project server so that your application can request from your server a UserSig that is calculated whenever one is needed.
* Given that it is more difficult to hack a server than a client application, server-end calculation can better protect your key.
*
* Reference: https://intl.cloud.tencent.com/document/product/1047/34385
*/
public class GenerateTestUserSig {
/**
* Tencent Cloud SDKAppID. Set it to the SDKAppID of your account.
* <p>
* You can view your SDKAppID after creating an application in the [Tencent Cloud IM console](https://console.intl.cloud.tencent.com/im).
* SDKAppID uniquely identifies a Tencent Cloud account.
*/
public static final int SDKAPPID = 1600069405;
/**
* Signature validity period, which should not be set too short
* <p>
* Time unit: second
* Default value: 604800 (7 days)
*/
private static final int EXPIRETIME = 604800;
/**
* Follow the steps below to obtain the key required for UserSig calculation.
* <p>
* Step 1. Log in to the [Tencent Cloud IM console](https://console.intl.cloud.tencent.com/im), and create an application if you don’t have one.
* Step 2. Click Application Configuration to go to the basic configuration page and locate Account System Integration.
* Step 3. Click View Key to view the encrypted key used for UserSig calculation. Then copy and paste the key to the variable below.
* <p>
* Note: this method is for testing only. Before commercial launch, please migrate the UserSig calculation code and key to your backend server to prevent key disclosure and traffic stealing.
* Reference: https://intl.cloud.tencent.com/document/product/1047/34385
*/
private static final String SECRETKEY = "aa890ec2ba5679ae35f857288ce75ec9cfeee9715fd31682977a7bda7824d08c";
/**
* Calculate UserSig
* <p>
* The asymmetric encryption algorithm HMAC-SHA256 is used in the function to calculate UserSig based on SDKAppID, UserID, and EXPIRETIME.
*
* @note: Do not use the code below in your commercial application. This is because:
* <p>
* The code may be able to calculate UserSig correctly, but it is only for quick testing of the SDK’s basic features, not for commercial applications.
* SECRETKEY in client code can be easily decompiled and reversed, especially on web.
* Once your key is disclosed, attackers will be able to steal your Tencent Cloud traffic.
* <p>
* The correct method is to deploy the UserSig calculation code and encryption key on your project server so that your application can request from your server a UserSig that is calculated whenever one is needed.
* Given that it is more difficult to hack a server than a client application, server-end calculation can better protect your key.
* <p>
* Reference: https://intl.cloud.tencent.com/document/product/1047/34385
*/
public static String genTestUserSig(String userId) {
return GenTLSSignature(SDKAPPID, userId, EXPIRETIME, null, SECRETKEY);
}
/**
* Generate a TLS ticket
*
* @param sdkappid AppID of the application
* @param userId User ID
* @param expire Validity period, in seconds
* @param userbuf null by default
* @param priKeyContent Private key required for generating a TLS ticket
* @return If an error occurs, an empty string will be returned or exceptions printed. If the operation succeeds, a valid ticket will be returned.
*/
private static String GenTLSSignature(long sdkappid, String userId, long expire, byte[] userbuf, String priKeyContent) {
if (TextUtils.isEmpty(priKeyContent)) {
return "";
}
long currTime = System.currentTimeMillis() / 1000;
JSONObject sigDoc = new JSONObject();
try {
sigDoc.put("TLS.ver", "2.0");
sigDoc.put("TLS.identifier", userId);
sigDoc.put("TLS.sdkappid", sdkappid);
sigDoc.put("TLS.expire", expire);
sigDoc.put("TLS.time", currTime);
} catch (JSONException e) {
e.printStackTrace();
}
String base64UserBuf = null;
if (null != userbuf) {
base64UserBuf = Base64.encodeToString(userbuf, Base64.NO_WRAP);
try {
sigDoc.put("TLS.userbuf", base64UserBuf);
} catch (JSONException e) {
e.printStackTrace();
}
}
String sig = hmacsha256(sdkappid, userId, currTime, expire, priKeyContent, base64UserBuf);
if (sig.length() == 0) {
return "";
}
try {
sigDoc.put("TLS.sig", sig);
} catch (JSONException e) {
e.printStackTrace();
}
Deflater compressor = new Deflater();
compressor.setInput(sigDoc.toString().getBytes(Charset.forName("UTF-8")));
compressor.finish();
byte[] compressedBytes = new byte[2048];
int compressedBytesLength = compressor.deflate(compressedBytes);
compressor.end();
return new String(base64EncodeUrl(Arrays.copyOfRange(compressedBytes, 0, compressedBytesLength)));
}
private static String hmacsha256(long sdkappid, String userId, long currTime, long expire, String priKeyContent, String base64Userbuf) {
String contentToBeSigned = "TLS.identifier:" + userId + "\n"
+ "TLS.sdkappid:" + sdkappid + "\n"
+ "TLS.time:" + currTime + "\n"
+ "TLS.expire:" + expire + "\n";
if (null != base64Userbuf) {
contentToBeSigned += "TLS.userbuf:" + base64Userbuf + "\n";
}
try {
byte[] byteKey = priKeyContent.getBytes("UTF-8");
Mac hmac = Mac.getInstance("HmacSHA256");
SecretKeySpec keySpec = new SecretKeySpec(byteKey, "HmacSHA256");
hmac.init(keySpec);
byte[] byteSig = hmac.doFinal(contentToBeSigned.getBytes("UTF-8"));
return new String(Base64.encode(byteSig, Base64.NO_WRAP));
} catch (UnsupportedEncodingException e) {
return "";
} catch (NoSuchAlgorithmException e) {
return "";
} catch (InvalidKeyException e) {
return "";
}
}
private static byte[] base64EncodeUrl(byte[] input) {
byte[] base64 = new String(Base64.encode(input, Base64.NO_WRAP)).getBytes();
for (int i = 0; i < base64.length; ++i)
switch (base64[i]) {
case '+':
base64[i] = '*';
break;
case '/':
base64[i] = '-';
break;
case '=':
base64[i] = '_';
break;
default:
break;
}
return base64;
}
}
video/app/src/main/java/com/duben/roseplaylet/manager/IMHelper.kt
View file @ 9c1ee8d2
......@@ -5,11 +5,15 @@ import android.graphics.drawable.ColorDrawable
import android.text.method.ScrollingMovementMethod
import android.view.LayoutInflater
import android.widget.TextView
import com.duben.library.net.neterror.BaseSubscriber
import com.duben.library.net.neterror.Throwable
import com.duben.roseplaylet.MintsApplication
import com.duben.roseplaylet.R
import com.duben.roseplaylet.mvp.model.BaseResponse
import com.duben.roseplaylet.mvp.model.WXInfo
import com.duben.roseplaylet.utils.ToastUtil
import com.duben.roseplaylet.utils.UcropUtils
import com.google.gson.JsonObject
import com.tencent.qcloud.tuicore.TUIConfig
import com.tencent.qcloud.tuikit.timcommon.config.classicui.TUIConfigClassic
import com.tencent.qcloud.tuikit.tuichat.config.classicui.TUIChatConfigClassic
......@@ -27,12 +31,33 @@ class IMHelper private constructor() {
customSet()
}
private var SECRET_KEY = ""
companion object {
const val IM_SDK_APPID = 1600069405
val instance: IMHelper by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
IMHelper()
}
}
fun getUserSig(): String {
return SECRET_KEY
}
fun getImMsg() {
val application = MintsApplication.getContext() as MintsApplication
AppHttpManager.getInstance(application)
.call(application.loanService.imMsg,
object : BaseSubscriber<BaseResponse<JsonObject>>() {
override fun onCompleted() {}
override fun onError(e: Throwable) {}
override fun onNext(baseResponse: BaseResponse<JsonObject>) {
}
})
}
fun customSet() {
val appContext = MintsApplication.getContext()
......
video/app/src/main/java/com/duben/roseplaylet/manager/LoginWrapper.java
View file @ 9c1ee8d2
......@@ -156,8 +156,8 @@ public class LoginWrapper {
if (loginStatus == V2TIMManager.V2TIM_STATUS_LOGOUT && !TextUtils.isEmpty(userInfo.getUserID())) {
if (lastLoginCode >= BaseConstants.ERR_SDK_NET_ENCODE_FAILED && lastLoginCode <= BaseConstants.ERR_SDK_NET_SEND_REMAINING_TIMEOUT_NO_NETWORK) {
LogUtil.i(TAG, "onConnectSuccess, login IMSDK");
loginIMSDK(MintsApplication.getContext(), AppConfig.IM_SDK_APPID, userInfo.getUserID(),
GenerateTestUserSig.genTestUserSig(userInfo.getUserID()), getLoginConfig(),
loginIMSDK(MintsApplication.getContext(), IMHelper.IM_SDK_APPID, userInfo.getUserID(),
IMHelper.Companion.getInstance().getUserSig(), getLoginConfig(),
new TUICallback() {
@Override
public void onSuccess() {
......
video/app/src/main/java/com/duben/roseplaylet/mvp/model/SeeWechat.kt 0 → 100644
View file @ 9c1ee8d2
package com.duben.roseplaylet.mvp.model
/**
* @author Assen
* @date 2025/1/14
* @desc
*/
data class SeeWechat(
val black: Int,
val canSee: Boolean,
val errMsg: String? = null,
val hasWechat: Boolean,
val online: Boolean,
val surCount: Int,
val wechat: String? = null
) : java.io.Serializable
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/mvp/model/UserProfileData.kt 0 → 100644
View file @ 9c1ee8d2
package com.duben.roseplaylet.mvp.model
/**
* @author Assen
* @date 2025/1/15
* @desc
*/
data class UserProfileData(
var age: String? = null,
var appearance: String? = null,
var birthday: String? = null,
var black: Int? = null,
var bodyWeight: String? = null,
var canChat: Boolean,
var canSee: Boolean,
var canSeeSurCount: Int? = null,
var career: String? = null,
var city: String? = null,
var days: String? = null,
var distance: String? = null,
var findCity: String? = null,
var findDescribe: String? = null,
var hallTime: String? = null,
var hasWechat: Boolean,
var headerUrl: String? = null,
var idcardStatus: Int? = null,
var images: String? = null,
var infoWechat: String? = null,
var interest: String? = null,
var introduce: String? = null,
var lastTime: Long? = null,
var likeCount: Int? = null,
var likeStatus: Int? = null,
var nickName: String? = null,
var online: Boolean,
var sex: Int? = null,
var tagsCommon: String? = null,
var tagsOther: String? = null,
var uid: Long? = null,
var updateCount: Int? = null,
var userHeight: String? = null
) : java.io.Serializable
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/mvp/model/UserProfileDataBean.java deleted 100644 → 0
View file @ 41a35b14
package com.duben.roseplaylet.mvp.model;
import java.io.Serializable;
public class UserProfileDataBean implements Serializable {
private UserProfileData info;
public UserProfileData getInfo() {
return info;
}
public void setInfo(UserProfileData info) {
this.info = info;
}
public static class UserProfileData implements Serializable {
/**
* sex : 2
* infoWechat :
* canChat : true
* canSee : true
* likeStatus : 0
* images :
* canSeeSurCount : 14
* black : 1
* online : true
* birthday : 2021-01-01
* lastTime : 1736233526000
* career :
* updateCount : 0
* distance : 0.00
* city :
* likeCount : 0
* findDescribe :
* uid : 2401515422701300000
* idcardStatus : 0
* interest :
* userHeight :
* hasWechat : true
* nickName :
* introduce :
* headerUrl : https://img2.baidu.com/it/u=3360819743,727089392&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500
* appearance :
* tagsOther :
* findCity :
* tagsCommon :
* bodyWeight :
* hallTime : 近日活跃
* days : 13个月
* age : 4
*/
private int sex;
private String infoWechat;
private boolean canChat;
private boolean canSee;
private int likeStatus;
private String images;
private int canSeeSurCount;
private int black;
private boolean online;
private String birthday;
private long lastTime;
private String career;
private int updateCount;
private String distance;
private String city;
private int likeCount;
private String findDescribe;
private long uid;
private int idcardStatus;
private String interest;
private String userHeight;
private boolean hasWechat;
private String nickName;
private String introduce;
private String headerUrl;
private String appearance;
private String tagsOther;
private String findCity;
private String tagsCommon;
private String bodyWeight;
private String hallTime;
private String days;
private String age;
public int getSex() {
return sex;
}
public void setSex(int sex) {
this.sex = sex;
}
public String getInfoWechat() {
return infoWechat;
}
public void setInfoWechat(String infoWechat) {
this.infoWechat = infoWechat;
}
public boolean isCanChat() {
return canChat;
}
public void setCanChat(boolean canChat) {
this.canChat = canChat;
}
public boolean isCanSee() {
return canSee;
}
public void setCanSee(boolean canSee) {
this.canSee = canSee;
}
public int getLikeStatus() {
return likeStatus;
}
public void setLikeStatus(int likeStatus) {
this.likeStatus = likeStatus;
}
public String getImages() {
return images;
}
public void setImages(String images) {
this.images = images;
}
public int getCanSeeSurCount() {
return canSeeSurCount;
}
public void setCanSeeSurCount(int canSeeSurCount) {
this.canSeeSurCount = canSeeSurCount;
}
public int getBlack() {
return black;
}
public void setBlack(int black) {
this.black = black;
}
public boolean isOnline() {
return online;
}
public void setOnline(boolean online) {
this.online = online;
}
public String getBirthday() {
return birthday;
}
public void setBirthday(String birthday) {
this.birthday = birthday;
}
public long getLastTime() {
return lastTime;
}
public void setLastTime(long lastTime) {
this.lastTime = lastTime;
}
public String getCareer() {
return career;
}
public void setCareer(String career) {
this.career = career;
}
public int getUpdateCount() {
return updateCount;
}
public void setUpdateCount(int updateCount) {
this.updateCount = updateCount;
}
public String getDistance() {
return distance;
}
public void setDistance(String distance) {
this.distance = distance;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public int getLikeCount() {
return likeCount;
}
public void setLikeCount(int likeCount) {
this.likeCount = likeCount;
}
public String getFindDescribe() {
return findDescribe;
}
public void setFindDescribe(String findDescribe) {
this.findDescribe = findDescribe;
}
public long getUid() {
return uid;
}
public void setUid(long uid) {
this.uid = uid;
}
public int getIdcardStatus() {
return idcardStatus;
}
public void setIdcardStatus(int idcardStatus) {
this.idcardStatus = idcardStatus;
}
public String getInterest() {
return interest;
}
public void setInterest(String interest) {
this.interest = interest;
}
public String getUserHeight() {
return userHeight;
}
public void setUserHeight(String userHeight) {
this.userHeight = userHeight;
}
public boolean isHasWechat() {
return hasWechat;
}
public void setHasWechat(boolean hasWechat) {
this.hasWechat = hasWechat;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public String getIntroduce() {
return introduce;
}
public void setIntroduce(String introduce) {
this.introduce = introduce;
}
public String getHeaderUrl() {
return headerUrl;
}
public void setHeaderUrl(String headerUrl) {
this.headerUrl = headerUrl;
}
public String getAppearance() {
return appearance;
}
public void setAppearance(String appearance) {
this.appearance = appearance;
}
public String getTagsOther() {
return tagsOther;
}
public void setTagsOther(String tagsOther) {
this.tagsOther = tagsOther;
}
public String getFindCity() {
return findCity;
}
public void setFindCity(String findCity) {
this.findCity = findCity;
}
public String getTagsCommon() {
return tagsCommon;
}
public void setTagsCommon(String tagsCommon) {
this.tagsCommon = tagsCommon;
}
public String getBodyWeight() {
return bodyWeight;
}
public void setBodyWeight(String bodyWeight) {
this.bodyWeight = bodyWeight;
}
public String getHallTime() {
return hallTime;
}
public void setHallTime(String hallTime) {
this.hallTime = hallTime;
}
public String getDays() {
return days;
}
public void setDays(String days) {
this.days = days;
}
public String getAge() {
return age;
}
public void setAge(String age) {
this.age = age;
}
}
}
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/BasicUserProfilePresenter.kt
View file @ 9c1ee8d2
......@@ -4,7 +4,7 @@ import com.duben.library.net.neterror.BaseSubscriber
import com.duben.library.net.neterror.Throwable
import com.duben.roseplaylet.manager.AppHttpManager
import com.duben.roseplaylet.mvp.model.BaseResponse
import com.duben.roseplaylet.mvp.model.UserProfileDataBean
import com.duben.roseplaylet.mvp.model.UserProfileData
import com.duben.roseplaylet.mvp.views.BasicUserProfileView
import java.util.HashMap
......@@ -18,13 +18,13 @@ class BasicUserProfilePresenter : BasePresenter<BasicUserProfileView>() {
vo["headerUrl"] = headerUrl
AppHttpManager.getInstance(loanApplication)
.call(loanService.initInfo(vo),
object : BaseSubscriber<BaseResponse<UserProfileDataBean>>() {
object : BaseSubscriber<BaseResponse<UserProfileData>>() {
override fun onCompleted() {
if (isLinkView) return
view.hideLoading()
}
override fun onNext(baseResponse: BaseResponse<UserProfileDataBean>) {
override fun onNext(baseResponse: BaseResponse<UserProfileData>) {
if (isLinkView) return
view.hideLoading()
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/EditProfilePresenter.kt
View file @ 9c1ee8d2
......@@ -4,7 +4,7 @@ import com.duben.library.net.neterror.BaseSubscriber
import com.duben.library.net.neterror.Throwable
import com.duben.roseplaylet.manager.AppHttpManager
import com.duben.roseplaylet.mvp.model.BaseResponse
import com.duben.roseplaylet.mvp.model.UserProfileDataBean
import com.duben.roseplaylet.mvp.model.UserProfileData
import com.duben.roseplaylet.mvp.views.EditProfileView
import java.util.HashMap
......@@ -13,13 +13,13 @@ class EditProfilePresenter : BasePresenter<EditProfileView>() {
fun getUserInfo() {
AppHttpManager.getInstance(loanApplication)
.call(loanService.userInfo,
object : BaseSubscriber<BaseResponse<UserProfileDataBean>>() {
object : BaseSubscriber<BaseResponse<UserProfileData>>() {
override fun onCompleted() {
if (isLinkView) return
view.hideLoading()
}
override fun onNext(baseResponse: BaseResponse<UserProfileDataBean>) {
override fun onNext(baseResponse: BaseResponse<UserProfileData>) {
if (isLinkView) return
view.hideLoading()
......@@ -45,18 +45,18 @@ class EditProfilePresenter : BasePresenter<EditProfileView>() {
}
fun setUserInfo(userProfileData: UserProfileDataBean.UserProfileData) {
fun setUserInfo(userProfileData: UserProfileData) {
val vo = HashMap<String, Any>()
vo["info"] = userProfileData
AppHttpManager.getInstance(loanApplication)
.call(loanService.setUserInfo(vo),
object : BaseSubscriber<BaseResponse<UserProfileDataBean>>() {
object : BaseSubscriber<BaseResponse<UserProfileData>>() {
override fun onCompleted() {
if (isLinkView) return
view.hideLoading()
}
override fun onNext(baseResponse: BaseResponse<UserProfileDataBean>) {
override fun onNext(baseResponse: BaseResponse<UserProfileData>) {
if (isLinkView) return
view.hideLoading()
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/HomePresenter.kt
View file @ 9c1ee8d2
package com.duben.roseplaylet.mvp.presenters
import com.duben.roseplaylet.MintsApplication
import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.common.DeviceInfo
import com.duben.roseplaylet.manager.AppHttpManager
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.model.*
import com.duben.roseplaylet.mvp.views.HomeView
import com.duben.roseplaylet.utils.AppPreferencesManager
import com.duben.roseplaylet.utils.DeviceUuidFactory
import com.duben.library.net.neterror.BaseSubscriber
import com.duben.library.net.neterror.Throwable
import com.duben.roseplaylet.common.AppConfig
import com.duben.roseplaylet.manager.IMHelper
import com.google.gson.JsonObject
import java.util.HashMap
......@@ -69,7 +67,6 @@ class HomePresenter : BasePresenter<HomeView>() {
when (code) {
200 -> {
view.topTabsSuc(baseResponse.data)
// showTurn()
}
else -> {
view.showToast(message)
......@@ -169,6 +166,7 @@ class HomePresenter : BasePresenter<HomeView>() {
200 -> if (data != null) {
UserManager.getInstance().saveUserInfo(data)
saveTerminalInfo()
IMHelper.instance.getImMsg()
}
else -> {
view.showToast(message)
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/SquarePresenter.kt
View file @ 9c1ee8d2
......@@ -7,9 +7,45 @@ import com.duben.roseplaylet.mvp.model.BannerList
import com.duben.roseplaylet.mvp.model.BaseResponse
import com.duben.roseplaylet.mvp.model.HallList
import com.duben.roseplaylet.mvp.views.SquareView
import com.google.gson.JsonObject
class SquarePresenter : BasePresenter<SquareView>() {
fun toLike(toUid: String, status: Int) {
val vo = hashMapOf<String, Any>()
vo["toUid"] = toUid
vo["status"] = status
AppHttpManager.getInstance(loanApplication)
.call(loanService.toLike(vo), object : BaseSubscriber<BaseResponse<JsonObject>>() {
override fun onCompleted() {
if (isLinkView) return
view.hideLoading()
}
override fun onNext(baseResponse: BaseResponse<JsonObject>) {
if (isLinkView) return
view.hideLoading()
val code = baseResponse.status
val message = baseResponse.message
when (code) {
200 -> {}
else -> {
view.showToast(message)
}
}
}
override fun onError(e: Throwable?) {
if (isLinkView) return
view.hideLoading()
view.showToast(e?.message)
}
})
}
fun saveGps(latitude: String, longitude: String, city: String) {
val vo = hashMapOf<String, Any>()
vo["latitude"] = latitude
......
video/app/src/main/java/com/duben/roseplaylet/mvp/presenters/TrackPresenter.java
View file @ 9c1ee8d2
......@@ -42,7 +42,6 @@ public class TrackPresenter extends BaseTrackPresenter {
switch (baseResponse.getStatus()) {
case 200: {
UserManager.getInstance().saveUserInfo(baseResponse.getData());
// firstShowVedio();
saveTerminalInfo();
}
}
......
video/app/src/main/java/com/duben/roseplaylet/mvp/views/EditProfileView.kt
View file @ 9c1ee8d2
package com.duben.roseplaylet.mvp.views
import com.duben.roseplaylet.mvp.model.UserProfileDataBean
import com.duben.roseplaylet.mvp.model.UserProfileData
interface EditProfileView : BaseView {
fun getUserInfoSuc(data: UserProfileDataBean)
fun getUserInfoSuc(data: UserProfileData)
fun getUserInfoFail()
fun setUserInfoSuc()
......
video/app/src/main/java/com/duben/roseplaylet/mvp/views/UserProfileView.kt 0 → 100644
View file @ 9c1ee8d2
package com.duben.roseplaylet.mvp.views
import com.duben.roseplaylet.mvp.model.SeeWechat
import com.duben.roseplaylet.mvp.model.UserProfileData
interface UserProfileView : BaseView {
fun getMorePageSuc(data: UserProfileData)
fun getMorePageFail()
fun seeWechatSuc(data: SeeWechat)
fun seeWechatFail()
fun unlockWechatSuc()
fun unlockWechatFail()
fun toWhiteSuc()
fun toBlackSuc()
}
video/app/src/main/java/com/duben/roseplaylet/net/LoanService.java
View file @ 9c1ee8d2
......@@ -6,7 +6,8 @@ import android.text.TextUtils;
import com.duben.roseplaylet.mvp.model.FaceParam;
import com.duben.roseplaylet.mvp.model.HallList;
import com.duben.roseplaylet.mvp.model.RecommendBannerList;
import com.duben.roseplaylet.mvp.model.UserProfileDataBean;
import com.duben.roseplaylet.mvp.model.SeeWechat;
import com.duben.roseplaylet.mvp.model.UserProfileData;
import com.google.gson.JsonObject;
import com.duben.roseplaylet.BuildConfig;
import com.duben.roseplaylet.mvp.model.BannerList;
......@@ -397,19 +398,19 @@ public interface LoanService {
* 同城喜欢
*/
@POST("roseApi/hall/like")
Observable<BaseResponse<JsonObject>> like(@Body Map<String, Object> vo);
Observable<BaseResponse<JsonObject>> toLike(@Body Map<String, Object> vo);
/**
* 二级资料页
*/
@POST("roseApi/hall/morePage")
Observable<BaseResponse<UserProfileDataBean>> getMorePage(@Body Map<String, Object> vo);
Observable<BaseResponse<UserProfileData>> getMorePage(@Body Map<String, Object> vo);
/**
* 查看微信号
*/
@POST("roseApi/hall/seeWechat")
Observable<BaseResponse<JsonObject>> seeWechat(@Body Map<String, Object> vo);
Observable<BaseResponse<SeeWechat>> seeWechat(@Body Map<String, Object> vo);
/**
* 金币解锁和免费次数解锁同一接口
......@@ -421,13 +422,13 @@ public interface LoanService {
* 查看资料
*/
@POST("roseApi/user/info")
Observable<BaseResponse<UserProfileDataBean>> getUserInfo();
Observable<BaseResponse<UserProfileData>> getUserInfo();
/**
* 编辑资料
*/
@POST("roseApi/user/setInfo")
Observable<BaseResponse<UserProfileDataBean>> setUserInfo(@Body Map<String, Object> vo);
Observable<BaseResponse<UserProfileData>> setUserInfo(@Body Map<String, Object> vo);
/**
* 我喜欢的
......@@ -465,6 +466,36 @@ public interface LoanService {
@POST("roseApi/hall/white")
Observable<BaseResponse<JsonObject>> setWhite(@Body Map<String, Object> vo);
/**
* 获取im信息
*/
@POST("roseApi/user/getImMsg")
Observable<BaseResponse<JsonObject>> getImMsg();
/**
* 分享链接（二维码地址）
*/
@POST("roseApi/share/shareUrl")
Observable<BaseResponse<JsonObject>> getShareUrl();
/**
* 邀请页基础信息
*/
@POST("roseApi/share/sharePageMsg")
Observable<BaseResponse<JsonObject>> getSharePageMsg();
/**
* 查看图片
*/
@POST("roseApi/user/getImages")
Observable<BaseResponse<JsonObject>> getImages();
/**
* 设置图片
*/
@POST("roseApi/user/setImages")
Observable<BaseResponse<JsonObject>> setImages(@Body Map<String, Object> vo);
/**
* 默认http工厂
*/
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/BasicUserProfileActivity.kt
View file @ 9c1ee8d2
......@@ -34,6 +34,7 @@ import com.luck.picture.lib.tools.SdkVersionUtils
import com.tbruyelle.rxpermissions.RxPermissions
import com.yalantis.ucrop.UCrop
import kotlinx.android.synthetic.main.activity_basic_user_profile.*
import kotlinx.android.synthetic.main.dialog_nine_continue.*
import kotlinx.android.synthetic.main.header_layout.*
import java.io.File
......@@ -92,17 +93,17 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
showAgePickDialog()
}
R.id.tv_save -> {
val nickname = tv_age.text.toString()
val nickname = et_nickname.text.toString()
val age = tv_age.text.toString()
if (TextUtils.isEmpty(avatarUrl)) {
showToast("请上传头像！")
return
}
if (TextUtils.isEmpty(et_nickname.text.toString())) {
if (TextUtils.isEmpty(nickname)) {
showToast("请输入昵称！")
return
}
if (TextUtils.isEmpty(tv_age.text.toString())) {
if (TextUtils.isEmpty(age)) {
showToast("请输入年龄！")
return
}
......@@ -111,7 +112,7 @@ class BasicUserProfileActivity : BaseActivity(), View.OnClickListener, BasicUser
return
}
basicUserProfilePresenter.initBasicInfo("$age-1-1", nickname, age, avatarUrl!!)
basicUserProfilePresenter.initBasicInfo("$age-1-1", nickname, sex!!, avatarUrl!!)
}
}
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/EditProfileActivity.kt
View file @ 9c1ee8d2
......@@ -21,10 +21,7 @@ import com.duben.roseplaylet.common.OssType
import com.duben.roseplaylet.common.UserProfile
import com.duben.roseplaylet.manager.OssManager
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.model.JobBean
import com.duben.roseplaylet.mvp.model.JsonBean
import com.duben.roseplaylet.mvp.model.PickBean
import com.duben.roseplaylet.mvp.model.UserProfileDataBean
import com.duben.roseplaylet.mvp.model.*
import com.duben.roseplaylet.mvp.presenters.EditProfilePresenter
import com.duben.roseplaylet.mvp.views.EditProfileView
import com.duben.roseplaylet.ui.widgets.pick.SinglePickDialog
......@@ -80,7 +77,7 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
private var avatarUrl = ""
private var toUid = ""
private var userProfileData: UserProfileDataBean.UserProfileData? = null
private var userProfileData: UserProfileData? = null
private val editProfilePresenter by lazy { EditProfilePresenter() }
......@@ -693,8 +690,8 @@ class EditProfileActivity : BaseActivity(), View.OnClickListener, EditProfileVie
}
}
override fun getUserInfoSuc(data: UserProfileDataBean) {
this.userProfileData = data.info
override fun getUserInfoSuc(data: UserProfileData) {
this.userProfileData = data
initData()
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/WriteSignatureActivity.kt
View file @ 9c1ee8d2
package com.duben.roseplaylet.ui.activitys
import android.content.Intent
import android.graphics.Color
import android.text.TextUtils
import android.view.View
import com.duben.library.utils.nodoubleclick.AntiShake
......@@ -25,8 +26,11 @@ class WriteSignatureActivity : BaseActivity(), View.OnClickListener, WriteMoodVi
override fun initViewsAndEvents() {
writeMoodPresenter.attachView(this)
tv_title.text = "个性签名"
tv_title.setTextColor(Color.WHITE)
iv_left_icon.visibility = View.VISIBLE
iv_left_icon.setImageResource(R.mipmap.ic_arrow_white)
line.visibility = View.GONE
initListener()
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/activitys/base/BaseActivity.java
View file @ 9c1ee8d2
......@@ -20,6 +20,7 @@ import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.duben.roseplaylet.utils.StatusBarUtil;
import com.gyf.barlibrary.ImmersionBar;
import com.duben.roseplaylet.MintsApplication;
import com.duben.roseplaylet.R;
......@@ -46,7 +47,6 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
try {
if (TextUtils.equals(getClass().getSimpleName(), "SplashActivity")
|| TextUtils.equals(getClass().getSimpleName(), "GuideActivity")
) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
......@@ -54,10 +54,14 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
|| TextUtils.equals(getClass().getSimpleName(), "RealAuthActivity")
|| TextUtils.equals(getClass().getSimpleName(), "EditProfileActivity")
|| TextUtils.equals(getClass().getSimpleName(), "WriteSignatureActivity")
|| TextUtils.equals(getClass().getSimpleName(), "EditProfileActivity")
|| TextUtils.equals(getClass().getSimpleName(), "UserProfileActivity")
|| TextUtils.equals(getClass().getSimpleName(), "MainActivity")
) {
setDarkStatusBar();
} else {
setLightStatusBar();
StatusBarUtil.StatusBarLightMode(this);
// setLightStatusBar();
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
......@@ -89,8 +93,8 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
private void setDarkStatusBar() {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
getWindow().setStatusBarColor(getResources().getColor(R.color.black));
getWindow().setNavigationBarColor(getResources().getColor(R.color.black));
getWindow().setStatusBarColor(getResources().getColor(R.color.full_transparent));
getWindow().setNavigationBarColor(getResources().getColor(R.color.full_transparent));
int vis = getWindow().getDecorView().getSystemUiVisibility();
vis |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
getWindow().getDecorView().setSystemUiVisibility(vis);
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/SquareAdapter.kt
View file @ 9c1ee8d2
......@@ -3,7 +3,12 @@ package com.duben.roseplaylet.ui.adapter
import android.content.Intent
import android.os.Bundle
import android.view.View
import android.widget.ImageView
import android.widget.TextView
import com.airbnb.lottie.LottieAnimationView
import com.airbnb.lottie.LottieComposition
import com.airbnb.lottie.LottieCompositionFactory
import com.airbnb.lottie.LottieDrawable
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.duben.library.utils.GlideUtils
......@@ -14,10 +19,12 @@ import com.duben.roseplaylet.ui.activitys.UserProfileActivity
class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layout.item_square) {
private var isBlur = false
override fun convert(holder: BaseViewHolder, item: HallList.ListDTO) {
holder.getView<TextView>(R.id.tv_recommend_name).text = item.nickName
holder.getView<TextView>(R.id.tv_status).text = item.hallTime
holder.getView<TextView>(R.id.tv_recommend_location).text = item.distance
holder.getView<TextView>(R.id.tv_recommend_location).text = "" + item.distance + "km"
val tvRealLabel = holder.getView<TextView>(R.id.tv_real_label)
if (item.idcardStatus == 1) {
......@@ -28,11 +35,35 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
holder.getView<TextView>(R.id.tv_recommend_location).text
GlideUtils.loadBlurImageView(
holder.itemView.context,
item.headerUrl,
holder.getView(R.id.iv_recommend_header)
)
if (isBlur) {
GlideUtils.loadBlurImageView(
holder.itemView.context,
item.headerUrl,
holder.getView(R.id.iv_recommend_header)
)
} else {
GlideUtils.loadImageViewNoAnim2(
holder.itemView.context,
item.headerUrl,
holder.getView(R.id.iv_recommend_header)
)
}
if (item.likeStatus == 0) {
holder.getView<ImageView>(R.id.iv_heart)
} else {
holder.getView<ImageView>(R.id.iv_heart)
}
holder.getView<ImageView>(R.id.iv_heart).setOnClickListener {
mOnClickLikeListener?.onClickLike(holder.adapterPosition)
if (item.likeStatus == 0) {
playCollectAnim(holder.getView(R.id.iv_heart))
} else {
playCancelCollectAnim(holder.getView(R.id.iv_heart))
}
}
holder.itemView.setOnClickListener {
val intent = Intent(it.context, UserProfileActivity::class.java)
......@@ -42,4 +73,44 @@ class SquareAdapter : BaseQuickAdapter<HallList.ListDTO, BaseViewHolder>(R.layou
it.context.startActivity(intent)
}
}
fun setIsBlur(isBlur: Boolean) {
this.isBlur = isBlur
}
private fun playCollectAnim(view: LottieAnimationView) {
val lottieDrawable = LottieDrawable()
LottieCompositionFactory.fromAsset(context, "home_collect.json")
.addListener { result: LottieComposition? ->
lottieDrawable.setImagesAssetsFolder("images/")
lottieDrawable.composition = result
lottieDrawable.loop(false)
lottieDrawable.playAnimation()
}
view.setImageDrawable(lottieDrawable)
}
private fun playCancelCollectAnim(view: LottieAnimationView) {
val lottieDrawable = LottieDrawable()
LottieCompositionFactory.fromAsset(context, "home_cancel_collect.json")
.addListener { result: LottieComposition? ->
lottieDrawable.setImagesAssetsFolder("images/")
lottieDrawable.composition = result
lottieDrawable.loop(false)
lottieDrawable.playAnimation()
}
view.setImageDrawable(lottieDrawable)
}
private var mOnClickLikeListener: OnClickLikeListener? = null
fun setOnClickLikeListener(onClickLikeListener: OnClickLikeListener) {
this.mOnClickLikeListener = onClickLikeListener
}
interface OnClickLikeListener {
fun onClickLike(position: Int)
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/SquarePageAdapter.kt
View file @ 9c1ee8d2
......@@ -3,6 +3,7 @@ package com.duben.roseplaylet.ui.adapter
import androidx.fragment.app.Fragment
import androidx.viewpager2.adapter.FragmentStateAdapter
import com.duben.roseplaylet.ui.fragment.SquareListFragment
import com.duben.roseplaylet.utils.LogUtil
class SquarePageAdapter(
private val data: List<String>,
......@@ -18,6 +19,7 @@ class SquarePageAdapter(
override fun getItemCount() = data.size
override fun createFragment(position: Int): Fragment {
LogUtil.d("AAAAAAAAAA$position")
val newFragment = SquareListFragment.newInstance(position + 1)
fragments[position] = newFragment
return newFragment
......
video/app/src/main/java/com/duben/roseplaylet/ui/adapter/UserProfileAlbumAdapter.kt 0 → 100644
View file @ 9c1ee8d2
package com.duben.roseplaylet.ui.adapter
import android.view.View
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.duben.library.utils.GlideUtils
import com.duben.roseplaylet.R
class UserProfileAlbumAdapter :
BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_user_profile_album) {
private var isShowAuth = false
override fun convert(holder: BaseViewHolder, item: String) {
if (isShowAuth) {
holder.getView<View>(R.id.tv_auth).visibility = View.VISIBLE
} else {
holder.getView<View>(R.id.tv_auth).visibility = View.GONE
}
GlideUtils.loadImageView(context, item, holder.getView(R.id.iv_photo))
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/MainFragment.kt
View file @ 9c1ee8d2
......@@ -19,6 +19,7 @@ import com.duben.roseplaylet.ad.AdManager
import com.duben.roseplaylet.ad.banner.BannerManager
import com.duben.roseplaylet.common.AppConfig
import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.manager.IMHelper
import com.duben.roseplaylet.manager.LocalVedioManager
import com.duben.roseplaylet.manager.TrackManager
import com.duben.roseplaylet.manager.UserManager
......@@ -59,6 +60,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
return fragment
}
}
var mSelectTabIndex = -1
private val tabsData = mutableListOf<HotStyleTypesBean>()
private val bannerList = mutableListOf<BannerBean>()
......@@ -113,6 +115,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
if (userManager.vipFlag) {
homePresenter.signAfterSeconds()
}
IMHelper.instance.getImMsg()
TrackManager.getInstance().getMyInfo()
}
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/MyFragment.kt
View file @ 9c1ee8d2
......@@ -11,7 +11,7 @@ import com.duben.roseplaylet.ad.express.ExpressAdCallback
import com.duben.roseplaylet.ad.express.MyExpressManager
import com.duben.roseplaylet.common.AppConfig
import com.duben.roseplaylet.common.Constant
import com.duben.roseplaylet.manager.GenerateTestUserSig
import com.duben.roseplaylet.manager.IMHelper
import com.duben.roseplaylet.manager.LoginWrapper
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.model.UserBean
......@@ -98,10 +98,9 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
val tuiLoginConfig = LoginWrapper.getLoginConfig()
tuiLoginConfig.isInitLocalStorageOnly = true
val userID = instance.userID
val userSig = GenerateTestUserSig.genTestUserSig(userID)
val userSig = IMHelper.instance.getUserSig()
LoginWrapper.getInstance().loginIMSDK(MintsApplication.getContext(),
AppConfig.IM_SDK_APPID, userID, userSig, tuiLoginConfig, object : TUICallback() {
IMHelper.IM_SDK_APPID, userID, userSig, tuiLoginConfig, object : TUICallback() {
override fun onSuccess() {
LogUtil.i("LoginWrapper ", "imLogin onSuccess")
startChatActivity()
......
video/app/src/main/java/com/duben/roseplaylet/ui/fragment/SquareListFragment.kt
View file @ 9c1ee8d2
......@@ -11,8 +11,10 @@ import com.duben.roseplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.scwang.smartrefresh.layout.api.RefreshLayout
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener
import com.duben.roseplaylet.common.AppConfig
import com.duben.roseplaylet.manager.UserManager
import com.duben.roseplaylet.mvp.presenters.SquarePresenter
import com.duben.roseplaylet.mvp.views.SquareView
import com.duben.roseplaylet.ui.activitys.UserProfileActivity
import com.duben.roseplaylet.ui.adapter.SquareAdapter
import kotlinx.android.synthetic.main.fragment_square_list.*
......@@ -42,11 +44,12 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
override fun initViewsAndEvents() {
squarePresenter.attachView(this)
initRecy()
initListener()
arguments?.let {
mType = it.getInt(SQUARE_TYPE, 1)
}
initListener()
initRecy()
}
override fun onResume() {
......@@ -83,11 +86,29 @@ class SquareListFragment : LazyLoadBaseFragment(), SquareView, OnLoadMoreListene
private fun initRecy() {
squareAdapter = SquareAdapter()
if (mType == 3 && !UserManager.getInstance().vipFlag) {
squareAdapter.setIsBlur(true)
} else {
squareAdapter.setIsBlur(false)
}
squareAdapter.animationEnable = false
rcy_square_list.adapter = squareAdapter
val emptyView =
LayoutInflater.from(requireContext()).inflate(R.layout.item_empty_data, null)
squareAdapter.setEmptyView(emptyView)
squareAdapter.setOnItemChildClickListener { adapter, view, position ->
val bundle = Bundle()
bundle.putString(Constant.TO_UID, squareAdapter.data[position].uid.toString())
readyGo(UserProfileActivity::class.java, bundle)
}
squareAdapter.setOnClickLikeListener(object : SquareAdapter.OnClickLikeListener {
override fun onClickLike(position: Int) {
squarePresenter.toLike(
squareAdapter.data[position].uid.toString(),
squareAdapter.data[position].likeStatus
)
}
})
}
private fun initListener() {
......
video/app/src/main/java/com/duben/roseplaylet/ui/widgets/ToBlackConfirmDialog.kt 0 → 100644
View file @ 9c1ee8d2
package com.duben.roseplaylet.ui.widgets
import android.app.Dialog
import android.content.Context
import android.view.Gravity
import android.view.KeyEvent
import android.view.View
import android.view.WindowManager
import android.widget.ImageView
import android.widget.TextView
import com.duben.roseplaylet.R
class ToBlackConfirmDialog(private val context: Context, private val listener: DialogListener?) :
Dialog(context, R.style.dialog) {
private val lp: WindowManager.LayoutParams
private val tv_confirm: TextView
private val iv_close: ImageView
init {
setContentView(R.layout.dialog_to_black_confirm)
// 设置window属性
lp = window!!.attributes
lp.gravity = Gravity.CENTER
lp.width = WindowManager.LayoutParams.MATCH_PARENT
lp.windowAnimations = R.style.DialogAnimFade
window!!.attributes = lp
// 设置外部不可关闭
setCancelable(false)
setCanceledOnTouchOutside(false)
setOnKeyListener { _, i, _ -> i == KeyEvent.KEYCODE_BACK }
tv_confirm = findViewById<View>(R.id.tv_confirm) as TextView
iv_close = findViewById<View>(R.id.iv_close) as ImageView
iv_close.setOnClickListener(listener)
tv_confirm.setOnClickListener(listener)
listener?.setDialog(this)
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/ui/widgets/ToBlackDialog.kt 0 → 100644
View file @ 9c1ee8d2
package com.duben.roseplaylet.ui.widgets
import android.app.Dialog
import android.content.Context
import android.view.Gravity
import android.view.View
import android.view.WindowManager
import android.widget.TextView
import com.duben.roseplaylet.R
class ToBlackDialog(
private val context: Context,
private val isBlack: Boolean,
private val listener: DialogListener
) : Dialog(context, R.style.dialog) {
private val lp: WindowManager.LayoutParams
private val tv_to_black: TextView
private val tv_cancel: TextView
init {
setContentView(R.layout.dialog_to_black)
// 设置window属性
lp = window!!.attributes
lp.gravity = Gravity.BOTTOM
lp.width = WindowManager.LayoutParams.MATCH_PARENT
lp.windowAnimations = R.style.DialogAnimBottom
window!!.attributes = lp
// 查找View
tv_to_black = findViewById<View>(R.id.tv_to_black) as TextView
tv_cancel = findViewById<View>(R.id.tv_cancel) as TextView
if (isBlack) {
tv_to_black.text = "拉黑（屏蔽对方）"
} else {
tv_to_black.text = "移出黑名单（取消屏蔽）"
}
tv_to_black.setOnClickListener(listener)
tv_cancel.setOnClickListener(listener)
listener.setDialog(this)
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/roseplaylet/utils/JobData.kt
View file @ 9c1ee8d2
......@@ -33,10 +33,6 @@ object JobData {
} catch (e: Exception) {
e.printStackTrace()
}
LogUtil.d("AAAAAAAAALLLLLLLLLLLLLLL")
Logger.d(data.toString())
return data
}
......
video/app/src/main/res/drawable/shape_photo_auth.xml 0 → 100644
View file @ 9c1ee8d2
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_E4C46C" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners
android:bottomLeftRadius="10dp"
android:topRightRadius="10dp" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_square_item.xml
View file @ 9c1ee8d2
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_232122" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<gradient
android:angle="225"
android:endColor="@color/color_1cffffff"
android:startColor="@color/color_1fffcc32" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_square_label1.xml 0 → 100644
View file @ 9c1ee8d2
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_EAE3E0" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/layout/custom_tips_view.xml
View file @ 9c1ee8d2
......@@ -28,7 +28,7 @@
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textColor="@color/color_8F8E94"
android:textSize="16sp" />
android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
......
video/app/src/main/res/layout/dialog_to_black.xml 0 → 100644
View file @ 9c1ee8d2
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_main_black"
android:orientation="vertical">
<TextView
android:id="@+id/tv_to_black"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center"
android:text="拉黑（屏蔽对方）"
android:textColor="@color/white"
android:textSize="16sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/graya" />
<TextView
android:id="@+id/tv_cancel"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/gray"
android:gravity="center"
android:text="取消"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</FrameLayout>
video/app/src/main/res/layout/dialog_to_black_confirm.xml 0 → 100644
View file @ 9c1ee8d2
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_hall"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="30dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:text="您们将无法再看到对方和对方的动态，确定吗？"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_confirm"
android:layout_width="260dp"
android:layout_height="40dp"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
android:background="@drawable/shape_square_tab"
android:gravity="center"
android:text="确定"
android:textColor="@color/black"
android:textSize="14sp" />
</LinearLayout>
<ImageView
android:id="@+id/iv_close"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_below="@id/ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@mipmap/ic_close" />
</RelativeLayout>
video/app/src/main/res/layout/fragment_square_list.xml
View file @ 9c1ee8d2
......@@ -15,6 +15,7 @@
android:id="@+id/rcy_square_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="600dp"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
......
video/app/src/main/res/layout/item_user_profile_album.xml 0 → 100755
View file @ 9c1ee8d2
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_photo"
android:layout_width="120dp"
android:layout_height="120dp"
android:scaleType="centerCrop"
android:src="@mipmap/ic_launcher_main" />
<TextView
android:id="@+id/tv_auth"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:background="@drawable/shape_photo_auth"
android:paddingStart="6dp"
android:paddingTop="2dp"
android:paddingEnd="6dp"
android:paddingBottom="2dp"
android:text="本人"
android:textColor="@color/white"
android:textSize="12sp" />
</FrameLayout>
\ No newline at end of file
video/app/src/main/res/layout/layout_user_profile_case.xml 0 → 100644
View file @ 9c1ee8d2
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<FrameLayout
android:id="@+id/fl_head_male"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp">
<com.duben.roseplaylet.ui.widgets.CircleImageView
android:id="@+id/iv_avatar_male"
android:layout_width="70dp"
android:layout_height="70dp"
android:src="@mipmap/ic_my_avat"
android:visibility="visible" />
<TextView
android:id="@+id/tv_online_male"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:background="@drawable/shape_square_tab"
android:paddingStart="6dp"
android:paddingTop="2dp"
android:paddingEnd="6dp"
android:paddingBottom="2dp"
android:text="在线"
android:textColor="@color/white"
android:textSize="12sp" />
</FrameLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="80dp"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_label_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_label_isvip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:background="@drawable/shape_label_white"
android:paddingStart="4dp"
android:paddingTop="2dp"
android:paddingEnd="4dp"
android:paddingBottom="2dp"
android:text="VIP"
android:textColor="@color/black"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="3dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_label_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_label_white"
android:paddingStart="4dp"
android:paddingTop="2dp"
android:paddingEnd="4dp"
android:paddingBottom="2dp"
android:text="44岁"
android:textColor="@color/black" />
<TextView
android:id="@+id/tv_label_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:background="@drawable/shape_label_white"
android:paddingStart="4dp"
android:paddingTop="2dp"
android:paddingEnd="4dp"
android:paddingBottom="2dp"
android:text="北京北京"
android:textColor="@color/black"
android:visibility="gone" />
<TextView
android:id="@+id/tv_label_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:background="@drawable/shape_label_white"
android:paddingStart="4dp"
android:paddingTop="2dp"
android:paddingEnd="4dp"
android:paddingBottom="2dp"
android:text="172cm"
android:textColor="@color/black" />
</LinearLayout>
<TextView
android:id="@+id/tv_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="登录IP：12323213"
android:textColor="@color/white"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="60dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_like"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/djx_like" />
<TextView
android:id="@+id/tv_like_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="10人喜欢"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
video/app/src/main/res/layout/layout_user_profile_head.xml 0 → 100644
View file @ 9c1ee8d2
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/head_container"
android:layout_width="match_parent"
android:layout_height="80dp">
<View
android:id="@+id/v_bar"
android:layout_width="match_parent"
android:layout_height="30dp"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_head_back"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="10dp"
android:src="@mipmap/ic_arrow_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_bar" />
<LinearLayout
android:id="@+id/ll_head_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
app:layout_collapseParallaxMultiplier="0.5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_bar">
<ImageView
android:id="@+id/iv_head_avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/ic_my_avat" />
<TextView
android:id="@+id/tv_head_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/app_name"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
<ImageView
android:id="@+id/iv_head_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:src="@mipmap/ic_label_right"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/v_bar" />
<ImageView
android:id="@+id/iv_head_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:src="@mipmap/ic_label_right"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_head_more"
app:layout_constraintTop_toBottomOf="@id/v_bar" />
</androidx.constraintlayout.widget.ConstraintLayout>
video/app/src/main/res/values/colors.xml
View file @ 9c1ee8d2
......@@ -64,5 +64,12 @@
<color name="color_FDEFCA">#FDEFCA</color>
<color name="color_E7C26A">#E7C26A</color>
<color name="color_383838">#383838</color>
<color name="color_848389">#848389</color>
<color name="color_FFCC32">#FFCC32</color>
<color name="color_1fffcc32">#1fffcc32</color>
<color name="color_1cffffff">#1cffffff</color>
<color name="color_EAE3E0">#EAE3E0</color>
<color name="color_DB6572">#DB6572</color>
<color name="color_D2D2D2">#D2D2D2</color>
</resources>
\ No newline at end of file
video/gradle.properties
View file @ 9c1ee8d2
......@@ -23,8 +23,8 @@ android.nonTransitiveRClass=true
#DEBUG_URL="https://test.mints-id.com/camera-api/"
#DEBUG_URL="http://cui.mints-id.com/"
DEBUG_URL="http://47.95.116.182:9886/"
#DEBUG_URL="https://api.mints-tech.cn/camera-api/"
#DEBUG_URL="http://47.95.116.182:9886/"
DEBUG_URL="https://api.mints-tech.cn/camera-api/"
RELEASE_URL="https://api.mints-tech.cn/camera-api/"
RELEASE_KEY_PASSWORD=mintsroseplaylet
......@@ -37,9 +37,9 @@ RELEASE_SHARESDK_KEY=3911a009c7983
RELEASE_SHARESDK_SECRET=a7cf0fd727fe6bb3f401af89b5bc0134
#weixin
WEIXIN_APP_PAY_ID ="wx78fff52fb3b373c5"
WEIXIN_APP_ID =wx78fff52fb3b373c5
WEIXIN_APP_SECRET =63a98dbec4bbc432dc92039be7229540
WEIXIN_APP_PAY_ID ="wx6f4215662bbee3cf"
WEIXIN_APP_ID =wx6f4215662bbee3cf
WEIXIN_APP_SECRET =c659e7978ad8a6bfc242468d01df51a4
#umeng-done
RELEASE_UMENG_KEY=677f617e8f232a05f1f2ed7a
......
video/tmpmob/ShareSDK/assets/ShareSDK.xml
View file @ 9c1ee8d2
......@@ -16,8 +16,8 @@
<Tumblr Enable="false" />
<Email Enable="false" />
<ShortMessage Enable="false" />
<Wechat AppId="wx78fff52fb3b373c5" AppSecret="63a98dbec4bbc432dc92039be7229540" userName="gh_afb25ac019c9" path="pages/index/index.html?id=1" WithShareTicket="true" MiniprogramType="0" />
<WechatMoments AppId="wx78fff52fb3b373c5" AppSecret="63a98dbec4bbc432dc92039be7229540" />
<Wechat AppId="wx6f4215662bbee3cf" AppSecret="c659e7978ad8a6bfc242468d01df51a4" userName="gh_afb25ac019c9" path="pages/index/index.html?id=1" WithShareTicket="true" MiniprogramType="0" />
<WechatMoments AppId="wx6f4215662bbee3cf" AppSecret="c659e7978ad8a6bfc242468d01df51a4" />
<QQ Enable="false" />
<Instapaper Enable="false" />
<Pocket Enable="false" />
......
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