xuhuixiang/yuliao_and
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第一次提交

Browse Source
This commit is contained in:
xuhuixiang
2025-08-08 15:05:12 +08:00
parent 3e7f1d9089
commit ad722304bf
795 changed files with 19580 additions and 9048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/build.gradle.kts
View File

@@ -10,6 +10,8 @@ plugins {
id("com.android.application")
id("com.google.gms.google-services")
id("com.huawei.agconnect")
id("kotlin-android")
}
@@ -44,17 +46,16 @@ android {
defaultConfig {
manifestPlaceholders += mapOf()
applicationId = "com.hbl.lewan"
applicationId = "com.hbl.yuliao"
minSdk = 24
targetSdk = 33
versionCode = 216
versionName = "2.1.6"
versionCode = 217
versionName = "2.1.7"
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders["IMAPPKEY"] = "23c9cbddd4b876908efdccd0a6f2638d" //正式
// manifestPlaceholders["IMAPPKEY"] = "502a1d045bb802c75dd14a005a731256" //测试
manifestPlaceholders["JPUSH_PKGNAME"] = "com.hbl.lewan"
manifestPlaceholders["JPUSH_PKGNAME"] = "com.hbl.yuliao"
manifestPlaceholders["JPUSH_APPKEY"] = "9041bc22de91e3d9af3cfd23"
manifestPlaceholders["JPUSH_CHANNEL"] = "developer-default"
ndk {
@@ -99,9 +100,8 @@ android {
"AREA_CODE",
"\"+86\""
)
manifestPlaceholders["APPICON"] = "@mipmap/ic_launche" //正式
manifestPlaceholders["APPICON_ROUND"] = "@mipmap/ic_launche_round" //正式
// manifestPlaceholders["APPICON"] = "@mipmap/ic_launche" //正式
// manifestPlaceholders["APPICON_ROUND"] = "@mipmap/ic_launche_round" //正式
//正式服
manifestPlaceholders["IMAPPKEY"] = "23c9cbddd4b876908efdccd0a6f2638d" //正式
@@ -127,11 +127,9 @@ android {
"AREA_CODE",
"\"+86\""
)
manifestPlaceholders["APPICON"] = "@mipmap/ic_launche" //正式
manifestPlaceholders["APPICON_ROUND"] = "@mipmap/ic_launche_round" //正式
// manifestPlaceholders["APPICON"] = "@mipmap/ic_launche" //正式
// manifestPlaceholders["APPICON_ROUND"] = "@mipmap/ic_launche_round" //正式
// 测试APPKEY
// manifestPlaceholders["IMAPPKEY"] = "502a1d045bb802c75dd14a005a731256"
manifestPlaceholders["IMAPPKEY"] = "23c9cbddd4b876908efdccd0a6f2638d"
@@ -157,9 +155,11 @@ android {
jniLibs.pickFirsts.add("lib/arm64-v8a/libc++_shared.so")
jniLibs.pickFirsts.add("lib/armeabi-v7a/libc++_shared.so")
exclude("META-INF/gradle/incremental.annotation.processors")
jniLibs.pickFirsts.add("lib/*/libaosl.so")
}
namespace = "com.hbl.lewan"
namespace = "com.hbl.yuliao"
// applicationVariants.all {
@@ -193,8 +193,10 @@ dependencies {
implementation(project(":chatkit-ui"))
// implementation(project(":locationkit"))
implementation(project(":fingermanager"))
// implementation("com.netease.yunxin.kit.call:call-ui:1.8.2") //呼叫组件 UI 包
// api("com.netease.nimlib:avsignalling:9.11.0") //呼叫组件 依赖信令包
// implementation(project(":call_sw"))
implementation("com.netease.yunxin.kit.call:call-ui:1.8.2") //呼叫组件 UI 包
api("com.netease.nimlib:avsignalling:9.11.0") //呼叫组件 依赖信令包
api("com.netease.nimlib:basesdk:9.11.0") //IM SDK
// api("com.netease.nimlib:push:9.19.11")
// implementation("com.airbnb.android:lottie:5.0.3")
@@ -205,6 +207,8 @@ dependencies {
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.squareup.retrofit2:converter-scalars:2.9.0")
// implementation("io.agora.rtc:voice-sdk:4.5.2")
//
// implementation ("com.qiniu:qiniu-java-sdk:7.16.0") {
// exclude(group = "com.squareup.okhttp3", module = "okhttp")

4
app/google-services.json
View File

@@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:989332659051:android:0786cc1d32916e1569ca2e",
"android_client_info": {
"package_name": "com.hbl.lewan"
"package_name": "com.hbl.yuliao"
}
},
"oauth_client": [
@@ -17,7 +17,7 @@
"client_id": "989332659051-s972adtvoscso4480ja4llhi73mbbog2.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.hbl.lewan",
"package_name": "com.hbl.yuliao",
"certificate_hash": "1d5a6262622999ac2f1c4a9f2fe5edf30dafebd2"
}
},

6
app/proguard-rules.pro vendored
View File

@@ -171,8 +171,8 @@
-dontwarn com.hbl.lewan.**
-keep class com.hbl.lewan.** {*;}
-dontwarn com.hbl.yuliao.**
-keep class com.hbl.yuliao.** {*;}
# NIM SDK的类，如果集成IM时已经添加，请忽略
-dontwarn com.netease.nim.**
@@ -201,4 +201,6 @@
-keep class com.qiniu.**{public <init>();}
-ignorewarnings
-keep class io.agora.**{*;}
-dontwarn io.agora.**

6
app/release/output-metadata.json
View File

@@ -4,15 +4,15 @@
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.hbl.lewan",
"applicationId": "com.hbl.yuliao",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 216,
"versionName": "2.1.6",
"versionCode": 217,
"versionName": "2.1.7",
"outputFile": "app-release.apk"
}
],

BIN
app/release/lewan_216.apk → app/release/yuliao.apk
View File

Binary file not shown.

63
app/src/main/AndroidManifest.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto">
<!-- replace package com.hbl.lewan with your package name -->
<!-- replace package com.hbl.yuliao with your package name -->
<!-- add uses-permission into your AndroidManifest -->
<!-- NFC所需权限-->
<uses-permission android:name="android.permission.NFC" />
@@ -13,12 +13,12 @@
android:required="false" />
<permission
android:name="com.hbl.lewan.permission.RECEIVE_MSG"
android:name="com.hbl.yuliao.permission.RECEIVE_MSG"
android:protectionLevel="signature"
tools:ignore="UniquePermission" />
<!-- receive SDK broadcast， replace package com.hbl.lewan with your package name -->
<uses-permission android:name="com.hbl.lewan.permission.RECEIVE_MSG" />
<!-- receive SDK broadcast， replace package com.hbl.yuliao with your package name -->
<uses-permission android:name="com.hbl.yuliao.permission.RECEIVE_MSG" />
<!-- <uses-permission-->
<!-- android:name="android.permission.QUERY_ALL_PACKAGES"-->
@@ -28,9 +28,9 @@
<!-- xiaomi push -->
<permission
android:name="com.hbl.lewan.permission.MIPUSH_RECEIVE"
android:name="com.hbl.yuliao.permission.MIPUSH_RECEIVE"
android:protectionLevel="signature" />
<uses-permission android:name="com.hbl.lewan.permission.MIPUSH_RECEIVE" />
<uses-permission android:name="com.hbl.yuliao.permission.MIPUSH_RECEIVE" />
<uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
<uses-feature
@@ -40,10 +40,10 @@
<!-- down Flyme5 version -->
<uses-permission android:name="com.meizu.flyme.push.permission.RECEIVE" />
<permission
android:name="com.hbl.lewan.push.permission.MESSAGE"
android:name="com.hbl.yuliao.push.permission.MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="com.hbl.lewan.push.permission.MESSAGE" />
<uses-permission android:name="com.hbl.yuliao.push.permission.MESSAGE" />
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
<!--去掉-->
<uses-permission
@@ -66,9 +66,9 @@
<!-- Flyme3 -->
<uses-permission android:name="com.meizu.c2dm.permission.RECEIVE" />
<permission
android:name="com.hbl.lewan.permission.C2D_MESSAGE"
android:name="com.hbl.yuliao.permission.C2D_MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="com.hbl.lewan.permission.C2D_MESSAGE" />
<uses-permission android:name="com.hbl.yuliao.permission.C2D_MESSAGE" />
<!-- oppo push-->
<uses-permission android:name="com.coloros.mcs.permission.RECIEVE_MCS_MESSAGE" />
@@ -96,7 +96,16 @@
tools:ignore="UniquePermission" />
<permission android:name="com.netease.nim.demo.permission.RECEIVE_MSG" />
<!--可选权限-->
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.BLUETOOTH"/>
<!-- 对于 Android 12.0 及以上且集成 v4.1.0 以下 SDK 的设备，还需要添加以下权限 -->
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
<!-- 对于 Android 12.0 及以上设备，还需要添加以下权限 -->
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
<!--查詢特定應用-->
<queries>
<package android:name="com.tencent.mm" />
@@ -107,11 +116,11 @@
android:name=".IMApplication"
android:allowBackup="true"
android:allowNativeHeapPointerTagging="false"
android:icon="${APPICON}"
android:icon="@mipmap/ic_launche"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:requestLegacyExternalStorage="true"
android:roundIcon="${APPICON_ROUND}"
android:roundIcon="@mipmap/ic_launche_round"
android:supportsRtl="true"
android:theme="@style/Theme.Xkit">
<meta-data
@@ -231,7 +240,7 @@
</activity>
<activity
android:name="com.hbl.lewan.map.LocationPageActivity1"
android:name="com.hbl.yuliao.map.LocationPageActivity1"
android:finishOnTaskLaunch="true"
android:screenOrientation="portrait"
android:theme="@style/TransTheme"
@@ -350,6 +359,7 @@
<activity
android:name=".main.mine.UserInfoActivity"
android:exported="true"
android:theme="@style/AppThemeStart"
android:screenOrientation="portrait">
</activity>
@@ -462,6 +472,11 @@
android:name=".imkit.team.TeamSettingActivity"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".imkit.team.ZhuanShuListActivity"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".imkit.team.TeamAnnouncementActivity"
android:exported="true"
@@ -551,7 +566,10 @@
android:name=".wallet.PaySettingActivity"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".wallet.SumbitUsdtActivity"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".wallet.SetPayPasswordActivity"
@@ -628,7 +646,6 @@
<activity
android:name=".wallet.MyWalletActivity"
android:exported="true"
android:theme="@style/SampleTheme1"
android:screenOrientation="portrait" />
@@ -777,7 +794,7 @@
android:largeHeap="true"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/SampleTheme">
android:theme="@style/SampleTheme_new">
<intent-filter>
<action android:name="https://netease.yunxin.im.demo.home" />
@@ -852,12 +869,12 @@
<!-- 云信 NIM SDK 进程间通信provider-->
<provider
android:name="com.netease.nimlib.ipc.NIMContentProvider"
android:authorities="com.hbl.lewan.ipc.provider"
android:authorities="com.hbl.yuliao.ipc.provider"
android:exported="false"
android:process=":core" />
<provider
android:name="com.netease.nimlib.ipc.cp.provider.PreferenceContentProvider"
android:authorities="com.hbl.lewan.ipc.provider.preference"
android:authorities="com.hbl.yuliao.ipc.provider.preference"
android:exported="false" />
<!-- 小米推送配置 -->
@@ -1062,7 +1079,7 @@
<!-- </service>-->
<!-- <receiver-->
<!-- android:name="com.hbl.lewan.jpush.PushMessageReceiver"-->
<!-- android:name="com.hbl.yuliao.jpush.PushMessageReceiver"-->
<!-- android:enabled="true"-->
<!-- android:exported="false">-->
<!-- <intent-filter>-->
@@ -1080,6 +1097,12 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
<!-- <activity-->
<!-- android:name="io.agora.onetoone.Pure1v1LivingActivity"-->
<!-- android:theme="@style/SampleTheme"-->
<!-- android:exported="false"-->
<!-- android:screenOrientation="portrait" />-->
</application>
</manifest>

BIN
app/src/main/ic_launche-playstore.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 49 KiB

131
app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java
View File

@@ -1,131 +0,0 @@
//// Copyright (c) 2022 NetEase, Inc. All rights reserved.
//// Use of this source code is governed by a MIT license that can be
//// found in the LICENSE file.
//
//package com.hbl.lewan.main;
//
//import com.netease.nimlib.sdk.avsignalling.constant.ChannelType;
//import com.netease.nimlib.sdk.msg.MessageBuilder;
//import com.netease.nimlib.sdk.msg.attachment.NetCallAttachment;
//import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
//import com.netease.nimlib.sdk.msg.model.IMMessage;
//import com.netease.yunxin.kit.alog.ALog;
//import com.netease.yunxin.kit.alog.ParameterMap;
//import com.netease.yunxin.kit.chatkit.repo.ChatRepo;
//import com.netease.yunxin.kit.common.utils.NetworkUtils;
//import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall;
//import com.netease.yunxin.nertc.nertcvideocall.model.impl.DefaultCallOrderImpl;
//import com.netease.yunxin.nertc.nertcvideocall.model.impl.state.CallState;
//import com.netease.yunxin.nertc.nertcvideocall.utils.CallParams;
//import com.netease.yunxin.nertc.nertcvideocall.utils.NrtcCallStatus;
//import java.util.Collections;
//import java.util.List;
//
//class CustomCallOrderHelper extends DefaultCallOrderImpl {
// private static final String TAG = "CustomCallOrderHelper";
//
// @Override
// public void onCanceled(ChannelType channelType, String accountId, int callType) {
// ALog.dApi(
// TAG,
// new ParameterMap("onCanceled")
// .append("channelType", channelType)
// .append("callType", callType)
// .append("accountId", accountId)
// .append("enableOrder", isEnable())
// .toValue());
// if (!isEnable()) {
// return;
// }
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType);
// }
//
// @Override
// public void onReject(ChannelType channelType, String accountId, int callType) {
// ALog.dApi(
// TAG,
// new ParameterMap("onReject")
// .append("channelType", channelType)
// .append("callType", callType)
// .append("accountId", accountId)
// .append("enableOrder", isEnable())
// .toValue());
// if (!isEnable()) {
// return;
// }
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusRejected, callType);
// }
//
// @Override
// public void onTimeout(ChannelType channelType, String accountId, int callType) {
// ALog.dApi(
// TAG,
// new ParameterMap("onTimeout")
// .append("channelType", channelType)
// .append("callType", callType)
// .append("accountId", accountId)
// .append("enableOrder", isEnable())
// .toValue());
// if (!isEnable()) {
// return;
// }
// if (NERTCVideoCall.sharedInstance().getCurrentState() == CallState.STATE_INVITED) {
// return;
// }
// if (NetworkUtils.isConnected()) {
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusTimeout, callType);
// } else {
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType);
// }
// }
//
// @Override
// public void onBusy(ChannelType channelType, String accountId, int callType) {
// ALog.dApi(
// TAG,
// new ParameterMap("onBusy")
// .append("channelType", channelType)
// .append("callType", callType)
// .append("accountId", accountId)
// .append("enableOrder", isEnable())
// .toValue());
// if (!isEnable()) {
// return;
// }
// sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusBusy, callType);
// }
//
// public static void sendOrder(
// ChannelType channelType, String accountId, int status, int callType) {
// sendOrder(channelType, accountId, status, Collections.emptyList(), callType);
// }
//
// public static void sendOrder(
// ChannelType channelType,
// String accountId,
// int status,
// List<NetCallAttachment.Duration> durations,
// int callType) {
// ALog.dApi(
// TAG,
// new ParameterMap("sendOrder")
// .append("status", status)
// .append("channelType", channelType)
// .append("callType", callType)
// .append("durations", durations)
// .append("accountId", accountId)
// .toValue());
// if (callType == CallParams.CallType.P2P) {
// NetCallAttachment netCallAttachment =
// new NetCallAttachment.NetCallAttachmentBuilder()
// .withType(channelType != null ? channelType.getValue() : ChannelType.VIDEO.getValue())
// .withStatus(status)
// .withDurations(durations)
// .build();
// IMMessage message =
// MessageBuilder.createNrtcNetcallMessage(
// accountId, SessionTypeEnum.P2P, netCallAttachment);
// ChatRepo.sendMessage(message, true, null);
// }
// }
//}

888
app/src/main/java/com/hbl/lewan/main/index/Index2Fragment.java
View File

@@ -1,888 +0,0 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.index;
import static com.netease.yunxin.kit.chatkit.ui.fun.FunChatForwardSelectDialog.TAG;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.LIB_TAG;
import static com.netease.yunxin.kit.contactkit.ui.selector.BaseContactSelectorActivity.DEFAULT_MAX_SELECT_COUNT;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_CONTACT_SELECTOR_MAX_COUNT;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_REQUEST_SELECTOR_NAME_ENABLE;
import android.app.Activity;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentIndex2Binding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.index.adapter.IndexContactAdapter;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
import com.hbl.lewan.main.mine.setting.SettingNewActivity;
import com.hbl.lewan.model.AiChatUpdateEvent;
import com.hbl.lewan.model.AiMessageBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.model.UserUpdateEvent;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.NfcReaderActivity;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.FileUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.model.ConversationInfo;
import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.chatkit.ui.fun.FunChatForwardSelectDialog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.common.ui.utils.AvatarColor;
import com.netease.yunxin.kit.common.ui.utils.TimeFormatUtils;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;
import com.netease.yunxin.kit.common.ui.viewmodel.LoadStatus;
import com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
import com.netease.yunxin.kit.contactkit.ui.contact.ContactViewModel;
import com.netease.yunxin.kit.contactkit.ui.fun.search.FunSearchActivity;
import com.netease.yunxin.kit.contactkit.ui.model.BaseContactBean;
import com.netease.yunxin.kit.contactkit.ui.model.ContactFriendBean;
import com.netease.yunxin.kit.contactkit.ui.model.ContactTeamBean;
import com.netease.yunxin.kit.contactkit.ui.model.ContactVerifyInfoBean;
import com.netease.yunxin.kit.contactkit.ui.team.TeamListViewModel;
import com.netease.yunxin.kit.contactkit.ui.utils.ColorUtils;
import com.netease.yunxin.kit.contactkit.ui.verify.VerifyViewModel;
import com.netease.yunxin.kit.conversationkit.ui.TimeConversationUtils;
import com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant;
import com.netease.yunxin.kit.conversationkit.ui.model.ConversationBean;
import com.netease.yunxin.kit.conversationkit.ui.page.viewmodel.ConversationViewModel;
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.event.EventNotify;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
import com.netease.yunxin.kit.corekit.im.provider.FetchCallback;
import com.netease.yunxin.kit.corekit.im.repo.CommonRepo;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import io.reactivex.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers;
@Deprecated
//首页 特别关注，好友，群组列表
public class Index2Fragment extends BaseFragment {
private FragmentIndex2Binding binding;
CommonAdapter commonAdapterReadContents;
List<UsersExistBean> usersExistBeans = new ArrayList<>();
List<UsersExistBean> usersExistBeansShouQi = new ArrayList<>();
boolean isFollowShouQi = true;
public androidx.lifecycle.Observer<FetchResult<List<ContactFriendBean>>> contactFriendObserver; //联系人变更
public androidx.lifecycle.Observer<FetchResult<List<ContactTeamBean>>> contactGroupObserver; //群组
public androidx.lifecycle.Observer<FetchResult<List<ConversationBean>>> conversationObserver; //获取会话
public androidx.lifecycle.Observer<FetchResult<List<ConversationBean>>> changeConversationObserver; //会话变更
private Observer<FetchResult<List<ContactVerifyInfoBean>>> verifyObserver;
private com.netease.nimlib.sdk.Observer<List<Team>> teamUpdateObserver;
//联系人，会话model
public ContactViewModel viewModelFriends;
public TeamListViewModel viewModelGroup;
public ConversationViewModel conversationViewModel;
protected VerifyViewModel verifyViewModel;
private IndexContactAdapter teamContactAdapter;
private IndexContactAdapter friendContactAdapter;
private ActivityResultLauncher launcher;
// private MainActivity mainActivity;
protected final EventNotify<TeamUpdateEvent> teamUpdateEvent =
new EventNotify<TeamUpdateEvent>() {
@Override
public void onNotify(@NonNull TeamUpdateEvent teamUpdateEvent) {
//更新头像
LogUtils.i("te");
if (teamUpdateEvent.getTeam() != null) {
updateTeamContactData(teamUpdateEvent.getTeam());
}
}
@NonNull
@Override
public String getEventType() {
return TeamUpdateEvent.EVENT_TYPE;
}
};
protected final EventNotify<AiChatUpdateEvent> stringUpdateEvent =
new EventNotify<AiChatUpdateEvent>() {
@Override
public void onNotify(@NonNull AiChatUpdateEvent stringupdate) {
//更新头像
LogUtils.i("te");
if (!TextUtils.isEmpty(stringupdate.contentvalue)) {
binding.tvIndexfmAicontent.setText(stringupdate.contentvalue);
} else {
binding.tvIndexfmAicontent.setText(getString(R.string.aihint_txt));
}
}
@NonNull
@Override
public String getEventType() {
return AiChatUpdateEvent.EVENT_TYPE;
}
};
protected final EventNotify<UserUpdateEvent> userupdateEvent =
new EventNotify<UserUpdateEvent>() {
@Override
public void onNotify(@NonNull UserUpdateEvent stringupdate) {
//更新用户信息
LogUtils.i("te");
refrshUser(IMKitClient.account());
}
@NonNull
@Override
public String getEventType() {
return UserUpdateEvent.EVENT_TYPE;
}
};
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
binding = FragmentIndex2Binding.inflate(inflater);
verifyViewModel = new ViewModelProvider(this).get(VerifyViewModel.class);
viewModelFriends = new ViewModelProvider(this).get(ContactViewModel.class);
viewModelGroup = new ViewModelProvider(this).get(TeamListViewModel.class);
viewModelGroup.configRoutePath(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE);
conversationViewModel = new ViewModelProvider(this).get(ConversationViewModel.class);
conversationViewModel.setComparator(conversationComparator); //排序
return binding.getRoot();
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// launcher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
// if (result.getResultCode() == Activity.RESULT_OK) {
// boolean update = result.getData().getBooleanExtra("update", false);
// if (update) {
// setAichatHistory();
// }
// }
// });
initView();
refrshUser(IMKitClient.account());
EventCenter.registerEventNotify(teamUpdateEvent);
EventCenter.registerEventNotify(stringUpdateEvent);
EventCenter.registerEventNotify(userupdateEvent);
observerData();
registerObserver();
}
private void observerData() {
//获取会话
// conversationObserver =
// result ->
// {
// if (result.getLoadStatus() == LoadStatus.Success) {
// ALog.d(ConversationConstant.LIB_TAG, TAG, "DeleteLiveData, Success");
// if (result.getData() == null) {
// return;
// }
//
// updateConversationListData(result.getData());
//
//
// } else if (result.getLoadStatus() == LoadStatus.Finish
// && result.getType() == FetchResult.FetchType.Remove) {
// ALog.d(ConversationConstant.LIB_TAG, TAG, "DeleteLiveData, Success");
// if (result.getData() == null) {
// return;
// }
// updateConversationListData(result.getData());
// }
// };
changeConversationObserver =
result -> {
if (result.getLoadStatus() == LoadStatus.Success) {
ALog.d(ConversationConstant.LIB_TAG, TAG, "ChangeLiveData, Success");
//更新
if (result.getData() == null) {
return;
}
updateConversationListData(result.getData());
updateConversation(result.getData());
} else if (result.getLoadStatus() == LoadStatus.Finish
&& result.getType() == FetchResult.FetchType.Remove) {
//如果会话删除
ALog.d(ConversationConstant.LIB_TAG, TAG, "ChangeLiveData, delete");
if (result.getData() == null) {
return;
}
updateConversationListData(result.getData());
updateConversation(result.getData());
}
};
contactFriendObserver =
contactBeansResult ->
{
if (contactBeansResult.getLoadStatus() == LoadStatus.Success) {
ALog.d(LIB_TAG, TAG, "contactObserver, Success");
if (contactBeansResult.getData() != null) {
// 获取好友列表
setFriendContactData(contactBeansResult.getData());
}
} else if (contactBeansResult.getLoadStatus() == LoadStatus.Finish) {
if (contactBeansResult.getType() == FetchResult.FetchType.Add
&& contactBeansResult.getData() != null) {
ALog.d(LIB_TAG, TAG, "contactObserver,Add");
// 获取好友列表
addFriendContactData(contactBeansResult.getData());
} else if (contactBeansResult.getType() == FetchResult.FetchType.Remove
&& contactBeansResult.getData() != null) {
ALog.d(LIB_TAG, TAG, "contactObserver,Remove");
removeFriendContactData(contactBeansResult.getData());
} else if (contactBeansResult.getType() == FetchResult.FetchType.Update
&& contactBeansResult.getData() != null) {
ALog.d(LIB_TAG, TAG, "contactObserver,Update");
updateFriendContactData(contactBeansResult.getData());
}
}
setFriendsNumber();
};
contactGroupObserver = groupresult ->
{
if (groupresult.getLoadStatus() == LoadStatus.Success) {
LogUtils.i("获取群");
if (groupresult.getData() != null) {
setTeamContactData(groupresult.getData());
}
} else if (groupresult.getLoadStatus() == LoadStatus.Finish) {
if (groupresult.getType() == FetchResult.FetchType.Add) {
LogUtils.i("新增群");
addTeamContactData(groupresult.getData());
} else if (groupresult.getType() == FetchResult.FetchType.Remove) {
LogUtils.i("移除群");
removeTeamContactData(groupresult.getData());
}
}
setTeamGroupNumber();
};
verifyObserver = listFetchResult -> {
if (listFetchResult.getData() != null) {
verifyViewModel.getUnreadCount(new FetchCallback<Integer>() {
@Override
public void onSuccess(@Nullable Integer integer) {
if (integer > 0) {
binding.viewChatfmFrinedspoint.setVisibility(View.VISIBLE);
} else {
binding.viewChatfmFrinedspoint.setVisibility(View.GONE);
}
}
@Override
public void onFailed(int i) {
}
@Override
public void onException(@Nullable Throwable throwable) {
}
});
}
};
viewModelFriends.fetchContactList();
viewModelGroup.fetchTeamList();
// conversationViewModel.fetchConversation();
verifyViewModel.fetchVerifyList(false);
getFollow();
}
private boolean showAllFriends = false;
private boolean showAllTeam = false;
public void initView() {
RxBus.getInstance().toObservable(Integer.class)
.subscribeOn(Schedulers.io())
.unsubscribeOn(Schedulers.io())
.subscribe(changeImageViewBean -> {//回顶部
if (changeImageViewBean == IMUIKitConfig.CHANGE_FOLLOW_USER) {
LogUtils.i("更新一下数据不过分吧");
getFollow();
}
});
// mainActivity = (MainActivity) getActivity();
binding.ivIndexfmAihead.setData(R.mipmap.ic_logo, "");
binding.avIndexfraHead.setOnClickListener(v -> startUserInfoActivity(IMKitClient.account()));
setAichatHistory();
binding.layoutIndexfmAddfriends.setOnClickListener(view -> {
startaddFriends();
});
binding.ivIndexfmAddfriendtop.setOnClickListener(view -> {
startaddFriends();
});
binding.ivIndexfmNotifytop.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), FunVerifyListActivity.class));
binding.viewChatfmFrinedspoint.setVisibility(View.GONE);
});
binding.layoutIndexfmAddgroup.setOnClickListener(view -> {
startCreateGroup();
}
);
binding.layoutIndexfmSearch.getRoot().setOnClickListener(view -> startActivity(new Intent(getActivity(), FunSearchActivity.class))
);
binding.ivIndexfmSettingtop.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), SettingNewActivity.class));
// MainActivity activity = (MainActivity) getActivity();
// activity.toSetting();
});
binding.layoutIndexfmSearch.ivCommonsearchScan.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toScan();
});
binding.saoyisaoTv.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toScan();
});
binding.zhuanzhangTv.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toTlt();
});
binding.wawajiLy.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
MainActivity activity = (MainActivity) getActivity();
activity.toTlt();
}
});
binding.fukuanTv.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toSShop(false);
});
// binding.fukuanTv.setOnLongClickListener(new View.OnLongClickListener() {
// @Override
// public boolean onLongClick(View v) {
// MainActivity activity = (MainActivity) getActivity();
// activity.toSShop(true);
// return false;
// }
// });
binding.shoukuanTv.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toQrcode();
});
binding.tvIndexfmFriendspull.setOnClickListener(view -> {
showAllFriends = !showAllFriends;
if (showAllFriends) {
Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_up);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
binding.tvIndexfmFriendspull.setCompoundDrawables(null, null, drawable, null);
} else {
Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_down);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
binding.tvIndexfmFriendspull.setCompoundDrawables(null, null, drawable, null);
}
friendContactAdapter.setShowAll(showAllFriends);
friendContactAdapter.notifyDataSetChanged();
});
binding.tvIndexfmGrouppull.setOnClickListener(view -> {
showAllTeam = !showAllTeam;
if (showAllTeam) {
Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_up);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
binding.tvIndexfmGrouppull.setCompoundDrawables(null, null, drawable, null);
} else {
Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_down);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
binding.tvIndexfmGrouppull.setCompoundDrawables(null, null, drawable, null);
}
teamContactAdapter.setShowAll(showAllTeam);
teamContactAdapter.notifyDataSetChanged();
});
binding.layoutIndexfmAichat.setOnClickListener(view -> {
//launcher
// launcher.launch(new Intent(getActivity(), AiChatActivity.class));
// startActivity(new Intent(getActivity(), AiChatActivity.class));
});
binding.tvIndexfmTbgzpull.setOnClickListener(v -> {
if (isFollowShouQi) {
commonAdapterReadContents.setDates(usersExistBeans);
Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_up);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
binding.tvIndexfmTbgzpull.setCompoundDrawables(null, null, drawable, null);
} else {
commonAdapterReadContents.setDates(usersExistBeansShouQi);
Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_down);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
binding.tvIndexfmTbgzpull.setCompoundDrawables(null, null, drawable, null);
}
isFollowShouQi = !isFollowShouQi;
});
binding.contactfriends.setLayoutManager(new LinearLayoutManager(getActivity()));
binding.contactgroups.setLayoutManager(new LinearLayoutManager(getActivity()));
friendContactAdapter = new IndexContactAdapter(getActivity());
teamContactAdapter = new IndexContactAdapter(getActivity());
friendContactAdapter.setShowAll(showAllFriends);
teamContactAdapter.setShowAll(showAllTeam);
binding.contactfriends.setAdapter(friendContactAdapter);
binding.contactgroups.setAdapter(teamContactAdapter);
usersExistBeans = ShareDateUtils.getFollowUsers();
if (usersExistBeans == null) {
usersExistBeans = new ArrayList<>();
usersExistBeansShouQi = new ArrayList<>();
binding.tebieguanzhuLy.setVisibility(View.GONE);
} else {
if (usersExistBeans.size() > 3) {
usersExistBeansShouQi = usersExistBeans.subList(0, 3);
} else {
usersExistBeansShouQi = usersExistBeans;
}
binding.tebieguanzhuLy.setVisibility(View.VISIBLE);
}
initAdapterRed();
AnimUtil.setAnimViews(1.1f, binding.wawajiLy, binding.saoyisaoTv, binding.zhuanzhangTv, binding.fukuanTv, binding.shoukuanTv);
}
public void setAichatHistory() {
String value = FileUtils.getChatData(getActivity());
if (!TextUtils.isEmpty(value)) {
List<AiMessageBean> aiMessageBean = GsonUtils.getListFromJSON(value, AiMessageBean.class);
LogUtils.i("aimessagebean-" + aiMessageBean.size());
value = aiMessageBean.size() == 0 ? getString(R.string.aihint_txt) : aiMessageBean.get(aiMessageBean.size() - 1).getMessage();
binding.tvIndexfmAicontent.setText(value);
}
}
private void initAdapterRed() {
binding.contacttbgz.setLayoutManager(new LinearLayoutManager(getActivity()));
commonAdapterReadContents = new CommonAdapter<>(getActivity(), R.layout.follow_child_item1, usersExistBeansShouQi) {
@Override
public void convert(ViewHolder holder, UsersExistBean s, int index) {
LogUtils.i("执行了：" + GsonUtils.beanToJSONString(s));
ContactAvatarView contactAvatarView = holder.getView(R.id.logo_iv);
ColorUtils.loadAvator(s.getAvatar(), contactAvatarView);
// contactAvatarView.setData(
// s.getAvatar(), s.getNickname(), AvatarColor.avatarColor(s.getUserId() + ""));
holder.setText(R.id.item_title_tv, s.getNickname());
RecentContact recentContact = NIMClient.getService(MsgService.class).queryRecentContact(s.getUserId() + "", SessionTypeEnum.P2P);
holder.getView(R.id.item_time_tv).setVisibility(View.GONE);
holder.setText(R.id.item_msg_tv, getString(R.string.nmhmylg_txt));
if (recentContact != null) {
// if (recentContact.getUnreadCount() > 0) {
// int count = recentContact.getUnreadCount();
// String content;
// if (count >= 100) {
// content = "99+";
// } else {
// content = String.valueOf(count);
// }
// holder.setText(R.id.unreadTv, content);
// holder.getView(R.id.unreadTv).setVisibility(View.VISIBLE);
// } else {
// holder.getView(R.id.unreadTv).setVisibility(View.GONE);
// }
holder.getView(R.id.item_time_tv).setVisibility(View.VISIBLE);
holder.setText(R.id.item_time_tv, TimeConversationUtils.formatMillisecond(getActivity(), recentContact.getTime()));
holder.setText(R.id.item_msg_tv, TextUtils.isEmpty(recentContact.getContent()) ? getString(R.string.nmhmylg_txt) : recentContact.getContent());
if (recentContact.getContent().equals("[自定义消息]")) {
String bean = GsonUtils.beanToJSONString(recentContact.getAttachment());
try {
JSONObject jsonObject = new JSONObject(bean);
switch ((int) jsonObject.get("type")) {
case 1002:
holder.setText(R.id.item_msg_tv, getString(R.string.voom_message_txt));
break;
case 1003:
holder.setText(R.id.item_msg_tv, getString(com.netease.yunxin.kit.chatkit.ui.R.string.gerenminp_txt));
break;
case 1004:
holder.setText(R.id.item_msg_tv, getString(com.netease.yunxin.kit.contactkit.ui.R.string.zhuanzhang_chat_txt));
break;
case 1005:
case 1006:
holder.setText(R.id.item_msg_tv, getString(com.netease.yunxin.kit.contactkit.ui.R.string.hongbao_chat_txt));
break;
}
} catch (JSONException e) {
throw new RuntimeException(e);
}
}
} else {
holder.getView(R.id.unreadTv).setVisibility(View.GONE);
}
holder.getView(R.id.big_ly).setOnClickListener(v ->
// XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_P2P_PAGE)
// .withParam(RouterConstant.CHAT_ID_KRY, s.getUserId() + "")
// .withContext(requireActivity())
// .navigate());
XKitRouter.withKey(RouterConstant.PATH_FUN_USER_INFO_PAGE)
.withContext(requireActivity())
.withParam(
"uid",
s.getUserId() + "")
.withParam("userId", s.getUserId() + "")
.withParam("isGroup", false)
.navigate());
}
};
binding.contacttbgz.setAdapter(commonAdapterReadContents);
}
//初始化设置好友数据
public void setFriendContactData(List<ContactFriendBean> list) {
friendContactAdapter.setData(list,0);
}
public void addFriendContactData(List<ContactFriendBean> list) {
friendContactAdapter.addFriendDataList(list);
}
public void removeFriendContactData(List<ContactFriendBean> list) {
friendContactAdapter.removeDataList(list);
}
public void updateFriendContactData(List<ContactFriendBean> list) {
friendContactAdapter.updateFriendDataList(list);
}
public void setFriendsNumber() {
if (binding != null) {
int size = friendContactAdapter.getData().size();
if (size > 0) {
binding.tvIndexfmFriendstitle.setText(getString(R.string.haoyou_txt) + " " + size);
binding.layoutIndexfmAddfriends.setVisibility(View.GONE);
} else {
binding.layoutIndexfmAddfriends.setVisibility(View.VISIBLE);
}
binding.tvIndexfmFriendspull.setVisibility(size > 3 ? View.VISIBLE : View.GONE);
}
}
//初始化设置群友数据
public void setTeamContactData(List<ContactTeamBean> list) {
teamContactAdapter.setData(list,1);
}
public void addTeamContactData(List<ContactTeamBean> list) {
teamContactAdapter.addTeamDataList(list);
}
public void removeTeamContactData(List<ContactTeamBean> list) {
teamContactAdapter.removeDataList(list);
}
public void updateTeamContactData(Team team) {
List<BaseContactBean> teamBeans = teamContactAdapter.getData();
for (int i = 0; i < teamBeans.size(); i++) {
ContactTeamBean teamBean = (ContactTeamBean) teamBeans.get(i);
if (teamBean.data.getId().equals(team.getId())) {
teamBean.data = team;
teamContactAdapter.updateTeamDataIconItem(teamBean, i);
}
}
}
public void setTeamGroupNumber() {
int size = teamContactAdapter.getData().size();
if (binding != null) {
if (size > 0) {
binding.tvIndexfmGrouptitle.setText(getString(R.string.group_text) + " " + size);
binding.layoutIndexfmAddgroup.setVisibility(View.GONE);
} else {
binding.layoutIndexfmAddgroup.setVisibility(View.VISIBLE);
}
binding.tvIndexfmGrouppull.setVisibility(size > 3 ? View.VISIBLE : View.GONE);
}
}
//更新会话数据
public void updateConversationListData(List<ConversationBean> list) {
for (ConversationBean conversationBean : list) {
if (conversationBean.infoData.getFriendInfo() != null) {
friendContactAdapter.updateFriendDataContentItem(conversationBean.infoData);
}
if (conversationBean.infoData.getTeamInfo() != null) {
teamContactAdapter.updateTeamDataContentItem(conversationBean.infoData);
}
}
}
List<UsersExistBean> listFollow = new ArrayList<>();
//更新特别关注的会话记录
public void updateConversation(List<ConversationBean> list) {
for (ConversationBean bean : list) {
if (bean.infoData.getFriendInfo() != null) {
listFollow.clear();
if (isFollowShouQi) {
listFollow.addAll(usersExistBeans);
} else {
listFollow.addAll(usersExistBeansShouQi);
}
for (UsersExistBean existBean : listFollow) {
if (String.valueOf(existBean.getUserId()).equals(bean.infoData.getFriendInfo().getAccount())) {
int index = listFollow.indexOf(existBean);
if (index >= 0) {
commonAdapterReadContents.notifyItemChanged(index);
break;
}
}
}
}
}
}
public void startUserInfoActivity(String userid) {
XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
.withContext(getActivity())
.withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, IMKitClient.account())
.withParam("userId", userid)
.navigate();
}
public void startCreateGroup() {
startActivity(new Intent(getActivity(), FunContactSelectorActivity.class).putExtra(KEY_CONTACT_SELECTOR_MAX_COUNT, DEFAULT_MAX_SELECT_COUNT).putExtra(KEY_REQUEST_SELECTOR_NAME_ENABLE, true));
}
public void startaddFriends() {
startActivity(new Intent(getActivity(), AddFriendsActivity.class));
}
private Comparator<ConversationInfo> conversationComparator =
(bean1, bean2) -> {
int result;
if (bean1 == null) {
result = 1;
} else if (bean2 == null) {
result = -1;
} else if (bean1.isStickTop() == bean2.isStickTop()) {
long time = bean1.getTime() - bean2.getTime();
result = time == 0L ? 0 : (time > 0 ? -1 : 1);
} else {
result = bean1.isStickTop() ? -1 : 1;
}
ALog.d(ConversationConstant.LIB_TAG, TAG, "conversationComparator, result:" + result);
return result;
};
public void refrshUser(String account) {
CommonRepo.getUserInfo(
account,
new FetchCallback<UserInfo>() {
@Override
public void onSuccess(@Nullable UserInfo param) {
if (param != null) {
updateUI(param);
}
}
@Override
public void onFailed(int code) {
ToastX.showShortToast(R.string.user_fail);
updateUI(new UserInfo(account, account, ""));
}
@Override
public void onException(@Nullable Throwable exception) {
ToastX.showShortToast(R.string.user_fail);
updateUI(new UserInfo(account, account, ""));
}
});
}
private void updateUI(UserInfo userInfo) {
String name =
TextUtils.isEmpty(userInfo.getName()) ? userInfo.getAccount() : userInfo.getName();
String avaterurl = userInfo.getAvatar();
if (TextUtils.isEmpty(avaterurl)) {
binding.avIndexfraHead.setData(
R.mipmap.default_head_img, name, AvatarColor.avatarColor(IMKitClient.account()));
} else {
binding.avIndexfraHead.setData(
userInfo.getAvatar(), name, AvatarColor.avatarColor(IMKitClient.account()));
}
// binding.tvIndexfraNick.setText(name);
// binding.tvIndexfraId.setText("CHEATID：" + IMKitClient.account());
}
// @Override
// public void onResume() {
// super.onResume();
// ALog.d(Constant.PROJECT_TAG, "MineFragment:onResume");
// refrshUser(IMKitClient.account());
// }
private void getFollow() {
Api.getInstance().followList()
.subscribeOn(io.reactivex.schedulers.Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<ListBeanResult<UsersExistBean>> feedbackResp) {
LogUtils.i("获取到的列表111111:" + GsonUtils.beanToJSONString(feedbackResp));
if (feedbackResp.data != null && feedbackResp.data.getList() != null && feedbackResp.data.getList().size() > 0) {
usersExistBeans = feedbackResp.data.getList();
DataUtils.set(getActivity(), IMUIKitConfig.FOLLOW_USER_TAG + "_" + IMKitClient.account(), GsonUtils.beanToJSONString(usersExistBeans));
ChatDataUtils.set(getActivity(), "follow_user" + "_" + IMKitClient.account(), GsonUtils.beanToJSONString(usersExistBeans));
if (usersExistBeans.size() > 3) {
usersExistBeansShouQi = usersExistBeans.subList(0, 3);
} else {
usersExistBeansShouQi = usersExistBeans;
}
if (isFollowShouQi) {
commonAdapterReadContents.setDates(usersExistBeansShouQi);
} else {
commonAdapterReadContents.setDates(usersExistBeans);
}
binding.tvIndexfmTbgzpull.setVisibility(usersExistBeans.size() > 3 ? View.VISIBLE : View.GONE);
binding.tebieguanzhuLy.setVisibility(View.VISIBLE);
binding.tvIndexfmTbgztitle.setText(getActivity().getResources().getString(R.string.tebiezhuanzhu_txt) + " " + usersExistBeans.size());
} else {
binding.tebieguanzhuLy.setVisibility(View.GONE);
}
}
@Override
public void onError(int code, String msg) {
LogUtils.i("获取到的错误:" + code + "" + msg);
binding.tebieguanzhuLy.setVisibility(View.GONE);
}
});
}
@Override
public void onDestroyView() {
super.onDestroyView();
unregisterObserver();
EventCenter.unregisterEventNotify(teamUpdateEvent);
EventCenter.unregisterEventNotify(stringUpdateEvent);
EventCenter.unregisterEventNotify(userupdateEvent);
}
private void registerObserver() {
viewModelFriends.getContactLiveData().observeForever(contactFriendObserver);
viewModelGroup.getFetchResult().observeForever(contactGroupObserver);
// conversationViewModel.getQueryLiveData().observeForever(conversationObserver);
conversationViewModel.getChangeLiveData().observeForever(changeConversationObserver);
verifyViewModel.getFetchResult().observeForever(verifyObserver);
}
public void unregisterObserver() {
viewModelFriends.getContactLiveData().removeObserver(contactFriendObserver);
viewModelGroup.getFetchResult().removeObserver(contactGroupObserver);
// conversationViewModel.getQueryLiveData().removeObserver(conversationObserver);
conversationViewModel.getChangeLiveData().observeForever(changeConversationObserver);
verifyViewModel.getFetchResult().observeForever(verifyObserver);
}
}

2
app/src/main/java/com/hbl/lewan/AppSkinConfig.java → app/src/main/java/com/hbl/yuliao/AppSkinConfig.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan;
package com.hbl.yuliao;
import com.netease.yunxin.kit.corekit.im.utils.PreferenceUtils;

4
app/src/main/java/com/hbl/lewan/CustomConfig.java → app/src/main/java/com/hbl/yuliao/CustomConfig.java
View File

@@ -2,11 +2,11 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan;
package com.hbl.yuliao;
import android.content.Context;
import com.hbl.lewan.custom.ChatStickerViewHolder;
import com.hbl.yuliao.custom.ChatStickerViewHolder;
import android.graphics.Color;

44
app/src/main/java/com/hbl/lewan/IMApplication.java → app/src/main/java/com/hbl/yuliao/IMApplication.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan;
package com.hbl.yuliao;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.PATH_FUN_TEAM_SETTING_PAGE;
@@ -17,9 +17,9 @@ import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import com.hbl.lewan.imkit.team.TeamAnnouncementActivity;
import com.hbl.lewan.map.LocationPageActivity1;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.imkit.team.TeamAnnouncementActivity;
import com.hbl.yuliao.map.LocationPageActivity1;
import com.hbl.yuliao.utils.GsonUtils;
import com.heytap.msp.push.HeytapPushManager;
import com.netease.yunxin.kit.chatkit.model.IMMessageInfo;
import com.netease.yunxin.kit.chatkit.repo.ChatObserverRepo;
@@ -35,24 +35,24 @@ import androidx.annotation.Nullable;
import androidx.multidex.MultiDexApplication;
import com.blankj.utilcode.util.LanguageUtils;
import com.hbl.lewan.contact.ContactGroupSettingActivity;
import com.hbl.lewan.contact.FunBlackListActivity;
import com.hbl.lewan.imkit.person.PersonSettingActivity;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.imkit.team.TeamSettingActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.mine.MineInfoActivity;
import com.hbl.lewan.contact.UserInfoActivity;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.push.PushMessageHandler;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.TiktoInfokActivity;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.contact.ContactGroupSettingActivity;
import com.hbl.yuliao.contact.FunBlackListActivity;
import com.hbl.yuliao.imkit.person.PersonSettingActivity;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.imkit.team.TeamSettingActivity;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.mine.MineInfoActivity;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.push.PushMessageHandler;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.TiktoInfokActivity;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.nimlib.sdk.SDKOptions;
import com.netease.nimlib.sdk.auth.LoginInfo;

34
app/src/main/java/com/hbl/lewan/IMUIKitConfig.java → app/src/main/java/com/hbl/yuliao/IMUIKitConfig.java
View File

@@ -1,7 +1,7 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan;
package com.hbl.yuliao;
import com.netease.yunxin.kit.chatkit.ui.network.ApiService;
@@ -16,10 +16,10 @@ public class IMUIKitConfig {
public static String LOC_COUNTRY_CODE = "loc_country_code";
public static String RBCHAT_PRIVACY_CN_URL = "http://download.bijr3t.com/userAgreement.html?v=" + System.currentTimeMillis();
public static String RBCHAT_SERVICE_CN_URL = "http://download.bijr3t.com/serviceAgreement.html?v=" + System.currentTimeMillis(); //服务协议
public static String RBCHAT_PRIVACY_CN_URL = "http://download.yuliao666.top/userAgreement.html?v=" + System.currentTimeMillis();
public static String RBCHAT_SERVICE_CN_URL = "http://download.yuliao666.top/serviceAgreement.html?v=" + System.currentTimeMillis(); //服务协议
public static String MIANMI_AGREEMENT_CN_URL = "http://download.bijr3t.com/nopwdAgreement.html?v=" + System.currentTimeMillis(); //免密协议
public static String MIANMI_AGREEMENT_CN_URL = "http://download.yuliao666.top/nopwdAgreement.html?v=" + System.currentTimeMillis(); //免密协议
public static String SUBSTATIONID = ApiService.SUBSTATIONID;
@@ -35,19 +35,19 @@ public class IMUIKitConfig {
/**
* 支付地址
*/
public static String ONLINE_PAYMENT_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "http://admin.bijr3t.com/#/appPay" : "https://admin-test.bijr3t.com/#/appPay";
// public static String ONLINE_PAYMENT_URL = "http://admin.bijr3t.com/#/appPay";
public static String ONLINE_PAYMENT_URL = ApiService.URL.equals("https://api.yuliao666.top/") ? "http://admin.yuliao666.top/#/appPay" : "https://admin-test.yuliao666.top/#/appPay";
// public static String ONLINE_PAYMENT_URL = "http://admin.yuliao666.top/#/appPay";
/**
* 分享落地页二维码地址
*/
// public static String SHARE_INVCODE = "http://qtalk666.top/#/download?code=%s";
public static String SHARE_INVCODE = "http://admin.bijr3t.com/#/downLoad?code=%s&userId=%s";
public static String SHARE_INVCODEGROUP = "http://admin.bijr3t.com/#/downLoad?code=%s&teamId=%s";
public static String SHARE_INVCODEGROUP1 = "http://admin.bijr3t.com/#/downLoad?teamId=%s";
public static String SHARE_INVCODE = "http://admin.yuliao666.top/#/downLoad?code=%s&userId=%s";
public static String SHARE_INVCODEGROUP = "http://admin.yuliao666.top/#/downLoad?code=%s&teamId=%s";
public static String SHARE_INVCODEGROUP1 = "http://admin.yuliao666.top/#/downLoad?teamId=%s";
public static String SHARE_INVCODE1 = "http://admin.bijr3t.com/#/downLoad?userId=%s";
public static String SHARE_INVCODE_START = "http://admin.bijr3t.com/#/downLoad";
public static String SHARE_INVCODE1 = "http://admin.yuliao666.top/#/downLoad?userId=%s";
public static String SHARE_INVCODE_START = "http://admin.yuliao666.top/#/downLoad";
/***
* 分享用户ID 二维码
@@ -125,7 +125,7 @@ public class IMUIKitConfig {
* 娃娃机地址
*/
// public static String WAWAJ_PATH =ApiService.URL.equals("https://api.letschat2023.com/")?"https://toy.letschat2023.com/#/?authorizeCode=":"http://toy.newsclub666.com/#/?authorizeCode=";
public static String WAWAJ_PATH = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://toy.letschat2023.com/#/" : "https://toy-test.letschat2023.com/#/";
public static String WAWAJ_PATH = ApiService.URL.equals("https://api.yuliao666.top/") ? "https://toy.letschat2023.com/#/" : "https://toy-test.letschat2023.com/#/";
/**
* 银币商城
@@ -139,24 +139,24 @@ public class IMUIKitConfig {
/**
* 银币商城
*/
public static String YINBI_PATH = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://shop.bijr3t.com/#/" : "https://shop.bijr3t.com/";
public static String YINBI_PATH = ApiService.URL.equals("https://api.yuliao666.top/") ? "https://shop.yuliao666.top/#/" : "https://shop.yuliao666.top/";
/**
* 商户管理
*/
public static String MERCHANT_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://biz.letschat2023.com/#/pages/owner/index" : "https://biz-test.letschat2023.com/#/pages/owner/index";
public static String MERCHANT_URL = ApiService.URL.equals("https://api.yuliao666.top/") ? "https://biz.letschat2023.com/#/pages/owner/index" : "https://biz-test.letschat2023.com/#/pages/owner/index";
/**
* 商户 用户
*/
public static String MERCHANT_USER_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://biz.letschat2023.com/#/" : "https://biz-test.letschat2023.com/#/";
public static String MERCHANT_USER_URL = ApiService.URL.equals("https://api.yuliao666.top/") ? "https://biz.letschat2023.com/#/" : "https://biz-test.letschat2023.com/#/";
/**
* 兑换积分
*/
public static String SILVER_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://shop.bijr3t.com/#/pages/scanexchange/index?tagCode=" : "https://shop-test.bijr3t.com/#/pages/scanexchange/index?tagCode=";
// public static String SILVER_URL = "https://shop.bijr3t.com/#/pages/scanexchange/index?tagCode=";
public static String SILVER_URL = ApiService.URL.equals("https://api.yuliao666.top/") ? "https://shop.yuliao666.top/#/pages/scanexchange/index?tagCode=" : "https://shop-test.yuliao666.top/#/pages/scanexchange/index?tagCode=";
// public static String SILVER_URL = "https://shop.yuliao666.top/#/pages/scanexchange/index?tagCode=";
// public static String SILVER_URL ="http://192.168.8.200:8080/#/pages/scanexchange/index?tagCode=" ;

14
app/src/main/java/com/hbl/lewan/NimSDKOptionConfig.java → app/src/main/java/com/hbl/yuliao/NimSDKOptionConfig.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan;
package com.hbl.yuliao;
import android.app.Notification;
import android.app.NotificationChannel;
@@ -15,10 +15,10 @@ import android.os.Build;
import android.os.Environment;
import android.text.TextUtils;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.push.PushUserInfoProvider;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.push.PushUserInfoProvider;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.nimlib.sdk.NotificationFoldStyle;
import com.netease.nimlib.sdk.SDKOptions;
import com.netease.nimlib.sdk.ServerAddresses;
@@ -36,7 +36,7 @@ import java.io.IOException;
public class NimSDKOptionConfig {
public static final String NOTIFY_SOUND_KEY =
"android.resource://com.hbl.lewan/raw/xxmoren";
"android.resource://com.hbl.yuliao/raw/xxmoren";
public static final int LED_ON_MS = 1000;
public static final int LED_OFF_MS = 1500;
@@ -193,7 +193,7 @@ public class NimSDKOptionConfig {
/**
* config app image/voice/file/log directory
* /storage/emulated/0/Android/data/com.hbl.lewan/cache
* /storage/emulated/0/Android/data/com.hbl.yuliao/cache
*/
static String getAppCacheDir(Context context) {
String storageRootPath = null;

4
app/src/main/java/com/hbl/lewan/NotificationMsgService.java → app/src/main/java/com/hbl/yuliao/NotificationMsgService.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan;
package com.hbl.yuliao;
import android.app.Notification;
import android.app.NotificationChannel;
@@ -16,7 +16,7 @@ import androidx.annotation.RequiresApi;
import androidx.core.app.NotificationCompat;
import androidx.core.app.ServiceCompat;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;

8
app/src/main/java/com/hbl/lewan/about/AboutActivity.java → app/src/main/java/com/hbl/yuliao/about/AboutActivity.java
View File

@@ -2,16 +2,16 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.about;
package com.hbl.yuliao.about;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.view.SupportMenuInflater;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityAboutBinding;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityAboutBinding;
import com.hbl.yuliao.utils.AppUtils;
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
public class AboutActivity extends AppCompatActivity {

8
app/src/main/java/com/hbl/lewan/adapter/CommonAdapter.java → app/src/main/java/com/hbl/yuliao/adapter/CommonAdapter.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.adapter;
package com.hbl.yuliao.adapter;
import android.content.Context;
import android.view.LayoutInflater;
@@ -8,9 +8,9 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ItemDragTouchHelper;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.ItemDragTouchHelper;
import com.hbl.yuliao.utils.LogUtils;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/adapter/CommunityAdapter.java → app/src/main/java/com/hbl/yuliao/adapter/CommunityAdapter.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.adapter;
package com.hbl.yuliao.adapter;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;

2
app/src/main/java/com/hbl/lewan/adapter/ViewHolder.java → app/src/main/java/com/hbl/yuliao/adapter/ViewHolder.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.adapter;
package com.hbl.yuliao.adapter;
import android.content.Context;
import android.util.SparseArray;

8
app/src/main/java/com/hbl/lewan/base/LllChatBaseActivity.java → app/src/main/java/com/hbl/yuliao/base/LllChatBaseActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.base;
package com.hbl.yuliao.base;
import android.os.Bundle;
import android.view.MotionEvent;
@@ -6,7 +6,7 @@ import android.view.inputmethod.InputMethodManager;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.yuliao.R;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
public abstract class LllChatBaseActivity extends BaseActivity {
@@ -17,8 +17,8 @@ public abstract class LllChatBaseActivity extends BaseActivity {
super.onCreate(savedInstanceState);
int statusBarColor = initStatusBarColor();
int navigationBarColor = initNavigationBarColor();
getWindow().setStatusBarColor(statusBarColor == 0 ? getColor(R.color.color_white) : statusBarColor);
getWindow().setNavigationBarColor(navigationBarColor == 0 ? getColor(R.color.color_white) : navigationBarColor);
getWindow().setStatusBarColor( getColor(R.color.color_white));
// getWindow().setNavigationBarColor(navigationBarColor == 0 ? getColor(R.color.color_white) : navigationBarColor);
}

24
app/src/main/java/com/hbl/lewan/contact/ContactGroupSettingActivity.java → app/src/main/java/com/hbl/yuliao/contact/ContactGroupSettingActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.contact;
package com.hbl.yuliao.contact;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.REQUEST_CONTACT_SELECTOR_AVATAR;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_REQUEST_SELECTOR_NAME;
@@ -8,6 +8,7 @@ import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.REQUEST_CON
import android.Manifest;
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.text.Editable;
@@ -15,6 +16,8 @@ import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.TypedValue;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.result.ActivityResultLauncher;
@@ -23,13 +26,14 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.netease.yunxin.kit.common.ui.photo.PhotoPicker;
import com.netease.yunxin.kit.common.ui.utils.CommonCallback;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.ui.widgets.BackTitleBar;
import com.netease.yunxin.kit.common.utils.NetworkUtils;
import com.netease.yunxin.kit.common.utils.SizeUtils;
import com.netease.yunxin.kit.contactkit.ui.ContactConstant;
import com.netease.yunxin.kit.contactkit.ui.R;
import com.netease.yunxin.kit.contactkit.ui.databinding.FunContactSelectorSettingActivityBinding;
@@ -116,6 +120,20 @@ public class ContactGroupSettingActivity extends FunBaseSelectorDataActivity imp
public void initView() {
configTitleBar(binding.title);
setGroupName(listname);
binding.title.setActionTextColor(Color.WHITE);
binding.title.getRightTextView().setBackground(getResources().getDrawable(com.hbl.yuliao.R.drawable.cornor_thempink_12dp));
int verticalPadding = SizeUtils.dp2px(5);
int horizontalPadding = SizeUtils.dp2px(10);
int endPadding = SizeUtils.dp2px(5);
TextView rightTextView = binding.title.getRightTextView();
FrameLayout.LayoutParams layoutParams =
(FrameLayout.LayoutParams) rightTextView.getLayoutParams();
layoutParams.rightMargin = SizeUtils.dp2px(endPadding);
rightTextView.setPadding(
horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
binding.editGroupname.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {

7
app/src/main/java/com/hbl/lewan/contact/FunBlackListActivity.java → app/src/main/java/com/hbl/yuliao/contact/FunBlackListActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.contact;
package com.hbl.yuliao.contact;
import android.graphics.Typeface;
import android.os.Bundle;
@@ -39,8 +39,7 @@ public class FunBlackListActivity extends BaseBlackListActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
changeStatusBarColor(R.color.color_white);
binding.heimindanTv.setVisibility(View.VISIBLE);
binding.heimindanTv.setVisibility(View.GONE);
binding.tvBlackremove.setVisibility(View.VISIBLE);
binding.tvBlackremove.setOnClickListener(view -> {
if (listBlackUserInfo.size() > 0) {
@@ -128,8 +127,10 @@ public class FunBlackListActivity extends BaseBlackListActivity {
public void setBlackRemoveBg() {
if (listBlackUserInfo.size() > 0) {
setBtnBackground(true);
} else {
setBtnBackground(false);
}
}

44
app/src/main/java/com/hbl/lewan/contact/ReportActivity.java → app/src/main/java/com/hbl/yuliao/contact/ReportActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.contact;
package com.hbl.yuliao.contact;
import android.Manifest;
import android.content.Context;
@@ -42,24 +42,24 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityTransferInfoBinding;
import com.hbl.lewan.databinding.ReportActivityBinding;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.GroupActionBean;
import com.hbl.lewan.model.ReportBean;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.KeyboardUtil;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityTransferInfoBinding;
import com.hbl.yuliao.databinding.ReportActivityBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.GroupActionBean;
import com.hbl.yuliao.model.ReportBean;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
@@ -117,8 +117,8 @@ public class ReportActivity extends BaseActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
getWindow().setStatusBarColor(getResources().getColor(R.color.color_fcfcfc));
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
// getWindow().setStatusBarColor(getResources().getColor(R.color.color_fcfcfc));
// getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
super.onCreate(savedInstanceState);
viewBinding = ReportActivityBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
@@ -328,7 +328,7 @@ public class ReportActivity extends BaseActivity {
if (i < uris.size()) {
File file = new File(uriStrings.get(i));
File file = new File(localMedias.get(i).getRealPath());
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath());
String files = "media/" + updatePathPic + "/" + fileName;

168
app/src/main/java/com/hbl/lewan/contact/UserInfoActivity.java → app/src/main/java/com/hbl/yuliao/contact/UserInfoActivity.java
View File

@@ -1,5 +1,6 @@
package com.hbl.lewan.contact;
package com.hbl.yuliao.contact;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Color;
@@ -28,27 +29,27 @@ import androidx.recyclerview.widget.GridLayoutManager;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityUserInfoBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.EditFriendUserInfoActivity;
import com.hbl.lewan.main.mine.EditUserInfoActivity;
import com.hbl.lewan.main.mine.photo.UserPhotoListActivity;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.TiktokActivityMe;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityUserInfoBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.EditFriendUserInfoActivity;
import com.hbl.yuliao.main.mine.EditUserInfoActivity;
import com.hbl.yuliao.main.mine.photo.UserPhotoListActivity;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.TiktokActivityMe;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
@@ -82,8 +83,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
//import io.agora.onetoone.Pure1v1LivingActivity;
//import io.agora.onetoone.http.HttpManager;
//import io.agora.onetoone.model.EnterRoomInfoModel;
//import io.agora.onetoone.utils.SPUtil;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
public class UserInfoActivity extends BaseActivity {
private ActivityUserInfoBinding viewBinding;
@@ -99,6 +106,16 @@ public class UserInfoActivity extends BaseActivity {
private int isAllowAdd = 1;
public static String kIsRtm = "isRtm";
public static String kIsShowMode = "isShowMode";
public static String kIsBrodCaster = "isBrodCaster";
public static String kLocalUid = "localUid";
public static String kOwnerUid = "ownerUid";
public static String kDimensionsWidth = "dimensionsWidth";
public static String kDimensionsHeight = "dimensionsHeight";
public static String kFrameRate = "frameRate";
public static String kBitrate = "bitrate";
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
@@ -317,22 +334,51 @@ public class UserInfoActivity extends BaseActivity {
ToastX.showShortToast(com.netease.yunxin.kit.chatkit.ui.R.string.chat_message_camera_unavailable);
return;
}
if (isVideoCall) {
if(isVideoCall){
ChatUtils.startVideoCall(UserInfoActivity.this, userInfoData.data.getAccount());
// CallParam param = CallParam.createSingleCallParam(RouterConstant.KEY_CALL_TYPE_VIDEO,IMKitClient.account(),userInfoData.data.getAccount());
// CallKitUI.startSingleCall(UserInfoActivity.this, param);
} else {
}else{
ChatUtils.startAudioCall(UserInfoActivity.this, userInfoData.data.getAccount());
// CallParam param = new CallParam.Builder()
// .addCalledUserAccId(userInfoData.data.getAccount()) // 被叫用户云信 IM accid
// .channelType(RouterConstant.KEY_CALL_TYPE_AUDIO) // 呼叫类型为视频
// .callExtraInfo("")
// .build();
// CallParam param = CallParam.createSingleCallParam(RouterConstant.KEY_CALL_TYPE_AUDIO,IMKitClient.account(),userInfoData.data.getAccount());
// CallKitUI.startSingleCall(UserInfoActivity.this, param);
}
// SPUtil.putBoolean(UserInfoActivity.kIsRtm, true);
// SPUtil.putBoolean(UserInfoActivity.kIsShowMode, false);
// SPUtil.putBoolean(UserInfoActivity.kIsBrodCaster, true);
// SPUtil.putString(UserInfoActivity.kLocalUid, IMKitClient.account());
// SPUtil.putString(UserInfoActivity.kOwnerUid, "");
// SPUtil.putString(UserInfoActivity.kDimensionsWidth, "640");
// SPUtil.putString(UserInfoActivity.kDimensionsHeight,"360");
// SPUtil.putString(UserInfoActivity.kFrameRate, "15");
//// SPUtil.putString("targetUserId", u.getUser_uid());
// EnterRoomInfoModel enterModel =new EnterRoomInfoModel();
// enterModel.setRtm(true);
// enterModel.setBrodCaster(true);
// enterModel.setCurrentUid(IMKitClient.account());
// enterModel.setDimensionsWidth("640");
// enterModel.setDimensionsHeight("360");
// enterModel.setFrameRate("15");
// enterModel.setAutoAccept(true);
// enterModel.setShowRoomId(IMKitClient.account());
// enterModel.setShowUserId(IMKitClient.account());
//
// enterModel.setFirstFrameWaittingDisabled(false);
// enterModel.setRtcToken(SPUtil.getString("Token_SW",""));
// enterModel.setRtmToken(SPUtil.getString("Token_SW",""));
//
//
// HttpManager.INSTANCE.token007("", IMKitClient.account(), token -> {
// if (token != null) {
// enterModel.setRtcToken(token);
// LogUtils.i("结果", "结果firstFrameWaittingDisabled333333333：");
// enterModel.setRtmToken(token);
// if (enterModel.getRtcToken() != null && enterModel.getRtmToken() != null) {
// Pure1v1LivingActivity.Companion.launch(UserInfoActivity.this,
// enterModel,isVideoCall,true,u.getUser_uid());
// }
//
// }
// return null;
// });
}
private void toStarAction() {
@@ -527,7 +573,7 @@ public class UserInfoActivity extends BaseActivity {
viewBinding.moreIv.setVisibility(View.GONE);
viewBinding.starIv.setVisibility(View.GONE);
viewBinding.botLy.setVisibility(View.GONE);
viewBinding.blackTv.setVisibility(View.VISIBLE);
viewBinding.blackLy.setVisibility(View.VISIBLE);
}
@Override
@@ -697,18 +743,18 @@ public class UserInfoActivity extends BaseActivity {
IMApplication.schemeUserId = null;
if (accId.equals(IMKitClient.account()) || ContactRepo.isFriend(accId)) { //是好友或者是自己 可以修改备注
viewBinding.editUserNicknameIv.setVisibility(View.VISIBLE);
}
viewBinding.editUserNicknameIv.setOnClickListener(v -> {
if (accId.equals(IMKitClient.account())) {
EditUserInfoActivity.launch(getApplicationContext(), Constant.EDIT_NAME, launcher);
} else {
EditFriendUserInfoActivity.launch(getApplicationContext(), accId, u.getIsFollow(), launcher);
}
}
);
// if (accId.equals(IMKitClient.account()) || ContactRepo.isFriend(accId)) { //是好友或者是自己 可以修改备注
// viewBinding.editUserNicknameIv.setVisibility(View.VISIBLE);
// }
//
// viewBinding.editUserNicknameIv.setOnClickListener(v -> {
// if (accId.equals(IMKitClient.account())) {
// EditUserInfoActivity.launch(getApplicationContext(), Constant.EDIT_NAME, launcher);
// } else {
// EditFriendUserInfoActivity.launch(getApplicationContext(), accId, u.getIsFollow(), launcher);
// }
// }
// );
viewBinding.userNameTv.setOnClickListener(v -> {
if (accId.equals(IMKitClient.account())) {
EditUserInfoActivity.launch(getApplicationContext(), Constant.EDIT_NAME, launcher);
@@ -843,6 +889,7 @@ public class UserInfoActivity extends BaseActivity {
}
@SuppressLint("Range")
private void changeUserInfo() {
RequestOptions requestOptions;
requestOptions = new RequestOptions()
@@ -853,14 +900,14 @@ public class UserInfoActivity extends BaseActivity {
viewBinding.moreIv.setVisibility(View.GONE);
viewBinding.starIv.setVisibility(View.GONE);
viewBinding.friendLy.setVisibility(View.GONE);
viewBinding.addFriendsTv.setVisibility(View.GONE);
viewBinding.addFriendsLy.setVisibility(View.GONE);
if (userInfoData != null && userInfoData.data != null) {
String name =
TextUtils.isEmpty(userInfoData.data.getName()) ? userInfoData.data.getAccount() : userInfoData.data.getName();
if (userInfoData.data.getAccount().equals(IMKitClient.account())) {
//自己
viewBinding.friendLy.setVisibility(View.GONE);
viewBinding.addFriendsTv.setVisibility(View.GONE);
viewBinding.addFriendsLy.setVisibility(View.GONE);
// viewBinding.logoIv.setData(
// userInfoData.data.getAvatar(), name, AvatarColor.avatarColor(IMKitClient.account()));
Glide.with(this)
@@ -873,10 +920,10 @@ public class UserInfoActivity extends BaseActivity {
if (userInfoData.isFriend && !userInfoData.isBlack) {
viewBinding.friendLy.setVisibility(View.VISIBLE);
viewBinding.moreIv.setVisibility(View.VISIBLE);
viewBinding.starIv.setVisibility(View.VISIBLE);
viewBinding.starIv.setVisibility(View.GONE);
} else {
if (!userInfoData.isBlack && isAllowAdd == 1) {
viewBinding.addFriendsTv.setVisibility(View.VISIBLE);
viewBinding.addFriendsLy.setVisibility(View.VISIBLE);
}
}
Glide.with(this)
@@ -890,10 +937,10 @@ public class UserInfoActivity extends BaseActivity {
}
if (userInfoData.isBlack) {
viewBinding.blackTv.setVisibility(View.VISIBLE);
viewBinding.blackLy.setVisibility(View.VISIBLE);
viewBinding.botLy.setVisibility(View.GONE);
} else {
viewBinding.blackTv.setVisibility(View.GONE);
viewBinding.blackLy.setVisibility(View.GONE);
viewBinding.botLy.setVisibility(View.VISIBLE);
}
@@ -909,9 +956,12 @@ public class UserInfoActivity extends BaseActivity {
if (!TextUtils.isEmpty(userInfoData.data.getBirthday())) {
viewBinding.broTv.setText(userInfoData.data.getBirthday());
viewBinding.broTv.setVisibility(View.VISIBLE);
viewBinding.broLy.setVisibility(View.VISIBLE);
viewBinding.bigBg.setBackgroundColor(getColor(R.color.color_eefof7));
} else {
viewBinding.broTv.setVisibility(View.GONE);
viewBinding.broLy.setVisibility(View.GONE);
viewBinding.bigBg.setBackgroundResource(R.drawable.user_true);
}
if (!TextUtils.isEmpty(userInfoData.data.getSignature())) {
@@ -996,8 +1046,8 @@ public class UserInfoActivity extends BaseActivity {
try {
Glide.with(UserInfoActivity.this)
.load(url)
.error(com.netease.yunxin.kit.chatkit.ui.R.color.color_6b3689)
.placeholder(com.netease.yunxin.kit.chatkit.ui.R.color.color_6b3689)
.error(com.netease.yunxin.kit.chatkit.ui.R.color.color_2c93fa)
.placeholder(com.netease.yunxin.kit.chatkit.ui.R.color.color_2c93fa)
.into(viewBinding.forBgIv);
} catch (Exception e) {
e.printStackTrace();
@@ -1038,7 +1088,7 @@ public class UserInfoActivity extends BaseActivity {
LogUtils.i("从群里进来的不允许添加好友");
// LogUtils.i("从群里进来的不允许添加好友:"+userInfoData.isFriend);
if (userInfoData != null && !userInfoData.isFriend) {
viewBinding.addFriendsTv.setVisibility(View.GONE);
viewBinding.addFriendsLy.setVisibility(View.GONE);
}
}

30
app/src/main/java/com/hbl/lewan/custom/ChatStickerViewHolder.java → app/src/main/java/com/hbl/yuliao/custom/ChatStickerViewHolder.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.custom;
package com.hbl.yuliao.custom;
import android.content.Context;
import android.content.Intent;
@@ -14,20 +14,20 @@ import androidx.annotation.NonNull;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.BuildConfig;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ChatMessageStickerViewBinding;
import com.hbl.lewan.databinding.LinkImageBinding;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.CircleShareBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.TiktoInfokActivity;
import com.hbl.yuliao.BuildConfig;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ChatMessageStickerViewBinding;
import com.hbl.yuliao.databinding.LinkImageBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.CircleShareBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.TiktoInfokActivity;
import com.netease.yunxin.kit.chatkit.ui.common.MessageHelper;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.chatkit.ui.custom.StickerAttachment;

6
app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew.java → app/src/main/java/com/hbl/yuliao/custom/CustomDatePickerNew.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.custom;
package com.hbl.yuliao.custom;
import android.app.Dialog;
import android.content.Context;
@@ -11,8 +11,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.hbl.lewan.R;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.CustomDatePicker;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.DateFormatUtils;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.PickerView;

6
app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew1.java → app/src/main/java/com/hbl/yuliao/custom/CustomDatePickerNew1.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.custom;
package com.hbl.yuliao.custom;
import android.app.Dialog;
import android.content.Context;
@@ -11,8 +11,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.hbl.lewan.R;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.CustomDatePicker;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.DateFormatUtils;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.PickerView;

4
app/src/main/java/com/hbl/lewan/custom/PasswordEditText.java → app/src/main/java/com/hbl/yuliao/custom/PasswordEditText.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.custom;
package com.hbl.yuliao.custom;
import android.content.Context;
import android.content.res.TypedArray;
@@ -17,7 +17,7 @@ import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.hbl.lewan.R;
import com.hbl.yuliao.R;
import java.util.ArrayList;
import java.util.List;

6
app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog.java → app/src/main/java/com/hbl/yuliao/dialog/ActionConfirmDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -11,8 +11,8 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogActionConfirmBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogActionConfirmBinding;
/**
* 通用弹窗

6
app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog1.java → app/src/main/java/com/hbl/yuliao/dialog/ActionConfirmDialog1.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -11,8 +11,8 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogActionConfirmBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogActionConfirmBinding;
/**
* 通用弹窗

12
app/src/main/java/com/hbl/lewan/dialog/ActionInputConfirmDialog.java → app/src/main/java/com/hbl/yuliao/dialog/ActionInputConfirmDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -14,11 +14,11 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.EditText;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogActionConfirmBinding;
import com.hbl.lewan.databinding.DialogActionInputconfirmBinding;
import com.hbl.lewan.utils.CharInputFilter;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogActionConfirmBinding;
import com.hbl.yuliao.databinding.DialogActionInputconfirmBinding;
import com.hbl.yuliao.utils.CharInputFilter;
import com.hbl.yuliao.utils.LogUtils;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

6
app/src/main/java/com/hbl/lewan/dialog/MianMiDialog.java → app/src/main/java/com/hbl/yuliao/dialog/MianMiDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -14,8 +14,8 @@ import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogMianmiConfirmBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogMianmiConfirmBinding;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
/**

8
app/src/main/java/com/hbl/lewan/dialog/MianMiXieyiDialog.java → app/src/main/java/com/hbl/yuliao/dialog/MianMiXieyiDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -12,9 +12,9 @@ import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogMianmiXieyiBinding;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogMianmiXieyiBinding;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
/**

38
app/src/main/java/com/hbl/lewan/dialog/PayCashDialog.java → app/src/main/java/com/hbl/yuliao/dialog/PayCashDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.annotation.SuppressLint;
import android.app.Dialog;
@@ -20,24 +20,24 @@ import android.widget.TextView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.DialogPayCashBinding;
import com.hbl.lewan.login.ChongZhiActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionActivity;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.PaySettingActivity;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.DialogPayCashBinding;
import com.hbl.yuliao.login.ChongZhiActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionActivity;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.PaySettingActivity;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import java.util.ArrayList;

14
app/src/main/java/com/hbl/lewan/dialog/PayCashFingerDialog.java → app/src/main/java/com/hbl/yuliao/dialog/PayCashFingerDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -12,12 +12,12 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.databinding.DialogPayFingerBinding;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.databinding.DialogPayFingerBinding;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.AppUtils;
import java.util.ArrayList;

20
app/src/main/java/com/hbl/lewan/dialog/PayDialog.java → app/src/main/java/com/hbl/yuliao/dialog/PayDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -15,15 +15,15 @@ import android.widget.TextView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.DialogPayNewBinding;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.DialogPayNewBinding;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

18
app/src/main/java/com/hbl/lewan/dialog/SelectBanksDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectBanksDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -12,14 +12,14 @@ import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.DialogSelectBanksBinding;
import com.hbl.lewan.databinding.DialogSelectTypeBinding;
import com.hbl.lewan.model.BankBean;
import com.hbl.lewan.model.TiXianConfBean;
import com.hbl.lewan.model.TypeBean;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.DialogSelectBanksBinding;
import com.hbl.yuliao.databinding.DialogSelectTypeBinding;
import com.hbl.yuliao.model.BankBean;
import com.hbl.yuliao.model.TiXianConfBean;
import com.hbl.yuliao.model.TypeBean;
import java.util.ArrayList;
import java.util.List;

14
app/src/main/java/com/hbl/lewan/dialog/SelectCountryDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectCountryDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -19,12 +19,12 @@ import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.DialogSelectCountryBinding;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.DialogSelectCountryBinding;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.utils.DataUtils;
import java.util.ArrayList;

65
app/src/main/java/com/hbl/yuliao/dialog/SelectHeadDialog.java Normal file
View File

@@ -0,0 +1,65 @@
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogSelectHeadPhotoBinding;
import com.hbl.yuliao.databinding.DialogSelectSexBinding;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import java.util.Locale;
public class SelectHeadDialog extends Dialog {
DialogSelectHeadPhotoBinding dialogSelectLangTypeBinding;
public SelectHeadDialog(Context context) {
super(context, R.style.MaterialDesignDialog);
dialogSelectLangTypeBinding = DialogSelectHeadPhotoBinding.inflate(getLayoutInflater());
setContentView(dialogSelectLangTypeBinding.getRoot());
}
OnToTypeListener onNextCallListener;
public interface OnToTypeListener {
void toType(int type);
}
public void setOnToVipListener(OnToTypeListener onNextCallListener) {
this.onNextCallListener = onNextCallListener;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
dialogSelectLangTypeBinding.headTv.setOnClickListener(v -> changeLoc(0));
dialogSelectLangTypeBinding.fengmianTv.setOnClickListener(v -> changeLoc(1));
dialogSelectLangTypeBinding.cancelTv.setOnClickListener(v -> dismiss());
Window window = getWindow();
WindowManager.LayoutParams wlp = window.getAttributes();
wlp.gravity = Gravity.BOTTOM;
wlp.width = WindowManager.LayoutParams.MATCH_PARENT;
wlp.height = WindowManager.LayoutParams.WRAP_CONTENT;
window.setAttributes(wlp);
}
private void changeLoc(int i) {
dismiss();
if(onNextCallListener!=null){
onNextCallListener.toType(i);
}
}
}

8
app/src/main/java/com/hbl/lewan/dialog/SelectLanguageDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectLanguageDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -14,9 +14,9 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import com.blankj.utilcode.util.LanguageUtils;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogSelectLangTypeBinding;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogSelectLangTypeBinding;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import java.util.Locale;

8
app/src/main/java/com/hbl/lewan/dialog/SelectPayTypeDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectPayTypeDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -10,9 +10,9 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogSelectPayTypeBinding;
import com.hbl.lewan.model.WalletBean;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogSelectPayTypeBinding;
import com.hbl.yuliao.model.WalletBean;
public class SelectPayTypeDialog extends Dialog {

10
app/src/main/java/com/hbl/lewan/dialog/SelectPhotoTypeDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectPhotoTypeDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -12,10 +12,10 @@ import android.view.Window;
import android.view.WindowManager;
import com.blankj.utilcode.util.LanguageUtils;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogSelectLangTypeBinding;
import com.hbl.lewan.databinding.DialogSelectPhotoTypeBinding;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogSelectLangTypeBinding;
import com.hbl.yuliao.databinding.DialogSelectPhotoTypeBinding;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import java.util.Locale;

18
app/src/main/java/com/hbl/lewan/dialog/SelectPhotosMoveDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectPhotosMoveDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -17,14 +17,14 @@ import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.bumptech.glide.Glide;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.DialogSelectPhotoTypeBinding;
import com.hbl.lewan.databinding.DialogSelectPhotosMoveBinding;
import com.hbl.lewan.main.mine.photo.AddPhotoActivity;
import com.hbl.lewan.main.mine.photo.UserPhotoListActivity;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.DialogSelectPhotoTypeBinding;
import com.hbl.yuliao.databinding.DialogSelectPhotosMoveBinding;
import com.hbl.yuliao.main.mine.photo.AddPhotoActivity;
import com.hbl.yuliao.main.mine.photo.UserPhotoListActivity;
import com.hbl.yuliao.model.UserAlbumBean;
import com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
import java.util.List;

6
app/src/main/java/com/hbl/lewan/dialog/SelectPushTypeDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectPushTypeDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -11,8 +11,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogSelectPushTypeBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogSelectPushTypeBinding;
public class SelectPushTypeDialog extends Dialog {

99
app/src/main/java/com/hbl/yuliao/dialog/SelectSettingPhotoDialog.java Normal file
View File

@@ -0,0 +1,99 @@
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogSelectSexBinding;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import java.util.Locale;
public class SelectSettingPhotoDialog extends Dialog {
DialogSelectSexBinding dialogSelectLangTypeBinding;
int sexFlag = -1;
public SelectSettingPhotoDialog(Context context, int sexFlag) {
super(context, R.style.MaterialDesignDialog);
dialogSelectLangTypeBinding = DialogSelectSexBinding.inflate(getLayoutInflater());
setContentView(dialogSelectLangTypeBinding.getRoot());
this.sexFlag = sexFlag;
}
OnToTypeListener onNextCallListener;
public interface OnToTypeListener {
void toType(int type);
}
public void setOnToVipListener(OnToTypeListener onNextCallListener) {
this.onNextCallListener = onNextCallListener;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
dialogSelectLangTypeBinding.nanLy.setOnClickListener(v -> changeLoc(0));
dialogSelectLangTypeBinding.nvLy.setOnClickListener(v -> changeLoc(1));
dialogSelectLangTypeBinding.configTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(sexFlag ==-1){
ToastX.showShortToast(R.string.qxxzxb_txt);
return;
}
dismiss();
if(onNextCallListener!=null){
onNextCallListener.toType(sexFlag);
}
}
});
changeLoc(sexFlag);
dialogSelectLangTypeBinding.coloseIv.setOnClickListener(v -> dismiss());
Window window = getWindow();
WindowManager.LayoutParams wlp = window.getAttributes();
wlp.gravity = Gravity.BOTTOM;
wlp.width = WindowManager.LayoutParams.MATCH_PARENT;
wlp.height = WindowManager.LayoutParams.WRAP_CONTENT;
window.setAttributes(wlp);
}
private void changeLoc(int type) {
dialogSelectLangTypeBinding.duigouNanIv.setVisibility(View.GONE);
dialogSelectLangTypeBinding. duigouNvIv.setVisibility(View.GONE);
sexFlag = type;
switch (type){
case 0:
dialogSelectLangTypeBinding.duigouNanIv.setVisibility(View.VISIBLE);
break;
case 1:
dialogSelectLangTypeBinding.duigouNvIv.setVisibility(View.VISIBLE);
break;
}
}
//设置当前语言
public static void applyLanguage(Context context, Resources resources, Locale locale) {
Locale.setDefault(locale);
Configuration config = resources.getConfiguration();
DisplayMetrics dm = resources.getDisplayMetrics();
config.locale = locale;
resources.updateConfiguration(config, dm);
}
}

10
app/src/main/java/com/hbl/lewan/dialog/SelectSexDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectSexDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -12,10 +12,10 @@ import android.view.Window;
import android.view.WindowManager;
import com.blankj.utilcode.util.LanguageUtils;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogSelectLangTypeBinding;
import com.hbl.lewan.databinding.DialogSelectSexBinding;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogSelectLangTypeBinding;
import com.hbl.yuliao.databinding.DialogSelectSexBinding;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

12
app/src/main/java/com/hbl/lewan/dialog/SelectTypeDialog.java → app/src/main/java/com/hbl/yuliao/dialog/SelectTypeDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -13,11 +13,11 @@ import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.DialogSelectTypeBinding;
import com.hbl.lewan.model.TypeBean;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.DialogSelectTypeBinding;
import com.hbl.yuliao.model.TypeBean;
import java.util.ArrayList;
import java.util.List;

6
app/src/main/java/com/hbl/lewan/dialog/VersionDialog.java → app/src/main/java/com/hbl/yuliao/dialog/VersionDialog.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.dialog;
package com.hbl.yuliao.dialog;
import android.app.Dialog;
import android.content.Context;
@@ -10,8 +10,8 @@ import android.view.ViewTreeObserver;
import android.view.Window;
import android.view.WindowManager;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogActionVersionBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.DialogActionVersionBinding;
/**
* 版本弹窗

2
app/src/main/java/com/hbl/lewan/event/ConversationEditEvent.java → app/src/main/java/com/hbl/yuliao/event/ConversationEditEvent.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.event;
package com.hbl.yuliao.event;
import androidx.annotation.NonNull;

2
app/src/main/java/com/hbl/lewan/event/UserAlbumsUpdateEvent.java → app/src/main/java/com/hbl/yuliao/event/UserAlbumsUpdateEvent.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.event;
package com.hbl.yuliao.event;
import androidx.annotation.NonNull;

84
app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java → app/src/main/java/com/hbl/yuliao/game/JsBridgeActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.game;
package com.hbl.yuliao.game;
import static androidx.activity.result.contract.ActivityResultContracts.*;
@@ -53,18 +53,18 @@ import com.bumptech.glide.Glide;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.contact.UserInfoActivity;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.ActionConfirmDialog1;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.authorize.AuthorizeActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.JsBridgeOrderBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.ActionConfirmDialog1;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.authorize.AuthorizeActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.JsBridgeOrderBean;
import com.hbl.yuliao.model.LoginBean;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
@@ -83,33 +83,33 @@ import androidx.recyclerview.widget.RecyclerView;
//import com.amap.api.location.AMapLocationClient;
//import com.amap.api.location.AMapLocationClientOption;
//import com.amap.api.location.AMapLocationListener;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityChangePaypasswordBinding;
import com.hbl.lewan.databinding.ActivityJsbridgeBinding;
import com.hbl.lewan.dialog.PayDialog;
import com.hbl.lewan.model.AuthorizeBean;
import com.hbl.lewan.model.H5ChangeTitle;
import com.hbl.lewan.model.NewsBean;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.model.TopUpBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.NfcReaderActivity;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.QRCodeScheme;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.SoftHideKeyBoardUtil;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.lewan.widget.StatusLayout;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityChangePaypasswordBinding;
import com.hbl.yuliao.databinding.ActivityJsbridgeBinding;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.model.AuthorizeBean;
import com.hbl.yuliao.model.H5ChangeTitle;
import com.hbl.yuliao.model.NewsBean;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.model.TopUpBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.NfcReaderActivity;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.QRCodeScheme;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.SoftHideKeyBoardUtil;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.hbl.yuliao.widget.StatusLayout;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.huawei.hms.hmsscankit.ScanUtil;
import com.huawei.hms.hmsscankit.ScanUtilHtml;
@@ -1158,7 +1158,7 @@ public class JsBridgeActivity extends BaseActivity {
if (isStart) {
tvTitle.setVisibility(View.VISIBLE);
tvCancel.setVisibility(View.VISIBLE);
tvStatus.setText(getString(com.hbl.lewan.R.string.nfctitle_dialog_status));
tvStatus.setText(getString(com.hbl.yuliao.R.string.nfctitle_dialog_status));
Glide.with(this).load(R.mipmap.nfc_read).into(ivStatus);
tvCancel.setOnClickListener(view -> {
nfcAdapter.disableReaderMode(this);
@@ -1651,7 +1651,7 @@ public class JsBridgeActivity extends BaseActivity {
//{"scheme":"time_go_mm://payment_bead/","userId":"10","value":"388a762b474f944b"}
String scheme = qrData.getScheme();
if (scheme.startsWith("http")) {
if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("http://admin.yuliao666.top/") && scheme.contains("deviceId")) {
sendMachine(scheme);
}
}

667
app/src/main/java/com/hbl/yuliao/game/ShopFragment.java Normal file
View File

@@ -0,0 +1,667 @@
package com.hbl.yuliao.game;
import android.Manifest;
import android.annotation.TargetApi;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.nfc.NfcAdapter;
import android.nfc.NfcManager;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.CookieManager;
import android.webkit.ValueCallback;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.PickVisualMediaRequest;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentShopBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog1;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.AuthorizeBean;
import com.hbl.yuliao.model.H5ChangeTitle;
import com.hbl.yuliao.model.JsBridgeOrderBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.NewsBean;
import com.hbl.yuliao.model.TopUpBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.TiXianActivity;
import com.hbl.yuliao.wallet.TopUpActivity;
import com.huawei.hms.hmsscankit.ScanUtilHtml;
import com.huawei.hms.ml.scan.HmsScan;
import com.huawei.hms.ml.scan.HmsScanAnalyzerOptions;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.utils.PermissionUtils;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
import com.smallbuer.jsbridge.core.BridgeHandler;
import com.smallbuer.jsbridge.core.CallBackFunction;
import java.util.HashMap;
import java.util.Map;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* **********************
*
* @Author bug machine
* 创建时间： 2025/7/24 17:09
* 用途
* **********************
*/
public class ShopFragment extends BaseFragment {
FragmentShopBinding viewBinding;
CallBackFunction callBackFunctionLocation;
CallBackFunction mUserInfoCallback;
private ValueCallback<Uri[]> mUploadCallbackForHighApi;
ActivityResultLauncher<PickVisualMediaRequest> pickMultipleMedia;
private static final int REQUEST_CODE_FILE_CHOOSER = 1;
private ValueCallback<Uri> mUploadCallbackForLowApi;
@Nullable
@Override
public View onCreateView(
@NonNull LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
ALog.d(Constant.PROJECT_TAG, "MineFragment:onCreateView");
viewBinding = FragmentShopBinding.inflate(inflater);
return viewBinding.getRoot();
}
@RequiresApi(api = Build.VERSION_CODES.M)
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ALog.d(Constant.PROJECT_TAG, "ShopFragment:onViewCreated");
WebSettings settings = viewBinding.jsbridgeBridgewebview.getSettings();
settings.setDomStorageEnabled(true);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.jsbridgeBridgewebview, true);
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
// settings.setAppCacheEnabled(true);
settings.setCacheMode(WebSettings.LOAD_DEFAULT);
// settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
settings.setJavaScriptEnabled(true);
settings.setLoadWithOverviewMode(true);
// settings.setAppCachePath(APP_CACHE_DIRNAME);
// 设置允许访问文件数据
settings.setAllowFileAccess(true);
settings.setAllowContentAccess(true);
settings.setDatabaseEnabled(true);
settings.setSavePassword(false);
settings.setSaveFormData(false);
settings.setUseWideViewPort(true);
settings.setJavaScriptCanOpenWindowsAutomatically(true);
// 设置在WebView内部是否允许通过file url加载的 Js代码读取其他的本地文件
// Android 4.1前默认允许，4.1后默认禁止
settings.setAllowFileAccessFromFileURLs(true);
// 设置WebView内部是否允许通过 file url 加载的 Javascript 可以访问其他的源(包括http、https等源)
// Android 4.1前默认允许，4.1后默认禁止
settings.setAllowUniversalAccessFromFileURLs(true);
pickMultipleMedia =
registerForActivityResult(new ActivityResultContracts.PickMultipleVisualMedia(5), uris -> {
// Callback is invoked after the user selects media items or closes the
// photo picker.
if (!uris.isEmpty()) {
LogUtils.i("Number of items selected: " + uris.size());
Uri[] uris1 = new Uri[uris.size()];
for (int i = 0; i < uris.size(); i++) {
LogUtils.i("Selected URI: " + uris.get(i));
uris1[i] = uris.get(i);
}
mUploadCallbackForHighApi.onReceiveValue(uris1);
mUploadCallbackForHighApi = null;
} else {
LogUtils.i("No media selected");
}
});
viewBinding.jsbridgeBridgewebview.setWebChromeClient(new myWebChromeClient());
viewBinding.jsbridgeBridgewebview.setWebViewClient(new WebViewClient(){
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
viewBinding.showTopLy.setVisibility(View.GONE);
}
});
// viewBinding.jsbridgeBridgewebview.loadUrl("https://h5.shopxo.vip/#/pages/goods-search/goods-search?category_id=1");
viewBinding.jsbridgeBridgewebview.loadUrl("http://47.243.153.122:2396/#/");
viewBinding.jsbridgeBridgewebview.addHandlerLocal("ZeroCard", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
callBackFunction.onCallBack("");
try {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(s));
startActivity(intent);
} catch (Exception e) {
}
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getAuthorizeCode", new BridgeHandler() {
@Override
public void handler(Context context, String data, CallBackFunction callBackFunction) {
LogUtils.d("getAuthorizeCode:" + data);
data = data.replace("\"", "");
LogUtils.d("getAuthorizeCode获取到的数据：" + data);
Map<String, Object> map = new HashMap<>();
map.put("token", DataUtils.getLocUserInfo().getAccessToken());
map.put("appId", data);
map.put("redirectUri", "https://www.baidu.com/");
map.put("allowAuthorize", true);
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
map.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
Api.getInstance().authorizeLogin(map)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<AuthorizeBean>>() {
@Override
public void onSuccess(Result<AuthorizeBean> feedbackResp) {
if (feedbackResp.data != null) {
LogUtils.d("getAuthorizeCode:回调：" + feedbackResp.data.getAuthorizeCode());
callBackFunction.onCallBack(feedbackResp.data.getAuthorizeCode());
}
}
@Override
public void onError(int code, String msg) {
LogUtils.d("获取到的错误:" + code + "" + msg);
callBackFunction.onCallBack("");
}
});
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("toChat", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("执行了toChat:" + s);
callBackFunction.onCallBack("");
XKitRouter.withKey(RouterConstant.PATH_CHAT_P2P_PAGE).withParam(RouterConstant.CHAT_ID_KRY, s).withContext(context).navigate();
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getUserId", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("执行了getUserId");
// LoginBean userInfoBean = MyApplication.getInstance2().getIMClientManager().getLocalUserInfo();
// if (userInfoBean != null) {
LogUtils.d("执行了getUserToken 111111111");
callBackFunction.onCallBack(IMKitClient.account());
// }
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("topup", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
LogUtils.d("topup:");
LoginBean loginBean = DataUtils.getLocUserInfo();
if (loginBean != null && loginBean.getUser() != null) {
if (loginBean.getUser().getForbidQCoin() == 1) {
Map<String, Object> map1 = new HashMap<>();
map1.put("code", 0);
map1.put("error", "金币被封禁");
callBackFunction.onCallBack(GsonUtils.beanToJSONString(map1));
// toRengong();
return;
}
s = s.replace("\"", "");
PayDialog payDialog = new PayDialog(getActivity(), "", false);
String finalS = s;
payDialog.setOntoAlbumListener(new PayDialog.OnListItemClickListener() {
@Override
public void onPayPass(String position) {
Map<String, Object> map = new HashMap<>();
map.put("recordId", Long.parseLong(finalS));
map.put("payPassword", position);
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
map.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
Api.getInstance().chargeComplete(map)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<TopUpBean>>() {
@Override
public void onSuccess(Result<TopUpBean> feedbackResp) {
// LogUtils.i("回调获取到的数据：" + GsonUtils.beanToJSONString(feedbackResp));
callBackFunction.onCallBack(GsonUtils.beanToJSONString(feedbackResp));
}
@Override
public void onError(int code, String msg) {
Map<String, Object> map1 = new HashMap<>();
map1.put("code", code);
map1.put("error", msg);
callBackFunction.onCallBack(GsonUtils.beanToJSONString(map1));
}
});
}
@Override
public void dimess() {
Map<String, Object> map1 = new HashMap<>();
map1.put("code", 0);
map1.put("error", "取消了充值");
callBackFunction.onCallBack(GsonUtils.beanToJSONString(map1));
}
});
payDialog.show();
}
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getBalance", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
LogUtils.d("获取到的数据getBalance：" + s);
// LoginBean u = DataUtils.getLocUserInfo();
// if (u != null) {
Api.getInstance().walletInfo(IMKitClient.account())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<WalletBean>>() {
@Override
public void onSuccess(Result<WalletBean> feedbackResp) {
LogUtils.d("获取到的数据getBalance回调：" + feedbackResp.data.getGoldCoin());
callBackFunction.onCallBack(feedbackResp.data.getGoldCoin() + "");
}
@Override
public void onError(int code, String msg) {
LogUtils.d("获取到的数据getBalance回调onError：0");
callBackFunction.onCallBack("0");
}
});
// }
}
});
//获取银币余额
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getBalanceSilver", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
LogUtils.d("获取到的数据getBalanceSilver：" + s);
// LoginBean u = lu1();
// if (u != null) {
Api.getInstance().walletInfo(IMKitClient.account())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<WalletBean>>() {
@Override
public void onSuccess(Result<WalletBean> feedbackResp) {
LogUtils.d("获取到的数据getBalance回调：" + feedbackResp.data.getSilverCoin());
callBackFunction.onCallBack(feedbackResp.data.getSilverCoin() + "");
}
@Override
public void onError(int code, String msg) {
LogUtils.d("获取到的数据getBalance回调onError：0");
callBackFunction.onCallBack("0");
}
});
// }
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getCoin", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
LogUtils.d("获取到的数据getCoin：" + s);
// LoginBean u = lu1();
// if (u != null) {
Api.getInstance().walletInfo(IMKitClient.account())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<WalletBean>>() {
@Override
public void onSuccess(Result<WalletBean> feedbackResp) {
Map<String, Object> map1 = new HashMap<>();
map1.put("code", 1);
map1.put("goldCoin", feedbackResp.data.getGoldCoin());
map1.put("silverCoin", feedbackResp.data.getSilverCoin());
LogUtils.d("回调结果：" + GsonUtils.beanToJSONString(map1));
callBackFunction.onCallBack(GsonUtils.beanToJSONString(map1));
}
@Override
public void onError(int code, String msg) {
Map<String, Object> map1 = new HashMap<>();
map1.put("code", 0);
map1.put("error", "获取余额失败");
callBackFunction.onCallBack(GsonUtils.beanToJSONString(map1));
}
});
// }
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("scanQrcode", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
LogUtils.d("获取到的数据scanQrcode：" + s);
callBackFunctionLocation = callBackFunction;
if (PermissionUtils.hasPermissions(
getActivity(), Manifest.permission.CAMERA)) {
ScanUtilHtml.startScan(getActivity(), MainActivity.REQUEST_CODE_FOR_QRCODE_SCAN,
new HmsScanAnalyzerOptions.Creator().setHmsScanTypes(HmsScan.ALL_SCAN_TYPE).create());
} else {
requestCameraPermission(Manifest.permission.CAMERA);
}
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("topup_pass", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
LogUtils.d("获取到的数据topup_pass：" + s);
LoginBean loginBean = DataUtils.getLocUserInfo();
if (loginBean != null && loginBean.getUser() != null) {
// if (loginBean.getUser().getForbidQCoin() == 1) {
// toRengong();
// callBackFunction.onCallBack("");
// return;
// }
s = s.replace("\"", "");
PayDialog payDialog = new PayDialog(getActivity(), "", false);
String finalS = s;
payDialog.setOntoAlbumListener(new PayDialog.OnListItemClickListener() {
@Override
public void onPayPass(String pass) {
callBackFunction.onCallBack(pass);
}
@Override
public void dimess() {
callBackFunction.onCallBack("");
}
});
payDialog.show();
}
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getOffLine", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
LogUtils.d("获取到的数据getOffLine：" + s);
callBackFunction.onCallBack("");
// TODO: 2023/11/6 跳充值
startActivity(new Intent(getActivity(), TopUpActivity.class));
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getLocation", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
callBackFunctionLocation = callBackFunction;
callBackFunctionLocation.onCallBack("");
// initLocation();
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("withdrawal", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//提现
LogUtils.d("获取到的数据withdrawal：" + s);
callBackFunction.onCallBack("");
startActivity(new Intent(getActivity(), TiXianActivity.class));
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getUserInfo", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("getUserInfo");
mUserInfoCallback = callBackFunction;
LoginBean userInfoBean = DataUtils.getLocUserInfo();
LogUtils.d("回调结果：" + GsonUtils.beanToJSONString(userInfoBean.getUser()));
mUserInfoCallback.onCallBack(GsonUtils.beanToJSONString(userInfoBean.getUser()));
// getUser();
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("finish", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("finish");
callBackFunction.onCallBack("");
// finish();
}
});
//js通知要跳转新网址
viewBinding.jsbridgeBridgewebview.addHandlerLocal("toNewGame", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("toNewGame");
callBackFunction.onCallBack("");
s = s.replace("\"", "");
viewBinding.jsbridgeBridgewebview.loadUrl(s);
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("goBack", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("goBack");
callBackFunction.onCallBack("");
if(viewBinding.jsbridgeBridgewebview.canGoBack()){
viewBinding.jsbridgeBridgewebview.goBack();
}
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("googleNavigation", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("googleNavigation");
callBackFunction.onCallBack("");
// MapNavigator.googleGuide(JsBridgeActivity.this, s);
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getLanguage", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("getLanguage");
int loc = DataUtils.get(IMApplication.getAppContext(), "locale", 1);
String lauguage = "zh-TW";
switch (loc) {
case 1:
lauguage = "zh-CN";
break;
case 2:
lauguage = "en-US";
break;
case 3:
lauguage = "ja-JP";
break;
}
callBackFunction.onCallBack(lauguage);
}
});
viewBinding.jsbridgeBridgewebview.addHandlerLocal("getUserToken", new BridgeHandler() {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {
LogUtils.d("getUserToken:" + DataUtils.getToken());
callBackFunction.onCallBack(DataUtils.getToken());
}
});
}
/**
* WebChromeClient 实现类
*/
public class myWebChromeClient extends WebChromeClient {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
LogUtils.i("数据接口：onShowFileChooser");
mUploadCallbackForHighApi = filePathCallback;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
LogUtils.i("数据接口：onShowFileChooser11111");
pickMultipleMedia.launch(new PickVisualMediaRequest.Builder()
.setMediaType(ActivityResultContracts.PickVisualMedia.ImageOnly.INSTANCE)
.build());
} else {
Intent intent = fileChooserParams.createIntent();
intent.addCategory(Intent.CATEGORY_OPENABLE);
try {
startActivityForResult(intent, REQUEST_CODE_FILE_CHOOSER);
} catch (ActivityNotFoundException e) {
mUploadCallbackForHighApi = null;
// WidgetUtils.showToast(JsBridgeActivity.this, "未知错误", WidgetUtils.ToastType.ERROR);
ToastX.showShortToast("未知错误");
return false;
}
}
return true;
}
@Override
public void onProgressChanged(WebView view, int newProgress) {
super.onProgressChanged(view, newProgress);
//
// view.loadUrl("javascript:function setTop1(){document.querySelector('.footer').style.display=\"none\";" +
//// "document.querySelector('.uk-thumbnail-expand').src=\"\";"+
//// "document.querySelector('.yt-baike').style.display=\"none\";"+
// "document.querySelector('.uni-tabbar').style.display=\"none\";} setTop1();");
}
// For 3.0+
protected void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType) {
LogUtils.i("数据接口：openFileChooseracceptType");
openFilerChooser(uploadMsg);
}
//
// //For Android 4.1+
// protected void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture) {
// openFilerChooser(uploadMsg);
// }
private void openFilerChooser(ValueCallback<Uri> uploadMsg) {
LogUtils.i("数据接口：openFileChooser");
mUploadCallbackForLowApi = uploadMsg;
startActivityForResult(Intent.createChooser(getFilerChooserIntent(), "File Chooser"), REQUEST_CODE_FILE_CHOOSER);
}
private Intent getFilerChooserIntent() {
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
return intent;
}
@Override
public void onReceivedTitle(WebView view, String title) {
super.onReceivedTitle(view, title);
}
}
protected ActivityResultLauncher<String[]> permissionLauncher;
private void requestCameraPermission(String permission) {
permissionLauncher.launch(new String[]{permission});
}
}

30
app/src/main/java/com/hbl/lewan/imkit/add/FunAddFriendActivity.java → app/src/main/java/com/hbl/yuliao/imkit/add/FunAddFriendActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.add;
package com.hbl.yuliao.imkit.add;
import android.os.Bundle;
import android.text.TextUtils;
@@ -11,20 +11,20 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.SelectCountryDialog;
import com.hbl.lewan.login.PhoneLoginActivity;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.SelectCountryDialog;
import com.hbl.yuliao.login.PhoneLoginActivity;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.contactkit.ui.addfriend.BaseAddFriendActivity;
import com.netease.yunxin.kit.contactkit.ui.databinding.FunAddFriendActivityBinding;

10
app/src/main/java/com/hbl/lewan/imkit/base/BaseSettingOtherActivity.java → app/src/main/java/com/hbl/yuliao/imkit/base/BaseSettingOtherActivity.java
View File

@@ -2,16 +2,16 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.base;
package com.hbl.yuliao.imkit.base;
import android.os.Bundle;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityTeamothersettingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityTeamothersettingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
/**

38
app/src/main/java/com/hbl/lewan/imkit/base/fragment/SettingPhotoFragment.java → app/src/main/java/com/hbl/yuliao/imkit/base/fragment/SettingPhotoFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.imkit.base.fragment;
package com.hbl.yuliao.imkit.base.fragment;
import android.app.Activity;
import android.content.Context;
@@ -32,24 +32,24 @@ import com.bumptech.glide.load.model.GlideUrl;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentSetresoucePhotoBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.imkit.team.TeamMembersListActivity;
import com.hbl.lewan.imkit.team.TeamSettingActivity;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.HisChatShowBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.lewan.voom.TiktokActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentSetresoucePhotoBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.imkit.team.TeamMembersListActivity;
import com.hbl.yuliao.imkit.team.TeamSettingActivity;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.HisChatShowBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.hbl.yuliao.voom.TiktokActivity;
import com.hbl.yuliao.widget.CircleImageView;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;

8
app/src/main/java/com/hbl/lewan/imkit/person/PersonOtherSettingActivity.java → app/src/main/java/com/hbl/yuliao/imkit/person/PersonOtherSettingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.person;
package com.hbl.yuliao.imkit.person;
import android.content.Context;
import android.content.Intent;
@@ -12,9 +12,9 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.contact.ReportActivity;
import com.hbl.lewan.imkit.base.BaseSettingOtherActivity;
import com.hbl.yuliao.R;
import com.hbl.yuliao.contact.ReportActivity;
import com.hbl.yuliao.imkit.base.BaseSettingOtherActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

33
app/src/main/java/com/hbl/lewan/imkit/person/PersonSettingActivity.java → app/src/main/java/com/hbl/yuliao/imkit/person/PersonSettingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.person;
package com.hbl.yuliao.imkit.person;
import android.content.Intent;
@@ -18,21 +18,21 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.GridLayoutManager;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.contact.ReportActivity;
import com.hbl.lewan.databinding.ActivityBaseChatsettingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.imkit.team.BaseTeamQrSettingActivity;
import com.hbl.lewan.imkit.team.SettingResourceActivity;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.contact.ReportActivity;
import com.hbl.yuliao.databinding.ActivityBaseChatsettingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.imkit.team.BaseTeamQrSettingActivity;
import com.hbl.yuliao.imkit.team.SettingResourceActivity;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.msg.MsgService;
@@ -113,6 +113,7 @@ public class PersonSettingActivity extends BaseTeamQrSettingActivity implements
binding.tvexit.setVisibility(View.GONE);
binding.rlteamSet.setVisibility(View.GONE);
binding.tvpingbi.setVisibility(View.VISIBLE);
binding.zhuanshuhongbaoFl.setVisibility(View.GONE);
binding.tvinvited.setOnClickListener(view -> {
if (isBlack) {
return;

23
app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java → app/src/main/java/com/hbl/yuliao/imkit/selector/FunContactSelectorActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.selector;
package com.hbl.yuliao.imkit.selector;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.REQUEST_CONTACT_SELECTOR_AVATAR;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.CHAT_KRY;
@@ -20,6 +20,7 @@ import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.PATH_TEAM_I
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.REQUEST_CONTACT_SELECTOR_KEY;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.util.TypedValue;
@@ -34,8 +35,8 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.viewbinding.ViewBinding;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamBeInviteModeEnum;
@@ -94,7 +95,17 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity {
tvMemberslist = binding.tvContactmember;
// tvMembersLast = binding.tvContactlast;
// tvMembersSpecialGz = binding.tvContactspecialgz;
binding.title.setActionTextColor(Color.WHITE);
binding.title.getRightTextView().setBackground(getResources().getDrawable(com.hbl.yuliao.R.drawable.cornor_thempink_12dp));
int verticalPadding = SizeUtils.dp2px(5);
int horizontalPadding = SizeUtils.dp2px(10);
int endPadding = SizeUtils.dp2px(5);
TextView rightTextView = binding.title.getRightTextView();
FrameLayout.LayoutParams layoutParams =
(FrameLayout.LayoutParams) rightTextView.getLayoutParams();
layoutParams.rightMargin = SizeUtils.dp2px(endPadding);
rightTextView.setPadding(
horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
layoutContactList = binding.layoutContactlist;
layoutSearchList = binding.layoutSearchlist;
return binding.getRoot();
@@ -239,8 +250,8 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity {
titleBar
.setOnBackIconClickListener(v -> onBackPressed())
.setTitle(R.string.select)
.setActionText(type==1?getString(com.hbl.lewan.R.string.chat_message_action_multi_select):getString(R.string.selector_sure_without_num))
.setActionTextColor(getResources().getColor(R.color.color_6877fe))
.setActionText(type==1?getString(com.hbl.yuliao.R.string.chat_message_action_multi_select):getString(R.string.selector_sure_without_num))
.setActionTextColor(getResources().getColor(R.color.color_white))
.setActionListener(
v -> {
if(type==1&&isSignOne){

88
app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/BaseTeamQrSettingActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import static com.netease.nim.highavailable.HighAvailableObject.getContext;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.REQUEST_CONTACT_SELECTOR_AVATAR;
@@ -43,24 +43,25 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityBaseChatsettingBinding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.main.mine.UserInfoActivity;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityBaseChatsettingBinding;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.main.mine.UserInfoActivity;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.hbl.yuliao.widget.CircleImageView;
import com.king.zxing.util.CodeUtils;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
@@ -234,6 +235,21 @@ public abstract class BaseTeamQrSettingActivity extends BaseActivity implements
}
@Override
public void onBackPressed() {
try {
if(binding.qrRy!=null&&binding.qrRy.getVisibility()==View.VISIBLE){
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}else {
super.onBackPressed();
}
}catch (Exception e){
}
}
private boolean prepareData() {
settingType = getIntent().getIntExtra("settingtype", 0);
teamId = getIntent().getStringExtra(KEY_TEAM_ID);
@@ -500,15 +516,17 @@ public abstract class BaseTeamQrSettingActivity extends BaseActivity implements
private TextView shareTv;
private TextView saveTv;
private TextView shuaxinTv;
private CircleImageView userIv;
private TextView userTv;
FunContactSelectorDialog shareDialog;
@RequiresApi(api = Build.VERSION_CODES.M)
public void showQrcodeView() {
BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
// BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
View bottomView = LayoutInflater.from(this).inflate(R.layout.bottom_sheet_qrcode_layout, null);
userIv = (CircleImageView) bottomView.findViewById(R.id.user_iv);
userTv = (TextView) bottomView.findViewById(R.id.user_tv);
coloseIv = (ImageView) bottomView.findViewById(R.id.colose_iv);
qrcodeLy = (LinearLayout) bottomView.findViewById(R.id.qrcode_ly);
qrcodeIv = (ImageView) bottomView.findViewById(R.id.qrcode_iv);
@@ -517,8 +535,11 @@ public abstract class BaseTeamQrSettingActivity extends BaseActivity implements
copyTv = (TextView) bottomView.findViewById(R.id.copy_tv);
shareTv = (TextView) bottomView.findViewById(R.id.share_tv);
saveTv = (TextView) bottomView.findViewById(R.id.save_tv);
shuaxinTv = (TextView) bottomView.findViewById(R.id.shuaxin_tv);
// shuaxinTv = (TextView) bottomView.findViewById(R.id.shuaxin_tv);
qrcodeTipsTv.setText(getResources().getString(R.string.save_teamcode_join_txt, getString(R.string.app_name)));
((TextView)bottomView.findViewById(R.id.top_title)).setText("群二维码");
userIv.setVisibility(View.GONE);
userTv.setVisibility(View.GONE);
Bitmap bitmap = CodeUtils.createQRCode(String.format(IMUIKitConfig.SHARE_INVCODEGROUP1, teamId), DataUtils.dip2px(this, 175.0f), null);
if (loginBean != null) {
bitmap = CodeUtils.createQRCode(String.format(IMUIKitConfig.SHARE_INVCODEGROUP, loginBean.getUser().getInviteCode(), teamId), DataUtils.dip2px(this, 175.0f), null);
@@ -527,17 +548,18 @@ public abstract class BaseTeamQrSettingActivity extends BaseActivity implements
qrcodeIv.setImageBitmap(bitmap);
}
shuaxinTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ToastX.showShortToast(R.string.shuaxinchenggong_txt);
}
});
// shuaxinTv.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// ToastX.showShortToast(R.string.shuaxinchenggong_txt);
// }
// });
coloseIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
});
@@ -591,11 +613,9 @@ public abstract class BaseTeamQrSettingActivity extends BaseActivity implements
}
});
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
binding.qrRy.removeAllViews();
binding.qrRy.addView(bottomView);
binding.qrRy.setVisibility(View.VISIBLE);
dismissLoading();
}

14
app/src/main/java/com/hbl/lewan/imkit/team/SettingResourceActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/SettingResourceActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import android.content.Context;
import android.content.Intent;
@@ -17,12 +17,12 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivitySettingresourceBinding;
import com.hbl.lewan.imkit.base.fragment.SettingPhotoFragment;
import com.hbl.lewan.voom.CirclePicFragment;
import com.hbl.lewan.voom.TiktoInfokActivity;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivitySettingresourceBinding;
import com.hbl.yuliao.imkit.base.fragment.SettingPhotoFragment;
import com.hbl.yuliao.voom.CirclePicFragment;
import com.hbl.yuliao.voom.TiktoInfokActivity;
import com.google.android.material.tabs.TabLayoutMediator;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;

12
app/src/main/java/com/hbl/lewan/imkit/team/TeamAddManagerActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamAddManagerActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_ID;
@@ -24,11 +24,11 @@ import androidx.appcompat.widget.AppCompatRadioButton;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityTeamaddmanagerBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityTeamaddmanagerBinding;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;

46
app/src/main/java/com/hbl/lewan/imkit/team/TeamAnnouncementActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamAnnouncementActivity.java
View File

@@ -2,12 +2,13 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import static com.netease.yunxin.kit.teamkit.ui.utils.NetworkUtilsWrapper.handleNetworkBrokenResult;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.text.Editable;
@@ -15,6 +16,8 @@ import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.TypedValue;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
@@ -22,18 +25,18 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import com.bumptech.glide.Glide;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.contact.ReportActivity;
import com.hbl.lewan.databinding.ActivityBaseChatsettingBinding;
import com.hbl.lewan.databinding.ActivityTeamannouncementBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.contact.ReportActivity;
import com.hbl.yuliao.databinding.ActivityBaseChatsettingBinding;
import com.hbl.yuliao.databinding.ActivityTeamannouncementBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.msg.MsgService;
@@ -51,6 +54,7 @@ import com.netease.yunxin.kit.chatkit.model.UserInfoWithTeam;
import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import com.netease.yunxin.kit.chatkit.ui.model.CleanHistoryEvent;
import com.netease.yunxin.kit.common.utils.SizeUtils;
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
@@ -113,7 +117,21 @@ public class TeamAnnouncementActivity extends LllChatBaseActivity {
binding.tvTextlength.setText(editable.toString().length() + "/500");
}
});
binding.tvTeamannouncementSave.setOnClickListener(view -> {
binding.titlebarTeamannouncement.setActionText("发布");
binding.titlebarTeamannouncement.setActionTextColor(Color.WHITE);
binding.titlebarTeamannouncement.getRightTextView().setBackground(getResources().getDrawable(R.drawable.cornor_thempink_12dp));
int verticalPadding = SizeUtils.dp2px(5);
int horizontalPadding = SizeUtils.dp2px(10);
int endPadding = SizeUtils.dp2px(5);
TextView rightTextView = binding.titlebarTeamannouncement.getRightTextView();
FrameLayout.LayoutParams layoutParams =
(FrameLayout.LayoutParams) rightTextView.getLayoutParams();
layoutParams.rightMargin = SizeUtils.dp2px(endPadding);
rightTextView.setPadding(
horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
binding.titlebarTeamannouncement.getRightTextView().setOnClickListener(view -> {
//更新群公告
teamSettingViewModel.updateTeamAnnouncement(teaminfo.getId(), binding.editTeamannouncement.getText().toString());
});

16
app/src/main/java/com/hbl/lewan/imkit/team/TeamHeadBgSettingActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamHeadBgSettingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import android.Manifest;
import android.content.Context;
@@ -22,13 +22,13 @@ import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.bumptech.glide.Glide;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityHeadUserEditBinding;
import com.hbl.lewan.databinding.ActivityTeamothersettingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.UserHeadEditActivity;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityHeadUserEditBinding;
import com.hbl.yuliao.databinding.ActivityTeamothersettingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.UserHeadEditActivity;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.common.ui.photo.PhotoPicker;
import com.netease.yunxin.kit.common.ui.utils.CommonCallback;

16
app/src/main/java/com/hbl/lewan/imkit/team/TeamInvitedJoinActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamInvitedJoinActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import android.content.res.ColorStateList;
import android.os.Bundle;
@@ -6,13 +6,13 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityTeamInvitejoinBinding;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityTeamInvitejoinBinding;
import com.hbl.yuliao.main.index.add.AddFriendsActivity;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.ResponseCode;

26
app/src/main/java/com/hbl/lewan/imkit/team/TeamManagerActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamManagerActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_ID;
@@ -28,18 +28,18 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityTeamManagerBinding;
import com.hbl.lewan.databinding.ActivityTeamMembersBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.imkit.team.adapter.TeamMembersAdapter;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityTeamManagerBinding;
import com.hbl.yuliao.databinding.ActivityTeamMembersBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.imkit.team.adapter.TeamMembersAdapter;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.team.TeamService;

22
app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersJinYanActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersJinYanActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import android.os.Bundle;
import android.text.TextUtils;
@@ -14,16 +14,16 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityTeamMembersJinyanBinding;
import com.hbl.lewan.model.LikeBean;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityTeamMembersJinyanBinding;
import com.hbl.yuliao.model.LikeBean;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.FriendService;
import com.netease.nimlib.sdk.team.TeamService;

22
app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList1Activity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersList1Activity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_ID;
@@ -24,16 +24,16 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityTeamMembersBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.imkit.team.adapter.TeamMembersAdapter;
import com.hbl.lewan.imkit.team.adapter.TeamMembersAdapter1;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityTeamMembersBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.imkit.team.adapter.TeamMembersAdapter;
import com.hbl.yuliao.imkit.team.adapter.TeamMembersAdapter1;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.team.TeamService;

18
app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList2Activity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersList2Activity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_ID;
@@ -21,14 +21,14 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityTeamMembers1Binding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.imkit.team.adapter.TeamMembersAdapter2;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityTeamMembers1Binding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.imkit.team.adapter.TeamMembersAdapter2;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.team.TeamService;

20
app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersListActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersListActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_ID;
@@ -24,15 +24,15 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityTeamMembersBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.imkit.team.adapter.TeamMembersAdapter;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityTeamMembersBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.imkit.team.adapter.TeamMembersAdapter;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.team.TeamService;

34
app/src/main/java/com/hbl/lewan/imkit/team/TeamOtherSettingActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamOtherSettingActivity.java
View File

@@ -2,11 +2,12 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
@@ -22,12 +23,12 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.hbl.lewan.R;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.imkit.base.BaseSettingOtherActivity;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.imkit.base.BaseSettingOtherActivity;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
@@ -71,6 +72,7 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
// getWindow().setNavigationBarColor(Color.parseColor("#EEF0F7"));
super.onCreate(savedInstanceState);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
team = getIntent().getSerializableExtra(TEAMINFO, Team.class);
@@ -91,12 +93,12 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
}
if (type == 2) {
//修改群背景
String url = result.getData().getStringExtra("bgUrl");
if (!TextUtils.isEmpty(url)) {
Glide.with(TeamOtherSettingActivity.this)
.load(url)
.into(binding.forbgIv);
}
// String url = result.getData().getStringExtra("bgUrl");
// if (!TextUtils.isEmpty(url)) {
// Glide.with(TeamOtherSettingActivity.this)
// .load(url)
// .into(binding.forbgIv);
// }
}
//修改群头像
if (type == 3) {
@@ -146,7 +148,7 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
binding.icCleanEdit.setOnClickListener(view -> binding.tvTeamName.setText(""));
binding.flteamtransfer.setOnClickListener(view -> {
//跳转到转让
com.hbl.lewan.imkit.team.TeamMembersListActivity.launch(TeamOtherSettingActivity.this, 1, team.getId(), listmemebers, launcher);
com.hbl.yuliao.imkit.team.TeamMembersListActivity.launch(TeamOtherSettingActivity.this, 1, team.getId(), listmemebers, launcher);
});
binding.fljinyan.setOnClickListener(v -> {
Intent intent = new Intent(TeamOtherSettingActivity.this, TeamMembersJinYanActivity.class);
@@ -170,7 +172,7 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
});
binding.flteamhead.setOnClickListener(view -> {
com.hbl.lewan.imkit.team.TeamHeadBgSettingActivity.launch(
com.hbl.yuliao.imkit.team.TeamHeadBgSettingActivity.launch(
TeamOtherSettingActivity.this,
team, launcher
);
@@ -211,7 +213,7 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
teammodel.UpdateTeamFilesExtension(team.getId(), map);
});
binding.flteammanager.setOnClickListener(v -> {
Intent intent = new Intent(this, com.hbl.lewan.imkit.team.TeamManagerActivity.class);
Intent intent = new Intent(this, com.hbl.yuliao.imkit.team.TeamManagerActivity.class);
intent.putExtra(RouterConstant.KEY_TEAM_ID, team.getId());
startActivity(intent);
});

32
app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java → app/src/main/java/com/hbl/yuliao/imkit/team/TeamSettingActivity.java
View File

@@ -2,12 +2,13 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team;
package com.hbl.yuliao.imkit.team;
import static com.netease.yunxin.kit.teamkit.ui.utils.NetworkUtilsWrapper.handleNetworkBrokenResult;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
@@ -19,17 +20,17 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import com.bumptech.glide.Glide;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.contact.ReportActivity;
import com.hbl.lewan.databinding.ActivityBaseChatsettingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.redpack.SendRedPacketActivity;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.contact.ReportActivity;
import com.hbl.yuliao.databinding.ActivityBaseChatsettingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.redpack.SendRedPacketActivity;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.RequestCallbackWrapper;
@@ -78,6 +79,7 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
getWindow().setNavigationBarColor(Color.parseColor("#EEF0F7"));
super.onCreate(savedInstanceState);
teammodel.requestTeamData(teamId);
teammodel.requestTeamMembers(teamId);
@@ -178,6 +180,12 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
TeamMembersList2Activity.launch(TeamSettingActivity.this, manager, false, teamId, listmemebers, teamInfo, launcher1);
});
binding.zhuanshuhongbaoFl.setOnClickListener(v -> {
Intent intent = new Intent(TeamSettingActivity.this,ZhuanShuListActivity.class);
intent.putExtra(ZhuanShuListActivity.TEAMINFO,teamInfo);
startActivity(intent);
});
}
private void getChatList() {

214
app/src/main/java/com/hbl/yuliao/imkit/team/ZhuanShuListActivity.java Normal file
View File

@@ -0,0 +1,214 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.yuliao.imkit.team;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityTeamZhuanshuBinding;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.chatkit.ui.dialog.RedPacketDialog;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketBean;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketGroupBean;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.utils.ScreenUtils;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
import java.util.ArrayList;
import java.util.List;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* 未领取专属红包
*/
public class ZhuanShuListActivity extends BaseActivity {
int page = 1;
public static final String TEAMINFO = "teamInfo";
ActivityTeamZhuanshuBinding viewBinding;
private Team teamInfo;
CommonAdapter commonAdapter1;
List<RedpacketGroupBean> quesListBeans = new ArrayList<>();
int sWidth;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
getWindow().setStatusBarColor(getResources().getColor(R.color.color_white));
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR|View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
super.onCreate(savedInstanceState);
viewBinding = ActivityTeamZhuanshuBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
teamInfo = (Team) getIntent().getSerializableExtra(TEAMINFO);
sWidth = ScreenUtils.getDisplayWidth();
if (teamInfo != null) {
}else{
finish();
}
initList();
initRefreshLayout();
// viewBinding.refreshLayout.autoRefresh();
viewBinding.refreshLayout.autoRefresh();
viewBinding.title.getBackImageView().setOnClickListener(v -> finish());
}
@Override
protected void onResume() {
super.onResume();
}
private void initList() {
// int loc = PreferencesToolkits.getNew(MyApplication.getInstance2(),"locale",1);
// if(loc<2) {
if(sWidth>1400){
GridLayoutManager gridLayoutManager = new GridLayoutManager(this,2);
viewBinding. rvMembers.setLayoutManager(gridLayoutManager);
}else{
LinearLayoutManager gridLayoutManager = new LinearLayoutManager(this);
viewBinding. rvMembers.setLayoutManager(gridLayoutManager);
}
commonAdapter1 = new CommonAdapter<>(this, R.layout.item_wl_rd_item, quesListBeans) {
@Override
public void convert(ViewHolder holder, RedpacketGroupBean s, int index) {
holder.setText(R.id.title_tv,s.getSenderNickname()+"发给我的专属红包");
holder.setText(R.id.jine_tv,"¥ "+ AppUtils.getQian(s.getAmount()));
holder.setText(R.id.time_tv,""+ s.getSendTime());
holder.getView(R.id.item_ry).setOnClickListener(v -> {
UserInfo userInfo = new UserInfo(s.getSenderUid()+"",s.getSenderNickname(),"");
s.setReceiverUid(IMKitClient.account());
holder.getView(R.id.bot_line).setVisibility(View.VISIBLE);
if(index == quesListBeans.size()-1){
holder.getView(R.id.bot_line).setVisibility(View.GONE);
}
RedPacketDialog redPacketDialog = new RedPacketDialog(ZhuanShuListActivity.this, userInfo, s, true, teamInfo.getId());
redPacketDialog.setOnActionListener(new RedPacketDialog.OnRedPacketActionListener() {
@Override
public void openRedPacket(RedpacketBean bonusBean) {
}
@Override
public void openRedPacketGroup(RedpacketGroupBean bonusBean) {
page = 1;
quesListBeans.clear();
commonAdapter1.setDates(quesListBeans);
getDateList();
}
});
redPacketDialog.show();
});
}
};
viewBinding.rvMembers.setAdapter(commonAdapter1);
}
private void initRefreshLayout() {
viewBinding.refreshLayout.setEnableLoadMore(false);
viewBinding.refreshLayout.setOnRefreshListener(refreshlayout -> {
viewBinding.refreshLayout.setVisibility(View.VISIBLE);
viewBinding.nodateLy.setVisibility(View.GONE);
viewBinding.refreshLayout.setEnableLoadMore(true);
page = 1;
quesListBeans.clear();
commonAdapter1.setDates(quesListBeans);
getDateList();
});
viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
@Override
public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
page+=1;
getDateList();
}
});
}
private void getDateList() {
Api.getInstance().unclaimed(IMKitClient.account(), page, 30, teamInfo.getId())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<ListBeanResult<RedpacketGroupBean>> feedbackResp) {
changeDate(feedbackResp.data);
}
@Override
public void onError(int code, String msg) {
viewBinding.refreshLayout.finishRefresh();
viewBinding.refreshLayout.finishLoadMore();
changeView(false);
}
});
}
private void changeDate(ListBeanResult<RedpacketGroupBean> data) {
if (data.getList() != null) {
if (page == 1) {
quesListBeans = (ArrayList<RedpacketGroupBean>) data.getList();
commonAdapter1.setDates(quesListBeans);
DataUtils.set(ZhuanShuListActivity.this, "message_list_" + IMKitClient.account(), GsonUtils.beanToJSONString(quesListBeans));
} else {
commonAdapter1.addDates(data.getList());
quesListBeans = (ArrayList<RedpacketGroupBean>) commonAdapter1.getDates();
}
}
viewBinding.refreshLayout.finishRefresh();
viewBinding.refreshLayout.finishLoadMore();
if (quesListBeans.size() == data.getTotal()) {
viewBinding.refreshLayout.finishLoadMoreWithNoMoreData();
}
changeView(true);
}
private void changeView(boolean isNodate) {
if (quesListBeans == null || (quesListBeans.size() == 0)) {
viewBinding.nodateLy.setVisibility(View.VISIBLE);
viewBinding.refreshLayout.setVisibility(View.GONE);
viewBinding.nodateTv.setText(getString(R.string.nodate_txt));
} else {
viewBinding.refreshLayout.setVisibility(View.VISIBLE);
viewBinding.nodateLy.setVisibility(View.GONE);
}
viewBinding.nodateLy.setOnClickListener(view -> {
viewBinding.refreshLayout.autoRefresh();
});
}
}

6
app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter.java → app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team.adapter;
package com.hbl.yuliao.imkit.team.adapter;
import android.content.Context;
import android.graphics.Color;
@@ -17,8 +17,8 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewbinding.ViewBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.TeamMembersViewHolderBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.TeamMembersViewHolderBinding;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;

6
app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter1.java → app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter1.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team.adapter;
package com.hbl.yuliao.imkit.team.adapter;
import android.content.Context;
import android.graphics.Color;
@@ -16,8 +16,8 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewbinding.ViewBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.TeamMembersViewHolderBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.TeamMembersViewHolderBinding;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;

8
app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter2.java → app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter2.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.team.adapter;
package com.hbl.yuliao.imkit.team.adapter;
import android.content.Context;
import android.graphics.Color;
@@ -17,9 +17,9 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewbinding.ViewBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.TeamMembersViewHolder2Binding;
import com.hbl.lewan.imkit.team.TeamMembersList2Activity;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.TeamMembersViewHolder2Binding;
import com.hbl.yuliao.imkit.team.TeamMembersList2Activity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;

4
app/src/main/java/com/hbl/lewan/imkit/verify/FunVerifyListActivity.java → app/src/main/java/com/hbl/yuliao/imkit/verify/FunVerifyListActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.imkit.verify;
package com.hbl.yuliao.imkit.verify;
import android.content.Intent;
import android.os.Bundle;
@@ -13,7 +13,7 @@ import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.Nullable;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.yunxin.kit.contactkit.ui.ILoadListener;
import com.netease.yunxin.kit.contactkit.ui.R;

4
app/src/main/java/com/hbl/lewan/imkit/watch/CheckImageVideoActivity.java → app/src/main/java/com/hbl/yuliao/imkit/watch/CheckImageVideoActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.imkit.watch;
package com.hbl.yuliao.imkit.watch;
import android.content.Context;
import android.content.Intent;
@@ -6,7 +6,7 @@ import android.content.Intent;
import androidx.activity.result.ActivityResultLauncher;
import androidx.viewpager2.widget.ViewPager2;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.yunxin.kit.chatkit.ui.page.adapter.WatchImageAdapter;

2
app/src/main/java/com/hbl/lewan/jpush/LocalBroadcastManager.java → app/src/main/java/com/hbl/yuliao/jpush/LocalBroadcastManager.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.jpush;
package com.hbl.yuliao.jpush;
import android.content.BroadcastReceiver;
import android.content.Context;

18
app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java → app/src/main/java/com/hbl/yuliao/jpush/PushMessageReceiver.java
View File

@@ -1,4 +1,4 @@
//package com.hbl.lewan.jpush;
//package com.hbl.yuliao.jpush;
//
//import android.content.Context;
//import android.content.Intent;
@@ -6,14 +6,14 @@
//import android.text.TextUtils;
//import android.util.Log;
//
//import com.hbl.lewan.main.MainActivity;
//import com.hbl.lewan.main.message.NotifyActMessageActivity;
//import com.hbl.lewan.main.message.NotifyMessageDetailsActivity;
//import com.hbl.lewan.model.NotifyExtraBean;
//import com.hbl.lewan.utils.GsonUtils;
//import com.hbl.lewan.utils.play.VoiceUtils;
//import com.hbl.lewan.voom.MessageActivity;
//import com.hbl.lewan.welcome.WelcomeActivity;
//import com.hbl.yuliao.main.MainActivity;
//import com.hbl.yuliao.main.message.NotifyActMessageActivity;
//import com.hbl.yuliao.main.message.NotifyMessageDetailsActivity;
//import com.hbl.yuliao.model.NotifyExtraBean;
//import com.hbl.yuliao.utils.GsonUtils;
//import com.hbl.yuliao.utils.play.VoiceUtils;
//import com.hbl.yuliao.voom.MessageActivity;
//import com.hbl.yuliao.welcome.WelcomeActivity;
//import com.google.gson.JsonObject;
//
//import cn.jpush.android.api.CmdMessage;

2
app/src/main/java/com/hbl/lewan/jpush/TagAliasOperatorHelper.java → app/src/main/java/com/hbl/yuliao/jpush/TagAliasOperatorHelper.java
View File

@@ -1,4 +1,4 @@
//package com.hbl.lewan.jpush;
//package com.hbl.yuliao.jpush;
//
//import android.content.Context;
//import android.os.Handler;

2
app/src/main/java/com/hbl/lewan/jpush/Utils.java → app/src/main/java/com/hbl/yuliao/jpush/Utils.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.jpush;
package com.hbl.yuliao.jpush;
import android.content.Context;
import android.content.pm.ApplicationInfo;

60
app/src/main/java/com/hbl/lewan/login/ChongZhiActivity.java → app/src/main/java/com/hbl/yuliao/login/ChongZhiActivity.java
View File

@@ -2,11 +2,12 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.login;
package com.hbl.yuliao.login;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
@@ -22,26 +23,26 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityChongzhiBinding;
import com.hbl.lewan.databinding.ActivityWangjiBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.ActionConfirmDialog1;
import com.hbl.lewan.dialog.SelectCountryDialog;
import com.hbl.lewan.main.mine.ChangePhoneActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityChongzhiBinding;
import com.hbl.yuliao.databinding.ActivityWangjiBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.ActionConfirmDialog1;
import com.hbl.yuliao.dialog.SelectCountryDialog;
import com.hbl.yuliao.main.mine.ChangePhoneActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
@@ -60,7 +61,7 @@ import io.reactivex.schedulers.Schedulers;
*/
public class ChongZhiActivity extends BaseActivity {
protected ActivityResultLauncher<String[]> permissionLauncher;
String passwordCode = null;
// String passwordCode = null;
private static final String TAG = "WelcomeActivity";
private ActivityChongzhiBinding activityWelcomeBinding;
@@ -84,6 +85,7 @@ public class ChongZhiActivity extends BaseActivity {
activityWelcomeBinding.aboutTitleBar.setOnBackIconClickListener(v -> {
onBackPressed();
});
activityWelcomeBinding.sendSmsTv.setPaintFlags(activityWelcomeBinding.sendSmsTv.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
countryBean = DataUtils.getLocCountry(ChongZhiActivity.this);
changeArea();
@@ -92,7 +94,7 @@ public class ChongZhiActivity extends BaseActivity {
activityWelcomeBinding.nextIv, activityWelcomeBinding.changeSmsCodeTv);
activityWelcomeBinding.nextIv.setOnClickListener(v -> {
if (step == 2) {
if (TextUtils.isEmpty(passwordCode)) {
if (TextUtils.isEmpty(activityWelcomeBinding.passwordEditTextCode.getText().toString().trim())) {
ToastX.showShortToast(R.string.dxyzmbnwk_txt);
return;
}
@@ -130,10 +132,10 @@ public class ChongZhiActivity extends BaseActivity {
step = 2;
changeStep();
});
activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
passwordCode = code;
});
// activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
// passwordCode = code;
//
// });
activityWelcomeBinding.sendSmsTv.setOnClickListener(v -> {
@@ -177,7 +179,7 @@ public class ChongZhiActivity extends BaseActivity {
private void checkVerfyCode() {
Map<String, Object> maps = new HashMap<>();
maps.put("verifyCode", passwordCode);
maps.put("verifyCode", activityWelcomeBinding.passwordEditTextCode.getText().toString().trim());
maps.put("phone", bean.getPhone());
maps.put("areaCode", bean.getAreaCode());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
@@ -219,7 +221,7 @@ public class ChongZhiActivity extends BaseActivity {
Map<String, String> maps = new HashMap<>();
maps.put("phone", bean.getPhone());
maps.put("areaCode", bean.getAreaCode());
maps.put("verifyCode", passwordCode);
maps.put("verifyCode", activityWelcomeBinding.passwordEditTextCode.getText().toString().trim());
maps.put("newPassword", activityWelcomeBinding.passwordEt.getText().toString().trim());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);

44
app/src/main/java/com/hbl/lewan/login/LoginActivity.java → app/src/main/java/com/hbl/yuliao/login/LoginActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.login;
package com.hbl.yuliao.login;
import android.content.Intent;
@@ -13,27 +13,27 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityLoginBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityLoginBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.lewan.network.BaseObserver1;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GetAndroidUniqueMark;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.lewan.wxapi.bean.WeiXin;
import com.hbl.lewan.wxapi.bean.WeiXinInfo;
import com.hbl.lewan.wxapi.bean.WeiXinToken;
import com.hbl.yuliao.network.BaseObserver1;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GetAndroidUniqueMark;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.hbl.yuliao.wxapi.bean.WeiXin;
import com.hbl.yuliao.wxapi.bean.WeiXinInfo;
import com.hbl.yuliao.wxapi.bean.WeiXinToken;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -47,7 +47,7 @@ import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import com.hbl.lewan.network.Result;
import com.hbl.yuliao.network.Result;
/**
* Welcome Page is launch page
*/

70
app/src/main/java/com/hbl/lewan/login/PhoneLoginActivity.java → app/src/main/java/com/hbl/yuliao/login/PhoneLoginActivity.java
View File

@@ -2,12 +2,13 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.login;
package com.hbl.yuliao.login;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Paint;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Handler;
@@ -26,29 +27,29 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.text.HtmlCompat;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityPhoneLoginBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.SelectCountryDialog;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.PassWordLoginBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityPhoneLoginBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.SelectCountryDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.PassWordLoginBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GetAndroidUniqueMark;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GetAndroidUniqueMark;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -134,7 +135,7 @@ public class PhoneLoginActivity extends BaseActivity {
// checkPhone();
doLogin();
} else {
if (TextUtils.isEmpty(passwordCode)) {
if (TextUtils.isEmpty(activityWelcomeBinding.passwordEditTextCode.getText().toString().trim())) {
ToastX.showShortToast(R.string.dxyzmbnwk_txt);
return;
}
@@ -149,15 +150,18 @@ public class PhoneLoginActivity extends BaseActivity {
countryBean.getAreaCodeName() + " " + activityWelcomeBinding.phoneEt.getText().toString().trim()),HtmlCompat.FROM_HTML_MODE_LEGACY));
changeStep();
});
activityWelcomeBinding.sendSmsTv.setPaintFlags(activityWelcomeBinding.sendSmsTv.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
activityWelcomeBinding.changePassTv.setOnClickListener(v -> {
step = 2;
hideSoftInput(this);
changeStep();
});
activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
passwordCode = code;
});
// activityWelcomeBinding.passwordEditTextCode
// .setOnCompleteListener(code -> {
// passwordCode = code;
// });
activityWelcomeBinding.wangjiTv.setOnClickListener(v -> startActivity(new Intent(PhoneLoginActivity.this, WangjiActivity.class)));
@@ -166,7 +170,7 @@ public class PhoneLoginActivity extends BaseActivity {
AnimUtil.setAnimViews(activityWelcomeBinding.sendSmsTv, activityWelcomeBinding.changePassTv,
activityWelcomeBinding.nextIv, activityWelcomeBinding.changeSmsCodeTv, activityWelcomeBinding.areaTv);
activityWelcomeBinding.areaTv.setText(com.hbl.lewan.network.ApiService.AREA_CODE);
activityWelcomeBinding.areaTv.setText(com.hbl.yuliao.network.ApiService.AREA_CODE);
}
@@ -393,7 +397,7 @@ public class PhoneLoginActivity extends BaseActivity {
Map<String, Object> maps = new HashMap<>();
maps.put("phone", activityWelcomeBinding.phoneEt.getText().toString());
maps.put("areaCode", countryBean.getAreaCodeName());
maps.put("verifyCode", String.valueOf(passwordCode));
maps.put("verifyCode",activityWelcomeBinding.passwordEditTextCode.getText().toString().trim());
maps.put("deviceType", 0);
maps.put("deviceId", GetAndroidUniqueMark.getUniqueId(PhoneLoginActivity.this));
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
@@ -523,8 +527,8 @@ public class PhoneLoginActivity extends BaseActivity {
BrowseActivity.Companion.launch(
PhoneLoginActivity.this, getString(R.string.fuwuxieyi_txt), IMUIKitConfig.RBCHAT_PRIVACY_CN_URL);
});
unit.setNormalTextColor(ContextCompat.getColor(contentView.getContext(), R.color.color_fe6881));
unit.setPressTextColor(ContextCompat.getColor(contentView.getContext(), R.color.color_fe6881));
unit.setNormalTextColor(ContextCompat.getColor(contentView.getContext(), R.color.color_themepink));
unit.setPressTextColor(ContextCompat.getColor(contentView.getContext(), R.color.color_themepink));
unit.showUnderline();
CustomClickableSpan customClickableSpan = new CustomClickableSpan(unit);
stringBuilder.setSpan(customClickableSpan, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -536,8 +540,8 @@ public class PhoneLoginActivity extends BaseActivity {
BrowseActivity.Companion.launch(
PhoneLoginActivity.this, getString(R.string.yinsizhengche_txt), IMUIKitConfig.RBCHAT_PRIVACY_CN_URL);
});
unit1.setNormalTextColor(ContextCompat.getColor(contentView.getContext(), R.color.color_fe6881));
unit1.setPressTextColor(ContextCompat.getColor(contentView.getContext(), R.color.color_fe6881));
unit1.setNormalTextColor(ContextCompat.getColor(contentView.getContext(), R.color.color_themepink));
unit1.setPressTextColor(ContextCompat.getColor(contentView.getContext(), R.color.color_themepink));
unit1.showUnderline();
CustomClickableSpan customClickableSpan1 = new CustomClickableSpan(unit1);
stringBuilder.setSpan(customClickableSpan1, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

102
app/src/main/java/com/hbl/lewan/login/RegisterActivity.java → app/src/main/java/com/hbl/yuliao/login/RegisterActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.login;
package com.hbl.yuliao.login;
import static com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant.LIB_TAG;
@@ -13,6 +13,7 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
@@ -51,32 +52,32 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityPhoneLoginBinding;
import com.hbl.lewan.databinding.ActivityRegisterBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.SelectCountryDialog;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.model.AvaterBean;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.PassWordLoginBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GetAndroidUniqueMark;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityPhoneLoginBinding;
import com.hbl.yuliao.databinding.ActivityRegisterBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.SelectCountryDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.AvaterBean;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.PassWordLoginBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GetAndroidUniqueMark;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.config.SelectMimeType;
@@ -195,7 +196,7 @@ public class RegisterActivity extends BaseActivity {
}
checkPhone();
} else if (step == 2) {
if (TextUtils.isEmpty(passwordCode)||passwordCode.length()!=4) {
if (TextUtils.isEmpty(activityWelcomeBinding.passwordEditTextCode.getText().toString())) {
ToastX.showShortToast(R.string.dxyzmbnwk_txt);
return;
}
@@ -250,11 +251,12 @@ public class RegisterActivity extends BaseActivity {
step = 2;
changeStep();
});
activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
passwordCode = code;
});
// activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
// passwordCode = code;
//
// });
activityWelcomeBinding.sendSmsTv.setPaintFlags(activityWelcomeBinding.sendSmsTv.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
activityWelcomeBinding.sendSmsTv.setOnClickListener(v -> {
toStep2();
@@ -329,7 +331,7 @@ public class RegisterActivity extends BaseActivity {
private void checkVerfyCode() {
Map<String, Object> maps = new HashMap<>();
maps.put("verifyCode", passwordCode);
maps.put("verifyCode", activityWelcomeBinding.passwordEditTextCode.getText().toString().trim());
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
maps.put("areaCode", countryBean.getAreaCodeName());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
@@ -350,6 +352,9 @@ public class RegisterActivity extends BaseActivity {
}, 500);
} else {
ToastX.showShortToast(R.string.yzmbzq_txt);
// step += 1;
// changeStep();
}
}
@@ -359,7 +364,8 @@ public class RegisterActivity extends BaseActivity {
LogUtils.i("获取到的错误:" + code + "" + msg);
ToastX.showShortToast( msg);
// step += 1;
// changeStep();
}
});
}
@@ -396,6 +402,9 @@ public class RegisterActivity extends BaseActivity {
public void onError(int code, String msg) {
LogUtils.i("获取到的错误:" + code + "" + msg);
ToastX.showShortToast(msg);
//
// step += 1;
// changeStep();
}
});
}
@@ -407,7 +416,7 @@ public class RegisterActivity extends BaseActivity {
maps.put("areaCode", countryBean.getAreaCodeName());
maps.put("nickname", activityWelcomeBinding.nicknameEt.getText().toString().trim());
maps.put("password", activityWelcomeBinding.passwordEt.getText().toString().trim());
maps.put("verifyCode", passwordCode);
maps.put("verifyCode", activityWelcomeBinding.passwordEditTextCode.getText().toString().trim());
if (!TextUtils.isEmpty(avater)) {
maps.put("avatar", avater);
}
@@ -595,10 +604,20 @@ public class RegisterActivity extends BaseActivity {
sexType = i;
activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_f);
activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_f);
activityWelcomeBinding.nanLy.setBackgroundResource(R.drawable.xinbie_f);
activityWelcomeBinding.nvLy.setBackgroundResource(R.drawable.xinbie_f);
if (i == 1) {
activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_t);
activityWelcomeBinding.nanLy.setBackgroundResource(R.drawable.nan_bg_t);
activityWelcomeBinding.nanTv.setTextColor(getColor(R.color.white));
activityWelcomeBinding.nvTv.setTextColor(getColor(R.color.color_2c2c2c));
} else {
activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_t);
activityWelcomeBinding.nvLy.setBackgroundResource(R.drawable.nv_bg_t);
activityWelcomeBinding.nvTv.setTextColor(getColor(R.color.white));
activityWelcomeBinding.nanTv.setTextColor(getColor(R.color.color_2c2c2c));
}
}
@@ -621,6 +640,8 @@ public class RegisterActivity extends BaseActivity {
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
// activityWelcomeBinding.nextIv.setText("下一步");
break;
case 2:
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
@@ -631,6 +652,8 @@ public class RegisterActivity extends BaseActivity {
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
activityWelcomeBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt),
countryBean.getAreaCodeName()+" "+activityWelcomeBinding.phoneEt.getText().toString().trim())));
// activityWelcomeBinding.nextIv.setText("下一步");
break;
case 3:
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
@@ -639,6 +662,7 @@ public class RegisterActivity extends BaseActivity {
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
// activityWelcomeBinding.nextIv.setText("确认");
break;
case 4:
@@ -878,8 +902,8 @@ public class RegisterActivity extends BaseActivity {
BrowseActivity.Companion.launch(
RegisterActivity.this, getString(R.string.fuwuxieyi_txt), IMUIKitConfig.RBCHAT_SERVICE_CN_URL);
});
unit.setNormalTextColor(ContextCompat.getColor(RegisterActivity.this, R.color.color_7f7b81));
unit.setPressTextColor(ContextCompat.getColor(RegisterActivity.this, R.color.color_7f7b81));
unit.setNormalTextColor(ContextCompat.getColor(RegisterActivity.this, R.color.color_themepink));
unit.setPressTextColor(ContextCompat.getColor(RegisterActivity.this, R.color.color_themepink));
unit.showUnderline();
CustomClickableSpan customClickableSpan = new CustomClickableSpan(unit);
stringBuilder.setSpan(customClickableSpan, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -891,8 +915,8 @@ public class RegisterActivity extends BaseActivity {
BrowseActivity.Companion.launch(
RegisterActivity.this, getString(R.string.yinsizhengche_txt), IMUIKitConfig.RBCHAT_PRIVACY_CN_URL);
});
unit1.setNormalTextColor(ContextCompat.getColor(RegisterActivity.this, R.color.color_7f7b81));
unit1.setPressTextColor(ContextCompat.getColor(RegisterActivity.this, R.color.color_7f7b81));
unit1.setNormalTextColor(ContextCompat.getColor(RegisterActivity.this, R.color.color_themepink));
unit1.setPressTextColor(ContextCompat.getColor(RegisterActivity.this, R.color.color_themepink));
unit1.showUnderline();
CustomClickableSpan customClickableSpan1 = new CustomClickableSpan(unit1);
stringBuilder.setSpan(customClickableSpan1, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

50
app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java → app/src/main/java/com/hbl/yuliao/login/RegisterActivityBf.java
View File

@@ -2,7 +2,7 @@
//// Use of this source code is governed by a MIT license that can be
//// found in the LICENSE file.
//
//package com.hbl.lewan.login;
//package com.hbl.yuliao.login;
//
//
//import android.Manifest;
@@ -49,30 +49,30 @@
//import com.bumptech.glide.request.RequestOptions;
//import com.bumptech.glide.request.target.CustomTarget;
//import com.bumptech.glide.request.transition.Transition;
//import com.hbl.lewan.IMApplication;
//import com.hbl.lewan.IMUIKitConfig;
//import com.hbl.lewan.R;
//import com.hbl.lewan.databinding.ActivityRegisterBfBinding;
//import com.hbl.lewan.databinding.ActivityRegisterBinding;
//import com.hbl.lewan.dialog.ActionConfirmDialog;
//import com.hbl.lewan.dialog.SelectCountryDialog;
//import com.hbl.lewan.main.MainActivity;
//import com.hbl.lewan.model.CountryBean;
//import com.hbl.lewan.model.LoginBean;
//import com.hbl.lewan.model.PassWordLoginBean;
//import com.hbl.lewan.model.RegisteredBean;
//import com.hbl.lewan.model.StsCredentialsBean;
//import com.hbl.lewan.network.Api;
//import com.hbl.lewan.network.BaseObserver;
//import com.hbl.lewan.network.Result;
//import com.hbl.lewan.utils.AnimUtil;
//import com.hbl.lewan.utils.AppUtils;
//import com.hbl.lewan.utils.Constant;
//import com.hbl.lewan.utils.DataUtils;
//import com.hbl.lewan.utils.GetAndroidUniqueMark;
//import com.hbl.lewan.utils.GsonUtils;
//import com.hbl.lewan.utils.LogUtils;
//import com.hbl.lewan.utils.TaiWanIDCardUtils;
//import com.hbl.yuliao.IMApplication;
//import com.hbl.yuliao.IMUIKitConfig;
//import com.hbl.yuliao.R;
//import com.hbl.yuliao.databinding.ActivityRegisterBfBinding;
//import com.hbl.yuliao.databinding.ActivityRegisterBinding;
//import com.hbl.yuliao.dialog.ActionConfirmDialog;
//import com.hbl.yuliao.dialog.SelectCountryDialog;
//import com.hbl.yuliao.main.MainActivity;
//import com.hbl.yuliao.model.CountryBean;
//import com.hbl.yuliao.model.LoginBean;
//import com.hbl.yuliao.model.PassWordLoginBean;
//import com.hbl.yuliao.model.RegisteredBean;
//import com.hbl.yuliao.model.StsCredentialsBean;
//import com.hbl.yuliao.network.Api;
//import com.hbl.yuliao.network.BaseObserver;
//import com.hbl.yuliao.network.Result;
//import com.hbl.yuliao.utils.AnimUtil;
//import com.hbl.yuliao.utils.AppUtils;
//import com.hbl.yuliao.utils.Constant;
//import com.hbl.yuliao.utils.DataUtils;
//import com.hbl.yuliao.utils.GetAndroidUniqueMark;
//import com.hbl.yuliao.utils.GsonUtils;
//import com.hbl.yuliao.utils.LogUtils;
//import com.hbl.yuliao.utils.TaiWanIDCardUtils;
//import com.luck.picture.lib.basic.PictureSelector;
//import com.luck.picture.lib.config.PictureMimeType;
//import com.luck.picture.lib.config.SelectMimeType;

54
app/src/main/java/com/hbl/lewan/login/WangjiActivity.java → app/src/main/java/com/hbl/yuliao/login/WangjiActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.login;
package com.hbl.yuliao.login;
import android.Manifest;
@@ -50,32 +50,32 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityRegisterBinding;
import com.hbl.lewan.databinding.ActivityWangjiBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.SelectCountryDialog;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.mine.ChangePasswordActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.PassWordLoginBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GetAndroidUniqueMark;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityRegisterBinding;
import com.hbl.yuliao.databinding.ActivityWangjiBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.SelectCountryDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.mine.ChangePasswordActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.PassWordLoginBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GetAndroidUniqueMark;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.config.SelectMimeType;

131
app/src/main/java/com/hbl/yuliao/main/CustomCallOrderHelper.java Normal file
View File

@@ -0,0 +1,131 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.yuliao.main;
import com.netease.nimlib.sdk.avsignalling.constant.ChannelType;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.attachment.NetCallAttachment;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.alog.ParameterMap;
import com.netease.yunxin.kit.chatkit.repo.ChatRepo;
import com.netease.yunxin.kit.common.utils.NetworkUtils;
import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall;
import com.netease.yunxin.nertc.nertcvideocall.model.impl.DefaultCallOrderImpl;
import com.netease.yunxin.nertc.nertcvideocall.model.impl.state.CallState;
import com.netease.yunxin.nertc.nertcvideocall.utils.CallParams;
import com.netease.yunxin.nertc.nertcvideocall.utils.NrtcCallStatus;
import java.util.Collections;
import java.util.List;
class CustomCallOrderHelper extends DefaultCallOrderImpl {
private static final String TAG = "CustomCallOrderHelper";
@Override
public void onCanceled(ChannelType channelType, String accountId, int callType) {
ALog.dApi(
TAG,
new ParameterMap("onCanceled")
.append("channelType", channelType)
.append("callType", callType)
.append("accountId", accountId)
.append("enableOrder", isEnable())
.toValue());
if (!isEnable()) {
return;
}
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType);
}
@Override
public void onReject(ChannelType channelType, String accountId, int callType) {
ALog.dApi(
TAG,
new ParameterMap("onReject")
.append("channelType", channelType)
.append("callType", callType)
.append("accountId", accountId)
.append("enableOrder", isEnable())
.toValue());
if (!isEnable()) {
return;
}
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusRejected, callType);
}
@Override
public void onTimeout(ChannelType channelType, String accountId, int callType) {
ALog.dApi(
TAG,
new ParameterMap("onTimeout")
.append("channelType", channelType)
.append("callType", callType)
.append("accountId", accountId)
.append("enableOrder", isEnable())
.toValue());
if (!isEnable()) {
return;
}
if (NERTCVideoCall.sharedInstance().getCurrentState() == CallState.STATE_INVITED) {
return;
}
if (NetworkUtils.isConnected()) {
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusTimeout, callType);
} else {
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusCanceled, callType);
}
}
@Override
public void onBusy(ChannelType channelType, String accountId, int callType) {
ALog.dApi(
TAG,
new ParameterMap("onBusy")
.append("channelType", channelType)
.append("callType", callType)
.append("accountId", accountId)
.append("enableOrder", isEnable())
.toValue());
if (!isEnable()) {
return;
}
sendOrder(channelType, accountId, NrtcCallStatus.NrtcCallStatusBusy, callType);
}
public static void sendOrder(
ChannelType channelType, String accountId, int status, int callType) {
sendOrder(channelType, accountId, status, Collections.emptyList(), callType);
}
public static void sendOrder(
ChannelType channelType,
String accountId,
int status,
List<NetCallAttachment.Duration> durations,
int callType) {
ALog.dApi(
TAG,
new ParameterMap("sendOrder")
.append("status", status)
.append("channelType", channelType)
.append("callType", callType)
.append("durations", durations)
.append("accountId", accountId)
.toValue());
if (callType == CallParams.CallType.P2P) {
NetCallAttachment netCallAttachment =
new NetCallAttachment.NetCallAttachmentBuilder()
.withType(channelType != null ? channelType.getValue() : ChannelType.VIDEO.getValue())
.withStatus(status)
.withDurations(durations)
.build();
IMMessage message =
MessageBuilder.createNrtcNetcallMessage(
accountId, SessionTypeEnum.P2P, netCallAttachment);
ChatRepo.sendMessage(message, true, null);
}
}
}

2
app/src/main/java/com/hbl/lewan/main/FragmentAdapter.java → app/src/main/java/com/hbl/yuliao/main/FragmentAdapter.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main;
package com.hbl.yuliao.main;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;

751
app/src/main/java/com/hbl/lewan/main/MainActivity.java → app/src/main/java/com/hbl/yuliao/main/MainActivity.java
View File

@@ -2,12 +2,13 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main;
package com.hbl.yuliao.main;
import static com.luck.picture.lib.utils.DensityUtil.getNavigationBarHeight;
import static com.netease.yunxin.kit.chatkit.ui.fun.FunChatForwardSelectDialog.TAG;
//import static io.agora.onetoone.signalClient.CallRtmSignalClientKt.createRtmSignalClient;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
@@ -19,9 +20,11 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -34,6 +37,7 @@ import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.Window;
import android.widget.EditText;
import android.widget.ImageView;
@@ -58,55 +62,57 @@ import androidx.viewpager2.widget.ViewPager2;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.CustomConfig;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.NotificationMsgService;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityMainBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.ActionConfirmDialog1;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.VersionDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.main.authorize.AuthorizeActivity;
import com.hbl.lewan.main.chat.ChatConversationFragment;
import com.hbl.lewan.main.chat.ChatTabFragment;
import com.hbl.lewan.main.home.HomeFragment;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.main.mine.MineFragment;
import com.hbl.lewan.main.mine.setting.SettingNotifyViewModel;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.ConfigBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.MessagefcmBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.model.VersionBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.pay.PaymentActivity;
import com.hbl.lewan.pay.PaymentActivity1;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.CommonUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.QRCodeScheme;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.lewan.voom.VoomFragment;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.CustomConfig;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.NotificationMsgService;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.databinding.ActivityMainBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.ActionConfirmDialog1;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.VersionDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.game.ShopFragment;
import com.hbl.yuliao.main.authorize.AuthorizeActivity;
import com.hbl.yuliao.main.chat.ChatConversationFragment;
import com.hbl.yuliao.main.chat.ChatTabFragment;
import com.hbl.yuliao.main.home.HomeFragment;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.main.mine.MineFragment;
import com.hbl.yuliao.main.mine.setting.SettingNotifyViewModel;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.ConfigBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.MessagefcmBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.model.VersionBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.pay.PaymentActivity;
import com.hbl.yuliao.pay.PaymentActivity1;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.CommonUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.QRCodeScheme;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.hbl.yuliao.voom.VoomFragment;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.JsonObject;
import com.huawei.hms.hmsscankit.ScanUtilNew;
@@ -115,6 +121,7 @@ import com.huawei.hms.ml.scan.HmsScanAnalyzerOptions;
import com.king.app.updater.AppUpdater;
import com.king.zxing.util.CodeUtils;
//import com.netease.lava.nertc.sdk.NERtcOption;
import com.netease.lava.nertc.sdk.NERtcOption;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.Observer;
import com.netease.nimlib.sdk.RequestCallback;
@@ -123,6 +130,8 @@ import com.netease.nimlib.sdk.StatusCode;
import com.netease.nimlib.sdk.auth.AuthServiceObserver;
//import com.netease.nimlib.sdk.avsignalling.constant.ChannelType;
//import com.netease.nimlib.sdk.avsignalling.model.SignallingPushConfig;
import com.netease.nimlib.sdk.avsignalling.constant.ChannelType;
import com.netease.nimlib.sdk.avsignalling.model.SignallingPushConfig;
import com.netease.nimlib.sdk.mixpush.MixPushService;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
@@ -138,6 +147,7 @@ import com.netease.yunxin.kit.chatkit.repo.ChatRepo;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import com.netease.yunxin.kit.chatkit.ui.common.ChatUtils;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.chatkit.ui.page.fragment.ChatBaseFragment;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
@@ -146,6 +156,7 @@ import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
import com.netease.yunxin.kit.common.utils.PermissionUtils;
import com.netease.yunxin.kit.common.utils.UriUtils;
import com.netease.yunxin.kit.common.utils.XKitUtils;
import com.netease.yunxin.kit.contactkit.ui.contact.BaseContactFragment;
import com.netease.yunxin.kit.contactkit.ui.utils.ColorUtils;
import com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant;
@@ -158,11 +169,22 @@ import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.model.EventObserver;
import com.netease.yunxin.kit.corekit.im.model.FriendInfo;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
import com.netease.yunxin.kit.corekit.im.provider.FetchCallback;
import com.netease.yunxin.kit.corekit.im.provider.FetchCallbackImpl;
import com.netease.yunxin.kit.corekit.im.provider.FriendProvider;
import com.netease.yunxin.kit.corekit.im.repo.CommonRepo;
import com.netease.yunxin.kit.corekit.im.repo.SettingRepo;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
import com.netease.yunxin.nertc.nertcvideocall.bean.InvitedInfo;
import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall;
import com.netease.yunxin.nertc.nertcvideocall.model.PushConfigProvider;
import com.netease.yunxin.nertc.ui.CallKitNotificationConfig;
import com.netease.yunxin.nertc.ui.CallKitUI;
import com.netease.yunxin.nertc.ui.CallKitUIOptions;
import com.netease.yunxin.nertc.ui.base.AVChatSoundPlayer;
import com.netease.yunxin.nertc.ui.base.SoundHelper;
import com.netease.yunxin.nertc.ui.base.UserInfoHelper;
//import com.netease.yunxin.nertc.nertcvideocall.bean.InvitedInfo;
//import com.netease.yunxin.nertc.nertcvideocall.model.NERTCVideoCall;
//import com.netease.yunxin.nertc.nertcvideocall.model.PushConfigProvider;
@@ -185,6 +207,30 @@ import java.util.Map;
import java.util.Random;
//import cn.jpush.android.api.JPushInterface;
//import io.agora.onetoone.AGError;
//import io.agora.onetoone.BuildConfig;
//import io.agora.onetoone.CallApiImpl;
//import io.agora.onetoone.CallConfig;
//import io.agora.onetoone.CallErrorCodeType;
//import io.agora.onetoone.CallErrorEvent;
//import io.agora.onetoone.CallEvent;
//import io.agora.onetoone.CallLogLevel;
//import io.agora.onetoone.CallStateReason;
//import io.agora.onetoone.CallStateType;
//import io.agora.onetoone.ICallApiListener;
//import io.agora.onetoone.PrepareConfig;
//import io.agora.onetoone.Pure1v1LivingActivity;
//import io.agora.onetoone.http.HttpManager;
//import io.agora.onetoone.model.EnterRoomInfoModel;
//import io.agora.onetoone.signalClient.CallRtmManager;
//import io.agora.onetoone.signalClient.CallRtmSignalClientKt;
//import io.agora.onetoone.utils.SPUtil;
//import io.agora.rtc2.Constants;
//import io.agora.rtc2.IRtcEngineEventHandler;
//import io.agora.rtc2.RtcEngine;
//import io.agora.rtc2.RtcEngineConfig;
//import io.agora.rtc2.RtcEngineEx;
//import io.agora.rtm.RtmClient;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import kotlin.Unit;
@@ -195,6 +241,9 @@ import rx.Subscription;
* IM Main Page include four tab , message/contact/live/profile
*/
public class MainActivity extends BaseActivity {
// public static CallRtmManager rtmManager;
public static int REQUEST_CODE_FOR_QRCODE_SCAN = 1016;
/**
@@ -241,7 +290,7 @@ public class MainActivity extends BaseActivity {
// private ChatMainFragment chatMainFragment;
// private ChatMain2Fragment chatMain2Fragment;
// private ChatTabFragment chatTabFragment;
// private VoomFragment voomFragment;
private ShopFragment voomFragment;
private MineFragment walletFragment;
FragmentAdapter fragmentAdapter;
@@ -361,7 +410,7 @@ public class MainActivity extends BaseActivity {
}
LogUtils.d("channelID==" + channelID);
int rawResource = MainActivity.this.getResources().getIdentifier(channelID, "raw", getPackageName());
Uri ringUri = Uri.parse("android.resource://com.hbl.lewan/raw/" + rawResource);
Uri ringUri = Uri.parse("android.resource://com.hbl.yuliao/raw/" + rawResource);
NotificationChannel vibration = new NotificationChannel(channelID, IMApplication.getAppContext().getString(R.string.bell_default), NotificationManager.IMPORTANCE_DEFAULT);
vibration.enableLights(true);
vibration.enableVibration(true);
@@ -377,8 +426,7 @@ public class MainActivity extends BaseActivity {
@SuppressLint("NewApi")
@Override
protected void onCreate(Bundle savedInstanceState) {
if (Build.VERSION.SDK_INT >= 30) {
} else {
if (Build.VERSION.SDK_INT <30) {
setTheme(R.style.AppThemeStart1);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
getWindow().setStatusBarColor(Color.TRANSPARENT);
@@ -401,16 +449,33 @@ public class MainActivity extends BaseActivity {
activityMainBinding = ActivityMainBinding.inflate(getLayoutInflater());
setContentView(activityMainBinding.getRoot());
if (Build.VERSION.SDK_INT >= 30) {
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
ViewGroup.LayoutParams layoutParams = activityMainBinding.bottomV.getLayoutParams();
layoutParams.height = getNavigationBarHeight(this);
if(Build.MANUFACTURER.equals("HUAWEI")){
layoutParams.height = 0;
}
activityMainBinding.bottomV.setLayoutParams(layoutParams);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
ViewTreeObserver vto = getWindow().getDecorView().getViewTreeObserver();
vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
getWindow().getDecorView().getViewTreeObserver().removeOnGlobalLayoutListener(this);
} else {
getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
}
int height = getWindow().getDecorView().getRootView().getHeight();
int width = getWindow().getDecorView().getRootView().getWidth();
Log.d("ViewSize", "Height: " + height + ", Width: " + width);
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
ViewGroup.LayoutParams layoutParams = activityMainBinding.bottomV.getLayoutParams();
layoutParams.height = getNavigationBarHeight(MainActivity.this,height);
// if(Build.MANUFACTURER.equals("HUAWEI")){
// layoutParams.height = 0;
// }
activityMainBinding.bottomV.setLayoutParams(layoutParams);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
}
});
}
ChatDataUtils.set(this, ChatKitUIConstant.SERVICES_LOGIN, false);
ChatKitUIConstant.isSendGiftRedPacket = DataUtils.getIsSendGiftRedPacket();
initView();
@@ -494,15 +559,294 @@ public class MainActivity extends BaseActivity {
}
});
getVersion();
// api =new CallApiImpl(IMApplication.getAppContext());
// prepareConfig = new PrepareConfig();
// prepareConfig.setRtcToken(SPUtil.getString("Token_SW", ""));
// prepareConfig.setFirstFrameWaittingDisabled(false);
// rtcEngine = _createRtcEngine();
// logToken();
}
@Override
public void onBackPressed() {
if(activityMainBinding.qrRy.getVisibility()==View.VISIBLE){
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
}else {
super.onBackPressed();
}
}
// private RtcEngineEx _createRtcEngine() {
// RtcEngineEx rtcEngine = null;
// RtcEngineConfig config = new RtcEngineConfig();
// config.mContext = this;
// config.mAppId = BuildConfig.AG_APP_ID;
// config.mEventHandler = new IRtcEngineEventHandler() {
// @Override
// public void onError(int err) {
// super.onError(err);
// LogUtils.i(TAG, "IRtcEngineEventHandler onError:$err");
//
// }
// };
// config.mChannelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING;
// config.mAudioScenario = Constants.AUDIO_SCENARIO_CHORUS;
// try {
// rtcEngine = (RtcEngineEx) RtcEngine.create(config);
// } catch ( Exception e) {
// e.printStackTrace();
// Log.e(TAG, "RtcEngine.create() called error: $e");
// LogUtils.i("注册获取token：RtcEngine.create() called error: "+e.getMessage());
// }finally {
// return rtcEngine;
// }
// }
// public static RtcEngineEx rtcEngine;
// public static CallApiImpl api;
// public static PrepareConfig prepareConfig;
//
// private void initMessageManager() {
// if(!TextUtils.isEmpty(IMKitClient.account())) {
// rtmManager = new CallRtmManager(BuildConfig.AG_APP_ID, Integer.parseInt(IMKitClient.account()), null);
// rtmManager.login(SPUtil.getString("Token_SW", ""), agError -> {
// if (agError == null) {
// LogUtils.i("注册获取tokeninitMessageManager：null");
//
// initCallApi();
// } else {
// LogUtils.i("注册获取tokeninitMessageManager：" + GsonUtils.beanToJSONString(agError));
//
// }
// return null;
// });
// }
// }
//
//
// private void initCallApi(){
// CallConfig callConfig = new CallConfig(BuildConfig.AG_APP_ID,Integer.parseInt(IMKitClient.account()),rtcEngine, CallRtmSignalClientKt.createRtmSignalClient(rtmManager.getRtmClient()));
// api.initialize(callConfig);
// prepareConfig.setRoomId(IMKitClient.account());
//
// api.prepareForCall(prepareConfig, agError -> {
// if (agError == null) {
// LogUtils.i("注册获取tokenprepareForCall：null");
// } else {
// LogUtils.i("注册获取tokenprepareForCall：" + GsonUtils.beanToJSONString(agError));
//
// }
// return null;
// }) ;
//
// api.addListener(new ICallApiListener() {
// @Override
// public void callDebugInfo(@NonNull String message, @NonNull CallLogLevel logLevel) {
//// ICallApiListener.super.callDebugInfo(message, logLevel);
// LogUtils.i("注册获取tokencallDebugInfo："+message);
//
// }
//
// @Override
// public void tokenPrivilegeWillExpire() {
// logToken();
//// ICallApiListener.super.tokenPrivilegeWillExpire();
// LogUtils.i("注册获取tokentokenPrivilegeWillExpire：");
//
// }
//
// @Override
// public void onCallDisconnected(@NonNull String roomId, int hangupUserId, int currentUserId, long timestamp, long duration) {
//// ICallApiListener.super.onCallDisconnected(roomId, hangupUserId, currentUserId, timestamp, duration);
// //通话结束
// LogUtils.i("注册获取tokenonCallDisconnected：通话结束");
//
// }
//
// @Override
// public void onCallConnected(@NonNull String roomId, int callUserId, int currentUserId, long timestamp) {
//// ICallApiListener.super.onCallConnected(roomId, callUserId, currentUserId, timestamp);
// //开始通话
// LogUtils.i("注册获取tokenonCallConnected：开始通话");
//
// }
//
// @Override
// public void onCallError(@NonNull CallErrorEvent errorEvent, @NonNull CallErrorCodeType errorType, int errorCode, @Nullable String message) {
//// ICallApiListener.super.onCallError(errorEvent, errorType, errorCode, message);
//
// // 通话异常110;null;Rtc;RtcOccurError
// //通话异常
// LogUtils.i("注册获取tokenonCallError：通话异常"+errorCode+";"+message+";"+errorType+";"+errorEvent);
//
// }
//
// @Override
// public void onCallEventChanged(@NonNull CallEvent event, @Nullable String eventReason) {
//// ICallApiListener.super.onCallEventChanged(event, eventReason);
// LogUtils.i("注册获取tokenonCallEventChanged："+event);
//
// switch (event){
// case RemoteLeft:
// //挂断
// break;
// case JoinRTCStart:
//
// }
// }
//
// @Override
// public void onCallStateChanged(@NonNull CallStateType state, @NonNull CallStateReason stateReason, @NonNull String eventReason, @NonNull Map<String, ?> eventInfo) {
// LogUtils.i("注册获取tokenonCallStateChanged状态是啥："+state);
//
// switch (state){
// case Calling:
// break;
// case Connected:
// break;
// case Prepared:
// break;
// case Failed:
// break;
// }
// LogUtils.i("状态是啥："+state);
// }
//
// @Nullable
// @Override
// public Boolean canJoinRtcOnCalling(@NonNull Map<String, ?> eventInfo) {
// LogUtils.i("注册获取tokencanJoinRtcOnCalling："+GsonUtils.beanToJSONString(eventInfo));
// callMaps = (Map<String, Object>) eventInfo;
//
// fromUserId = (Integer)eventInfo.get("fromUserId");
// fromRoomId = (String) eventInfo.get("fromRoomId");
// toCall(true, (String) eventInfo.get("fromRoomId"),GsonUtils.beanToJSONString(eventInfo));
// // {"message_action":0,"message_version":"1.0",
// // "message_timestamp":1752139799705,
// // "fromUserId":61330481,
// // "callId":"29999e18-8476-4108-915a-21706820c560",
// // "remoteUserId":61330478,"fromRoomId":"61330481",
// // "fromUserExtension":{"nameValuePairs":{}},
// // "messageId":1}
// return true;
// }
// });
//
// }
//
// public static Integer fromUserId;
// public static String fromRoomId;
//
// private void logToken() {
// HttpManager.INSTANCE.token007("", IMKitClient.account(), new Function1<String, Unit>() {
// @Override
// public Unit invoke(String token) {
// LogUtils.i("注册获取token："+token);
// if (token != null) {
// SPUtil.putString("Token_SW", token);
// initMessageManager();
//
// } else {
//// Toasty.normal(this, getString(R.string.toast_get_token_failed), Toast.LENGTH_SHORT).show()
// }
// return null;
// }
// });
// }
// public static Map<String, Object> callMaps;
//
// public static String messages;
// /**
// * 音视频通话
// *
// * @param isVideoCall 是否视频通话
// */
// private void toCall(boolean isVideoCall,String uid,String messages) {
// LogUtils.i("注册获取token toCall："+uid);
// this.messages = messages;
// if (!XKitUtils.getApplicationContext()
// .getPackageManager()
// .hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)) {
// ToastX.showShortToast(com.netease.yunxin.kit.chatkit.ui.R.string.chat_message_camera_unavailable);
// return;
// }
// if (isVideoCall) {
//// ChatUtils.startVideoCall(UserInfoActivity.this, userInfoData.data.getAccount());
// // save
// SPUtil.putBoolean(UserInfoActivity.kIsRtm, true);
// SPUtil.putBoolean(UserInfoActivity.kIsShowMode, true);
// SPUtil.putBoolean(UserInfoActivity.kIsBrodCaster, true);
// SPUtil.putString(UserInfoActivity.kLocalUid, IMKitClient.account());
// SPUtil.putString(UserInfoActivity.kOwnerUid, "");
// SPUtil.putString(UserInfoActivity.kDimensionsWidth, "1080");
// SPUtil.putString(UserInfoActivity.kDimensionsHeight,"1920");
// SPUtil.putString(UserInfoActivity.kFrameRate, "60");
// SPUtil.putString("targetUserId", uid);
// EnterRoomInfoModel enterModel =new EnterRoomInfoModel(
// true,
// true,
// IMKitClient.account(),
// IMKitClient.account(),
// IMKitClient.account(),
// SPUtil.getString("Token_SW",""),
// SPUtil.getString("Token_SW",""),
// SPUtil.getString("Token_SW",""),
// "1080",
// "1920",
// "60",
// "0",
// true,
// true,
// true);
// if (enterModel.getRtcToken()!=null&& enterModel.getRtmToken()!=null) {
//
// CommonRepo.getUserInfo(
// uid,
// new FetchCallback<UserInfo>() {
// @Override
// public void onSuccess(@Nullable UserInfo param) {
// if (param != null) {
// LogUtils.i("注册获取token toCall："+uid+";"+param.getName()+";"+param.getAvatar());
//
// Pure1v1LivingActivity.Companion.launch(MainActivity.this, enterModel, false, false,uid);
// }
// }
//
// @Override
// public void onFailed(int code) {
//// ToastX.showShortToast(R.string.user_fail);
// LogUtils.i("注册获取token toCallonFailed："+uid+";");
//
// Pure1v1LivingActivity.Companion.launch(MainActivity.this, enterModel, true, false,uid);
// }
//
// @Override
// public void onException(@Nullable Throwable exception) {
//// ToastX.showShortToast(R.string.user_fail);
// LogUtils.i("注册获取token onException："+uid+";");
// Pure1v1LivingActivity.Companion.launch(MainActivity.this, enterModel, true, false,uid);
// }
// });
//
//
// }
// } else {
// ChatUtils.startAudioCall(MainActivity.this, uid);
//
// }
// }
//
VersionBean versionBean;
private void getVersion() {
try {
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(MainActivity.this), com.netease.yunxin.kit.chatkit.ui.network.ApiService.SUBSTATIONID1)
Api.getInstance().version(com.hbl.yuliao.network.ApiService.AREA_CODE.equals("+86")?7:0,
DataUtils.getVersionCode(MainActivity.this), com.netease.yunxin.kit.chatkit.ui.network.ApiService.SUBSTATIONID1)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@@ -578,10 +922,26 @@ public class MainActivity extends BaseActivity {
return name;
}
public int getNavigationBarHeight(Context context) {
public int getNavigationBarHeight(Context context,int height) {
Resources resources = context.getResources();
int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
return resources.getDimensionPixelSize(resourceId);
if(isNavBarVisible(this,height)){
int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
return resources.getDimensionPixelSize(resourceId);
}else{
return 0;
}
}
private boolean isNavBarVisible(Activity activity,int screenHeight) {
// 获取屏幕的矩形区域，不包含系统UI（如状态栏和导航栏）
Rect rect = new Rect();
activity.getWindow().getDecorView().getWindowVisibleDisplayFrame(rect);
// int screenHeight = activity.getWindow().getDecorView().getRootView().getHeight();
LogUtils.i("高度是多少："+screenHeight+";;"+rect.bottom);
// 如果矩形区域的高度不等于屏幕高度，说明有系统UI覆盖（如导航栏）
return (screenHeight - rect.bottom) > 0;
}
@Override
@@ -733,11 +1093,134 @@ public class MainActivity extends BaseActivity {
protected void onPostResume() {
super.onPostResume();
// 部分Android机型在页面进入onResume前启动其他页面会取消当前页面流程，避免组件初始化后立即展示来电页面将初始化的逻辑滞后
// if (!CallKitUI.INSTANCE.getInit()) {
// configCallKit();
// }
if (!CallKitUI.INSTANCE.getInit()) {
configCallKit();
}
}
//
private void configCallKit() {
CallKitUIOptions options = new CallKitUIOptions.Builder().soundHelper(new SoundHelper() {
@Override
public boolean isEnable() {
return true;
}
@Nullable
@Override
public Integer soundResources(@NonNull AVChatSoundPlayer.RingerTypeEnum type) {
int resId;
if (type == AVChatSoundPlayer.RingerTypeEnum.CONNECTING) {
resId = com.netease.yunxin.nertc.ui.R.raw.avchat_ring;
} else if (type == AVChatSoundPlayer.RingerTypeEnum.RING) {
resId = getResources().getIdentifier(ChatDataUtils.getCellBell(IMKitClient.getUserInfo()), "raw", getPackageName());
} else {
//結束
resId = R.raw.nosound;
}
return resId;
}
}).rtcAppKey(DataUtils.readAppKey(this))
.currentUserAccId(IMKitClient.account())
.userInfoHelper(new UserInfoHelper() {
@Override
public boolean fetchNickname(@NonNull String s, @NonNull Function1<? super String, Unit> function1) {
LogUtils.d("s===" + s + function1);
FriendInfo friendInfo = ContactRepo.getFriend(s);
if (friendInfo != null) {
function1.invoke(friendInfo.getName());
}
return true;
}
@Override
public boolean fetchNicknameByTeam(@NonNull String s, @NonNull String s1, @NonNull Function1<? super String, Unit> function1) {
return false;
}
@Override
public boolean loadAvatar(@NonNull Context context, @NonNull String s, @NonNull ImageView imageView) {
return false;
}
})
.timeOutMillisecond(30 * 1000L)
.pushConfigProvider(new PushConfigProvider() {
@Override
public SignallingPushConfig providePushConfig(InvitedInfo invitedInfo) {
return new SignallingPushConfig(true, (invitedInfo.channelType == ChannelType.AUDIO.getValue()
? getString(R.string.incoming_call_notify_audio)
: getString(R.string.incoming_call_notify_video)), (invitedInfo.channelType == ChannelType.AUDIO.getValue()
? getString(R.string.incoming_call_notify_audio)
: getString(R.string.incoming_call_notify_video)),
setPushPload(ContactRepo.getUserInfo(invitedInfo.currentAccId))
);
}
})
// 收到被叫时若 app 在后台，在恢复到前台时是否自动唤起被叫页面，默认为 true
.resumeBGInvitation(true)
.notificationConfigFetcher(new Function1<InvitedInfo, CallKitNotificationConfig>() {
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
public CallKitNotificationConfig invoke(InvitedInfo invitedInfo) {
UserInfo info = ContactRepo.getUserInfo(invitedInfo.currentAccId);
String content =
(info != null ? info.getUserInfoName() : invitedInfo.currentAccId)
+ (invitedInfo.channelType == ChannelType.AUDIO.getValue()
? getString(R.string.incoming_call_notify_audio)
: getString(R.string.incoming_call_notify_video));
String callName = ChatDataUtils.getCellBell(IMKitClient.getUserInfo());
LogUtils.d("NotificationConfig callName==" + callName);
int rawResource = getResources().getIdentifier(callName, "raw", getPackageName());
Uri musicUri = Uri.parse("android.resource://com.dskj.rbchat/raw/" + callName);
return new CallKitNotificationConfig(R.mipmap.ic_logo, callName, getString(R.string.message_notifycontent_avchat), content, musicUri);
}
})
// 请求 rtc token 服务，若非安全模式则不需设置(V1.8.0版本之前需要配置，V1.8.0及之后版本无需配置)
//.rtcTokenService((uid, callback) -> requestRtcToken(appKey, uid, callback)) // 自己实现的 token 请求方法
// 设置初始化 rtc sdk 相关配置，按照所需进行配置
.rtcSdkOption(new NERtcOption())
// 呼叫组件初始化 rtc 范围，true-全局初始化，false-每次通话进行初始化以及销毁
// 全局初始化有助于更快进入首帧页面，当结合其他组件使用时存在rtc初始化冲突可设置false
.rtcInitScope(false)
.build();
// 设置自定义话单消息发送
NERTCVideoCall.sharedInstance().setCallOrderListener(new CustomCallOrderHelper());
// // 若重复初始化会销毁之前的初始化实例，重新初始化
CallKitUI.init(getApplicationContext(), options);
NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer<StatusCode>() {
@Override
public void onEvent(StatusCode statusCode) {
if (statusCode == StatusCode.LOGOUT) {
CallKitUI.destroy();
} else if (statusCode.wontAutoLogin()) {
if (!isFinishing()) {
ActionConfirmDialog1 actionConfirmDialog = new ActionConfirmDialog1(MainActivity.this, getString(R.string.tcdl_tips_txt1), "", getString(R.string.general_got_it), false);
actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog1.OnToActionListener() {
@Override
public void toSumbit() {
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
CallKitUI.destroy();
finish();
}
@Override
public void toCancel() {
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
CallKitUI.destroy();
finish();
}
});
actionConfirmDialog.setSureBg(R.drawable.cornor_themblue_12dp);
actionConfirmDialog.show();
}
}
}
}, true);
}
public void getServiceId() {
Api.getInstance().helpCenterStaffsServiceId(IMUIKitConfig.SUBSTATIONID)
@@ -771,12 +1254,12 @@ public class MainActivity extends BaseActivity {
List<Fragment> fragments = new ArrayList<>();
// index2Fragment = new HomeFragment();
chatTabFragment = new ChatTabFragment();
// voomFragment = new VoomFragment();
voomFragment = new ShopFragment();
walletFragment = new MineFragment();
// fragments.add(index2Fragment);
fragments.add(chatTabFragment);
// if(ApiService.AREA_CODE.equals("+86")) {
// fragments.add(voomFragment);
fragments.add(voomFragment);
// activityMainBinding.liveBtnGroup.setVisibility(View.VISIBLE);
// }else{
// activityMainBinding.liveBtnGroup.setVisibility(View.GONE);
@@ -785,7 +1268,7 @@ public class MainActivity extends BaseActivity {
fragmentAdapter = new FragmentAdapter(this);
fragmentAdapter.setFragmentList(fragments);
// activityMainBinding.viewPager.setUserInputEnabled(false);
activityMainBinding.viewPager.setUserInputEnabled(false);
activityMainBinding.viewPager.setAdapter(fragmentAdapter);
activityMainBinding.viewPager.setCurrentItem(START_INDEX, false);
activityMainBinding.viewPager.setOffscreenPageLimit(fragments.size());
@@ -801,15 +1284,20 @@ public class MainActivity extends BaseActivity {
resetTabStyle();
if(position == 0){
activityMainBinding.contact.setTextColor(
getResources().getColor(R.color.color_fe6881));
getResources().getColor(R.color.color_2c2c2c));
activityMainBinding.contact.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.chat_img_t), null, null);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
}else{
activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_fe6881));
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
}else if(position ==2){
activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_2c2c2c));
activityMainBinding.mine.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.wo_t), null, null);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
}else{
activityMainBinding.live.setTextColor(getResources().getColor(R.color.color_2c2c2c));
activityMainBinding.live.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.voom_img_t), null, null);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
}
}
});
@@ -994,7 +1482,7 @@ public class MainActivity extends BaseActivity {
break;
default:
if (scheme.startsWith("http")) {
if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("http://admin.yuliao666.top/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
// showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
@@ -1307,20 +1795,24 @@ public class MainActivity extends BaseActivity {
private ContactAvatarView groupHeadIv;
private TextView joinTv;
private TextView groupNameTv;
private TextView joinTitleTv1;
private void showQrcodeView(String groupId) {
BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
// BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
View bottomView = LayoutInflater.from(MainActivity.this).inflate(R.layout.bottom_sheet_join_group, null);
coloseIv = (ImageView) bottomView.findViewById(R.id.colose_iv);
joinTitleTv = (TextView) bottomView.findViewById(R.id.join_title_tv);
joinTitleTv1 = (TextView) bottomView.findViewById(R.id.group_name_tv1);
groupHeadIv = (ContactAvatarView) bottomView.findViewById(R.id.group_head_iv);
joinTv = (TextView) bottomView.findViewById(R.id.join_tv);
Team team = NIMClient.getService(TeamService.class).queryTeamBlock(groupId);
groupNameTv = (TextView) bottomView.findViewById(R.id.group_name_tv);
if (team != null) {
if (team != null) {
joinTitleTv1.setText("群成员 "+team.getMemberCount()+"人");
if (TextUtils.isEmpty(team.getIcon())) {
groupHeadIv.setData(com.netease.yunxin.kit.contactkit.ui.R.mipmap.ic_group_defaulthead, "head");
} else {
@@ -1337,7 +1829,9 @@ public class MainActivity extends BaseActivity {
}
joinTv.setOnClickListener(v -> {
if (team.isMyTeam()) {
bottomSheetDialog.dismiss();
// bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team)
.withContext(MainActivity.this)
@@ -1348,7 +1842,8 @@ public class MainActivity extends BaseActivity {
@Override
public void onSuccess(Team team1) {
bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team1)
@@ -1360,20 +1855,23 @@ public class MainActivity extends BaseActivity {
public void onFailed(int code) {
//仅仅是申请成功,code 808
if (code == ResponseCode.RES_TEAM_APPLY_SUCCESS) {
bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.dendaiqueren_txt);
}
// 已经在群里，code 809
else if (code == ResponseCode.RES_TEAM_ALREADY_IN) {
getJoinInfo(groupId, true, bottomSheetDialog);
getJoinInfo(groupId, true);
// 群人数已达上限
} else if (code == ResponseCode.RES_TEAM_LIMIT) {
bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.team_num_limit);
} else {
bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast("failed, error code =" + code);
@@ -1382,8 +1880,8 @@ public class MainActivity extends BaseActivity {
@Override
public void onException(Throwable exception) {
// error
bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(exception.getMessage());
@@ -1395,12 +1893,15 @@ public class MainActivity extends BaseActivity {
joinTitleTv.setText(R.string.join_group_txt);
joinTv.setText(R.string.join_group_txt);
getJoinInfo(groupId, false, bottomSheetDialog);
getJoinInfo(groupId, false);
joinTv.setOnClickListener(v -> NIMClient.getService(TeamService.class).applyJoinTeam(groupId, null).setCallback(new RequestCallback<Team>() {
@Override
public void onSuccess(Team team1) {
bottomSheetDialog.dismiss();
joinTitleTv1.setText("群成员 "+team1.getMemberCount()+"人");
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team1)
.withContext(MainActivity.this)
@@ -1411,21 +1912,24 @@ public class MainActivity extends BaseActivity {
public void onFailed(int code) {
//仅仅是申请成功,code 808
if (code == ResponseCode.RES_TEAM_APPLY_SUCCESS) {
bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.dendaiqueren_txt);
}
// 已经在群里，code 809
else if (code == ResponseCode.RES_TEAM_ALREADY_IN) {
getJoinInfo(groupId, true, bottomSheetDialog);
getJoinInfo(groupId, true);
// 群人数已达上限
} else if (code == ResponseCode.RES_TEAM_LIMIT) {
bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.team_num_limit);
} else {
bottomSheetDialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast("failed, error code =" + code);
@@ -1443,20 +1947,24 @@ public class MainActivity extends BaseActivity {
}
coloseIv.setOnClickListener(v -> bottomSheetDialog.dismiss());
coloseIv.setOnClickListener(v -> {
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
});
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.addView(bottomView);
activityMainBinding.qrRy.setVisibility(View.VISIBLE);
IMApplication.schemeTeamId = null;
bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
}
// bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
// }
}
private void getJoinInfo(String gid, boolean b, BottomSheetDialog dialog) {
private void getJoinInfo(String gid, boolean b) {
NIMClient.getService(TeamService.class).searchTeam(gid).setCallback(new RequestCallback<Team>() {
@Override
public void onSuccess(Team result) {
@@ -1464,7 +1972,8 @@ public class MainActivity extends BaseActivity {
groupHeadIv.setData(result.getIcon(), result.getName());
groupNameTv.setText(result.getName());
} else {
dialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, result)
.withContext(MainActivity.this)
@@ -1475,12 +1984,14 @@ public class MainActivity extends BaseActivity {
@Override
public void onFailed(int code) {
dialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
}
@Override
public void onException(Throwable exception) {
dialog.dismiss();
activityMainBinding.qrRy.removeAllViews();
activityMainBinding.qrRy.setVisibility(View.GONE);
}
});
}
@@ -1546,34 +2057,34 @@ public class MainActivity extends BaseActivity {
if (mCurrentTab == activityMainBinding.contactBtnGroup) {
activityMainBinding.viewPager.setCurrentItem(0, false);
activityMainBinding.contact.setTextColor(
getResources().getColor(R.color.color_fe6881));
getResources().getColor(R.color.color_2c2c2c));
activityMainBinding.contact.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.chat_img_t), null, null);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
} else if (mCurrentTab == activityMainBinding.liveBtnGroup) {
activityMainBinding.viewPager.setCurrentItem(1, false);
activityMainBinding.live.setTextColor(
getResources().getColor(R.color.color_fe6881));
getResources().getColor(R.color.color_2c2c2c));
activityMainBinding.live.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.voom_img_t), null, null);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
} else if (mCurrentTab == activityMainBinding.myselfBtnGroup) {
// if(ApiService.AREA_CODE.equals("+86")) {
activityMainBinding.viewPager.setCurrentItem(1, false);
activityMainBinding.viewPager.setCurrentItem(2, false);
// }else{
// activityMainBinding.viewPager.setCurrentItem(1, false);
// }
activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_fe6881));
activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_2c2c2c));
activityMainBinding.mine.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.wo_t), null, null);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
} else if (mCurrentTab == activityMainBinding.conversationBtnGroup) {
activityMainBinding.viewPager.setCurrentItem(0, false);
activityMainBinding.conversation.setTextColor(
getResources().getColor(R.color.color_fe6881));
getResources().getColor(R.color.color_2c2c2c));
activityMainBinding.conversation.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.index_img_t), null, null);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
}
// if (mCurrentTab == activityMainBinding.contactBtnGroup) {
@@ -1612,19 +2123,19 @@ public class MainActivity extends BaseActivity {
private void resetTabStyle() {
activityMainBinding.conversation.setTextColor(
getResources().getColor(R.color.color_898989));
getResources().getColor(R.color.color_babeca));
activityMainBinding.conversation.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.index_img_f), null, null);
activityMainBinding.contact.setTextColor(getResources().getColor(R.color.color_898989));
activityMainBinding.contact.setTextColor(getResources().getColor(R.color.color_babeca));
activityMainBinding.contact.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.chat_img_f), null, null);
activityMainBinding.live.setTextColor(getResources().getColor(R.color.color_898989));
activityMainBinding.live.setTextColor(getResources().getColor(R.color.color_babeca));
activityMainBinding.live.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.voom_img_f), null, null);
activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_898989));
activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_babeca));
activityMainBinding.mine.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.wo_f), null, null);
}
@@ -1800,7 +2311,7 @@ public class MainActivity extends BaseActivity {
// String callName = ChatDataUtils.getCellBell(IMKitClient.getUserInfo());
// LogUtils.d("NotificationConfig callName==" + callName);
// int rawResource = getResources().getIdentifier(callName, "raw", getPackageName());
// Uri musicUri = Uri.parse("android.resource://com.hbl.lewan/raw/" + callName);
// Uri musicUri = Uri.parse("android.resource://com.hbl.yuliao/raw/" + callName);
// return new CallKitNotificationConfig(R.mipmap.ic_logo, callName, getString(R.string.message_notifycontent_avchat), content, musicUri);
// }
// })
@@ -2188,7 +2699,7 @@ public class MainActivity extends BaseActivity {
private EditText commentEtShare;
private TextView shareBt;
private LinearLayoutManager linearLayoutManager;
private com.hbl.lewan.adapter.CommonAdapter commonAdapter;
private com.hbl.yuliao.adapter.CommonAdapter commonAdapter;
private ArrayList<UserShareBean> titleUsers;
private ArrayList<Boolean> titleUsersIsCheck;

14
app/src/main/java/com/hbl/lewan/main/authorize/AuthorizeActivity.java → app/src/main/java/com/hbl/yuliao/main/authorize/AuthorizeActivity.java
View File

@@ -1,17 +1,17 @@
package com.hbl.lewan.main.authorize;
package com.hbl.yuliao.main.authorize;
import android.os.Bundle;
import android.text.TextUtils;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityAuthorizeBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityAuthorizeBinding;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.AvatarColor;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

14
app/src/main/java/com/hbl/lewan/main/chat/AllConversationFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/AllConversationFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import android.content.DialogInterface;
import android.os.Build;
@@ -13,12 +13,12 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

34
app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/ChatConversationFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import static com.netease.yunxin.kit.chatkit.ui.fun.view.MessageBottomLayout.TAG;
import static com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant.LIB_TAG;
@@ -20,22 +20,22 @@ import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentChatconversationBinding;
import com.hbl.lewan.event.ConversationEditEvent;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.model.NotifyCountBean;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentChatconversationBinding;
import com.hbl.yuliao.event.ConversationEditEvent;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.NotifyCountBean;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.NIMClient;

4
app/src/main/java/com/hbl/lewan/main/chat/ChatGroupFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/ChatGroupFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import android.content.Intent;
import android.os.Bundle;
@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.databinding.FragmentChatgroupBinding;
import com.hbl.yuliao.databinding.FragmentChatgroupBinding;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;
import com.netease.yunxin.kit.common.ui.viewmodel.LoadStatus;

48
app/src/main/java/com/hbl/lewan/main/chat/ChatMain2Fragment.java → app/src/main/java/com/hbl/yuliao/main/chat/ChatMain2Fragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import static com.netease.yunxin.kit.chatkit.ui.fun.view.MessageBottomLayout.TAG;
import static com.netease.yunxin.kit.contactkit.ui.selector.BaseContactSelectorActivity.DEFAULT_MAX_SELECT_COUNT;
@@ -23,17 +23,17 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.viewpager2.widget.ViewPager2;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentChatBinding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.main.FragmentAdapter;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
import com.hbl.lewan.event.ConversationEditEvent;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentChatBinding;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.main.FragmentAdapter;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.index.add.AddFriendsActivity;
import com.hbl.yuliao.event.ConversationEditEvent;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.friend.model.MuteListChangedNotify;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
@@ -209,18 +209,18 @@ public class ChatMain2Fragment extends BaseFragment {
viewBinding.layoutChatfmGroup.setOnClickListener(this::chatClick);
viewBinding.layoutChatfmFollow.setOnClickListener(this::chatClick);
viewBinding.viewSettingclick.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), EditChatRecordlistActivity.class));
});
viewBinding.viewAddclick.setOnClickListener(view -> {
startCreateGroup();
});
viewBinding.viewFriendgclick.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), AddFriendsActivity.class));
});
viewBinding.viewContactclick.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), ContactActivity.class));
});
// viewBinding.viewSettingclick.setOnClickListener(view -> {
// startActivity(new Intent(getActivity(), EditChatRecordlistActivity.class));
// });
// viewBinding.viewAddclick.setOnClickListener(view -> {
// startCreateGroup();
// });
// viewBinding.viewFriendgclick.setOnClickListener(view -> {
// startActivity(new Intent(getActivity(), AddFriendsActivity.class));
// });
// viewBinding.viewContactclick.setOnClickListener(view -> {
// startActivity(new Intent(getActivity(), ContactActivity.class));
// });
viewBinding.layoutChatfmCommonSearch.getRoot().setOnClickListener(view -> startActivity(new Intent(getActivity(), FunSearchActivity.class))
);

28
app/src/main/java/com/hbl/lewan/main/chat/ChatMainFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/ChatMainFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import static com.netease.yunxin.kit.contactkit.ui.selector.BaseContactSelectorActivity.DEFAULT_MAX_SELECT_COUNT;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_CONTACT_SELECTOR_MAX_COUNT;
@@ -20,12 +20,12 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.viewpager2.widget.ViewPager2;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentChatBinding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.main.FragmentAdapter;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentChatBinding;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.main.FragmentAdapter;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;
@@ -98,13 +98,13 @@ public class ChatMainFragment extends BaseFragment {
viewBinding.layoutChatfmFriends.setOnClickListener(this::chatClick);
viewBinding.layoutChatfmGroup.setOnClickListener(this::chatClick);
viewBinding.layoutChatfmFollow.setOnClickListener(this::chatClick);
viewBinding.viewSettingclick.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), EditChatRecordlistActivity.class));
});
viewBinding.viewAddclick.setOnClickListener(view -> {
startCreateGroup();
});
//
// viewBinding.viewSettingclick.setOnClickListener(view -> {
// startActivity(new Intent(getActivity(), EditChatRecordlistActivity.class));
// });
// viewBinding.viewAddclick.setOnClickListener(view -> {
// startCreateGroup();
// });
viewBinding.layoutChatfmCommonSearch.getRoot().setOnClickListener(view -> startActivity(new Intent(getActivity(), FunSearchActivity.class))
);

123
app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/ChatTabFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import static com.netease.yunxin.kit.contactkit.ui.selector.BaseContactSelectorActivity.DEFAULT_MAX_SELECT_COUNT;
import static com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant.LIB_TAG;
@@ -21,25 +21,27 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.viewpager2.widget.ViewPager2;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentChatBinding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.main.FragmentAdapter;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
import com.hbl.lewan.event.ConversationEditEvent;
import com.hbl.lewan.main.message.NotifyMessageActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.NotifyCountBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.databinding.FragmentChatBinding;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.imkit.verify.FunVerifyListActivity;
import com.hbl.yuliao.main.FragmentAdapter;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.index.add.AddFriendsActivity;
import com.hbl.yuliao.event.ConversationEditEvent;
import com.hbl.yuliao.main.message.NotifyActMessageActivity;
import com.hbl.yuliao.main.message.NotifyMessageActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.NotifyCountBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
@@ -64,7 +66,9 @@ import com.netease.yunxin.kit.conversationkit.ui.page.viewmodel.ConversationView
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.event.EventNotify;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
import com.netease.yunxin.kit.corekit.im.provider.FetchCallback;
import com.netease.yunxin.kit.corekit.im.repo.CommonRepo;
import org.json.JSONArray;
import org.json.JSONException;
@@ -74,8 +78,14 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
//import io.agora.onetoone.Pure1v1LivingActivity;
//import io.agora.onetoone.http.HttpManager;
//import io.agora.onetoone.model.EnterRoomInfoModel;
//import io.agora.onetoone.utils.SPUtil;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
//聊天会话View 把注册监听 放到childfragment 不然分屏之后不会更新数据
public class ChatTabFragment extends BaseFragment {
@@ -222,7 +232,7 @@ public class ChatTabFragment extends BaseFragment {
int notifyTotalCount = notifyCount + verifyCount;
if (notifyTotalCount > 0) {
viewBinding.viewChatfmNotifypoint.setVisibility(View.VISIBLE);
viewBinding.viewChatfmNotifypoint.setText("" + notifyTotalCount);
// viewBinding.viewChatfmNotifypoint.setText("" + notifyTotalCount);
} else {
viewBinding.viewChatfmNotifypoint.setVisibility(View.GONE);
}
@@ -290,6 +300,7 @@ public class ChatTabFragment extends BaseFragment {
// notifyCount = count + activityMsgCount; MM 活动通知取消
notifyCount = count + 0;
setNotifyTotalCount();
setNotifyTotalCount1(activityMsgCount);
}
@@ -350,7 +361,20 @@ public class ChatTabFragment extends BaseFragment {
// fragments.add(teamConversationFragment = ChatConversationFragment.newInstance(2));
// followListFragment = new FollowListFragment();
// fragments.add(followListFragment);
viewBinding.tvChatfmTitle.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// toActions(false);
}
});
viewBinding.kefuIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// toActions(true);
}
});
fragmentAdapter = new FragmentAdapter(this);
fragmentAdapter.setFragmentList(fragments);
@@ -364,17 +388,49 @@ public class ChatTabFragment extends BaseFragment {
viewBinding.layoutChatfmGroup.setOnClickListener(this::chatClick);
// viewBinding.layoutChatfmFollow.setOnClickListener(this::chatClick);
viewBinding.viewSettingclick.setOnClickListener(view -> {
// viewBinding.viewSettingclick.setOnClickListener(view -> {
// startActivity(new Intent(getActivity(), EditChatRecordlistActivity.class).putExtra("groupIds", groupIds));
// });
// viewBinding.viewAddclick.setOnClickListener(view -> {
// startCreateGroup();
// });
viewBinding.ivChatfmAdd.setOnClickListener(view -> {
// startActivity(new Intent(getActivity(), AddFriendsActivity.class));
if(viewBinding.floatMenuRy.getVisibility()==View.VISIBLE){
hiddenMunu();
}else{
viewBinding.floatMenuRy.setVisibility(View.VISIBLE);
viewBinding.ivChatfmAdd.setImageResource(R.mipmap.tab_add1);
}
});
viewBinding.bianjiTv.setOnClickListener(v -> {
hiddenMunu();
startActivity(new Intent(getActivity(), EditChatRecordlistActivity.class).putExtra("groupIds", groupIds));
});
viewBinding.viewAddclick.setOnClickListener(view -> {
startCreateGroup();
});
viewBinding.viewFriendgclick.setOnClickListener(view -> {
viewBinding.floatMenuRy.setOnClickListener(v -> hiddenMunu());
viewBinding.tianjiaTv.setOnClickListener(v -> {
hiddenMunu();
startActivity(new Intent(getActivity(), AddFriendsActivity.class));
});
viewBinding.viewContactclick.setOnClickListener(view -> {
viewBinding.chuangjianTv.setOnClickListener(v -> {
hiddenMunu();
// startActivity(new Intent(getActivity(), FunContactSelectorActivity.class)
// .putExtra(KEY_CONTACT_SELECTOR_MAX_COUNT, DEFAULT_MAX_SELECT_COUNT)
// .putExtra(KEY_REQUEST_SELECTOR_NAME_ENABLE, true));
startCreateGroup();
});
viewBinding.tongxunluTv.setOnClickListener(v -> {
hiddenMunu();
startActivity(new Intent(getActivity(), ContactActivity.class));
});
viewBinding.ivChatfmContact.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), NotifyActMessageActivity.class));
setNotifyTotalCount1(0);
});
viewBinding.ivIndexfmNotifytop.setOnClickListener(v -> {
notifyCount = 0;
@@ -432,7 +488,20 @@ public class ChatTabFragment extends BaseFragment {
// };
}
private void hiddenMunu() {
viewBinding.floatMenuRy.setVisibility(View.GONE);
viewBinding.ivChatfmAdd.setImageResource(R.mipmap.tab_add);
}
public void setNotifyTotalCount1(int size) {
if (size > 0) {
viewBinding.viewChatfmNotifypoint1.setVisibility(View.VISIBLE);
// viewBinding.viewChatfmNotifypoint1.setText("" + size);
} else {
viewBinding.viewChatfmNotifypoint1.setVisibility(View.GONE);
}
}
public void startCreateGroup() {
startActivity(new Intent(getActivity(), FunContactSelectorActivity.class).putExtra(KEY_CONTACT_SELECTOR_MAX_COUNT, DEFAULT_MAX_SELECT_COUNT).putExtra(KEY_REQUEST_SELECTOR_NAME_ENABLE, true));
}

8
app/src/main/java/com/hbl/lewan/main/chat/ContactActivity.java → app/src/main/java/com/hbl/yuliao/main/chat/ContactActivity.java
View File

@@ -1,13 +1,13 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import android.os.Bundle;
import android.util.TypedValue;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityContactBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityContactBinding;
//通讯录

256
app/src/main/java/com/hbl/lewan/main/chat/ContactFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/ContactFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import static com.netease.yunxin.kit.chatkit.ui.fun.FunChatForwardSelectDialog.TAG;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.LIB_TAG;
@@ -27,32 +27,32 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentIndex2Binding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.main.MainActivity;
//import com.hbl.lewan.main.index.AiChatActivity;
import com.hbl.lewan.main.index.adapter.IndexContactAdapter;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
import com.hbl.lewan.main.mine.setting.SettingNewActivity;
import com.hbl.lewan.model.AiChatUpdateEvent;
import com.hbl.lewan.model.AiMessageBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.FileUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentIndex2Binding;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.imkit.verify.FunVerifyListActivity;
import com.hbl.yuliao.main.MainActivity;
//import com.hbl.yuliao.main.index.AiChatActivity;
import com.hbl.yuliao.main.index.adapter.IndexContactAdapter;
import com.hbl.yuliao.main.index.add.AddFriendsActivity;
import com.hbl.yuliao.main.mine.setting.SettingNewActivity;
import com.hbl.yuliao.model.AiChatUpdateEvent;
import com.hbl.yuliao.model.AiMessageBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.FileUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.MsgService;
@@ -159,9 +159,9 @@ public class ContactFragment extends BaseFragment {
public void onNotify(@NonNull AiChatUpdateEvent stringupdate) {
//更新头像
if (!TextUtils.isEmpty(stringupdate.contentvalue)) {
binding.tvIndexfmAicontent.setText(stringupdate.contentvalue);
// binding.tvIndexfmAicontent.setText(stringupdate.contentvalue);
} else {
binding.tvIndexfmAicontent.setText(getString(R.string.aihint_txt));
// binding.tvIndexfmAicontent.setText(getString(R.string.aihint_txt));
}
}
@@ -365,58 +365,58 @@ public class ContactFragment extends BaseFragment {
}
});
// mainActivity = (MainActivity) getActivity();
binding.ivIndexfmAihead.setData(R.mipmap.ic_logo, "");
binding.avIndexfraHead.setOnClickListener(v -> startUserInfoActivity(IMKitClient.account()));
// binding.ivIndexfmAihead.setData(R.mipmap.ic_logo, "");
// binding.avIndexfraHead.setOnClickListener(v -> startUserInfoActivity(IMKitClient.account()));
setAichatHistory();
binding.layoutIndexfmAddfriends.setOnClickListener(view -> {
startaddFriends();
});
binding.ivIndexfmAddfriendtop.setOnClickListener(view -> {
startaddFriends();
});
binding.ivIndexfmNotifytop.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), FunVerifyListActivity.class));
binding.viewChatfmFrinedspoint.setVisibility(View.GONE);
});
// binding.ivIndexfmAddfriendtop.setOnClickListener(view -> {
// startaddFriends();
// });
// binding.ivIndexfmNotifytop.setOnClickListener(view -> {
// startActivity(new Intent(getActivity(), FunVerifyListActivity.class));
// binding.viewChatfmFrinedspoint.setVisibility(View.GONE);
// });
binding.layoutIndexfmAddgroup.setOnClickListener(view -> {
startCreateGroup();
}
);
binding.layoutIndexfmSearch.getRoot().setOnClickListener(view -> startActivity(new Intent(getActivity(), FunSearchActivity.class))
);
binding.ivIndexfmSettingtop.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), SettingNewActivity.class));
// binding.layoutIndexfmSearch.getRoot().setOnClickListener(view -> startActivity(new Intent(getActivity(), FunSearchActivity.class))
// );
// binding.ivIndexfmSettingtop.setOnClickListener(view -> {
// startActivity(new Intent(getActivity(), SettingNewActivity.class));
//// MainActivity activity = (MainActivity) getActivity();
//// activity.toSetting();
// });
// binding.layoutIndexfmSearch.ivCommonsearchScan.setOnClickListener(v -> {
// MainActivity activity = (MainActivity) getActivity();
// activity.toSetting();
});
// activity.toScan();
// });
binding.layoutIndexfmSearch.ivCommonsearchScan.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toScan();
});
// binding.saoyisaoTv.setOnClickListener(v -> {
// MainActivity activity = (MainActivity) getActivity();
// activity.toScan();
// });
//
// binding.zhuanzhangTv.setOnClickListener(v -> {
// MainActivity activity = (MainActivity) getActivity();
// activity.toTlt();
// });
binding.saoyisaoTv.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toScan();
});
// binding.wawajiLy.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// MainActivity activity = (MainActivity) getActivity();
// activity.toTlt();
// }
// });
binding.zhuanzhangTv.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toTlt();
});
binding.wawajiLy.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
MainActivity activity = (MainActivity) getActivity();
activity.toTlt();
}
});
binding.fukuanTv.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toSShop(false);
});
// binding.fukuanTv.setOnClickListener(v -> {
// MainActivity activity = (MainActivity) getActivity();
// activity.toSShop(false);
// });
// binding.fukuanTv.setOnLongClickListener(new View.OnLongClickListener() {
// @Override
@@ -426,10 +426,10 @@ public class ContactFragment extends BaseFragment {
// return false;
// }
// });
binding.shoukuanTv.setOnClickListener(v -> {
MainActivity activity = (MainActivity) getActivity();
activity.toQrcode();
});
// binding.shoukuanTv.setOnClickListener(v -> {
// MainActivity activity = (MainActivity) getActivity();
// activity.toQrcode();
// });
binding.tvIndexfmFriendspull.setOnClickListener(view -> {
@@ -463,27 +463,27 @@ public class ContactFragment extends BaseFragment {
});
binding.layoutIndexfmAichat.setOnClickListener(view -> {
//launcher
// launcher.launch(new Intent(getActivity(), AiChatActivity.class));
// startActivity(new Intent(getActivity(), AiChatActivity.class));
});
// binding.layoutIndexfmAichat.setOnClickListener(view -> {
// //launcher
//// launcher.launch(new Intent(getActivity(), AiChatActivity.class));
//// startActivity(new Intent(getActivity(), AiChatActivity.class));
// });
binding.tvIndexfmTbgzpull.setOnClickListener(v -> {
if (isFollowShouQi) {
commonAdapterReadContents.setDates(usersExistBeans);
Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_up);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
binding.tvIndexfmTbgzpull.setCompoundDrawables(null, null, drawable, null);
} else {
commonAdapterReadContents.setDates(usersExistBeansShouQi);
Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_down);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
binding.tvIndexfmTbgzpull.setCompoundDrawables(null, null, drawable, null);
}
isFollowShouQi = !isFollowShouQi;
});
// binding.tvIndexfmTbgzpull.setOnClickListener(v -> {
// if (isFollowShouQi) {
// commonAdapterReadContents.setDates(usersExistBeans);
// Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_up);
// drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
// binding.tvIndexfmTbgzpull.setCompoundDrawables(null, null, drawable, null);
// } else {
// commonAdapterReadContents.setDates(usersExistBeansShouQi);
// Drawable drawable = getResources().getDrawable(R.mipmap.ic_indexfm_down);
// drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
// binding.tvIndexfmTbgzpull.setCompoundDrawables(null, null, drawable, null);
// }
// isFollowShouQi = !isFollowShouQi;
//
// });
binding.contactfriends.setLayoutManager(new LinearLayoutManager(getActivity()));
binding.contactgroups.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -498,18 +498,18 @@ public class ContactFragment extends BaseFragment {
if (usersExistBeans == null) {
usersExistBeans = new ArrayList<>();
usersExistBeansShouQi = new ArrayList<>();
binding.tebieguanzhuLy.setVisibility(View.GONE);
// binding.tebieguanzhuLy.setVisibility(View.GONE);
} else {
if (usersExistBeans.size() > 3) {
usersExistBeansShouQi = usersExistBeans.subList(0, 3);
} else {
usersExistBeansShouQi = usersExistBeans;
}
binding.tebieguanzhuLy.setVisibility(View.VISIBLE);
// binding.tebieguanzhuLy.setVisibility(View.VISIBLE);
}
initAdapterRed();
// initAdapterRed();
AnimUtil.setAnimViews(1.1f, binding.wawajiLy, binding.saoyisaoTv, binding.zhuanzhangTv, binding.fukuanTv, binding.shoukuanTv);
// AnimUtil.setAnimViews(1.1f, binding.wawajiLy, binding.saoyisaoTv, binding.zhuanzhangTv, binding.fukuanTv, binding.shoukuanTv);
}
public void setAichatHistory() {
@@ -518,12 +518,12 @@ public class ContactFragment extends BaseFragment {
List<AiMessageBean> aiMessageBean = GsonUtils.getListFromJSON(value, AiMessageBean.class);
LogUtils.i("aimessagebean-" + aiMessageBean.size());
value = aiMessageBean.size() == 0 ? getString(R.string.aihint_txt) : aiMessageBean.get(aiMessageBean.size() - 1).getMessage();
binding.tvIndexfmAicontent.setText(value);
// binding.tvIndexfmAicontent.setText(value);
}
}
private void initAdapterRed() {
binding.contacttbgz.setLayoutManager(new LinearLayoutManager(getActivity()));
// binding.contacttbgz.setLayoutManager(new LinearLayoutManager(getActivity()));
commonAdapterReadContents = new CommonAdapter<>(getActivity(), R.layout.follow_child_item1, usersExistBeansShouQi) {
@Override
public void convert(ViewHolder holder, UsersExistBean s, int index) {
@@ -621,7 +621,7 @@ public class ContactFragment extends BaseFragment {
};
binding.contacttbgz.setAdapter(commonAdapterReadContents);
// binding.contacttbgz.setAdapter(commonAdapterReadContents);
}
@@ -747,10 +747,14 @@ public class ContactFragment extends BaseFragment {
if (binding != null) {
int size = friendContactAdapter.getData().size();
if (size > 0) {
binding.tvIndexfmFriendstitle.setText(getString(R.string.haoyou_txt) + " " + size);
binding.layoutIndexfmAddfriends.setVisibility(View.GONE);
binding.tvIndexfmFriendstitle.setText(getString(R.string.haoyou_txt) + "（" + size+"）");
binding.tvIndexfmFriendstitle.setVisibility(View.VISIBLE);
binding.layoutIndexfmAddfriends.setVisibility(View.VISIBLE);
} else {
binding.layoutIndexfmAddfriends.setVisibility(View.VISIBLE);
binding.tvIndexfmFriendstitle.setVisibility(View.GONE);
}
binding.tvIndexfmFriendspull.setVisibility(size > 3 ? View.VISIBLE : View.GONE);
}
@@ -783,10 +787,14 @@ public class ContactFragment extends BaseFragment {
int size = teamContactAdapter.getData().size();
if (binding != null) {
if (size > 0) {
binding.tvIndexfmGrouptitle.setText(getString(R.string.group_text) + " " + size);
binding.layoutIndexfmAddgroup.setVisibility(View.GONE);
binding.tvIndexfmGrouptitle.setText(getString(R.string.group_text) + "（" + size+"）");
binding.layoutIndexfmAddgroup.setVisibility(View.VISIBLE);
binding.tvIndexfmGrouptitle.setVisibility(View.VISIBLE);
} else {
binding.layoutIndexfmAddgroup.setVisibility(View.VISIBLE);
binding.tvIndexfmGrouptitle.setVisibility(View.GONE);
}
binding.tvIndexfmGrouppull.setVisibility(size > 3 ? View.VISIBLE : View.GONE);
}
@@ -894,21 +902,21 @@ public class ContactFragment extends BaseFragment {
// });
// }
private void updateUI(UserInfo userInfo) {
String name =
TextUtils.isEmpty(userInfo.getName()) ? userInfo.getAccount() : userInfo.getName();
String avaterurl = userInfo.getAvatar();
if (TextUtils.isEmpty(avaterurl)) {
binding.avIndexfraHead.setData(
R.mipmap.default_head_img, name, AvatarColor.avatarColor(IMKitClient.account()));
} else {
binding.avIndexfraHead.setData(
userInfo.getAvatar(), name, AvatarColor.avatarColor(IMKitClient.account()));
}
// binding.tvIndexfraNick.setText(name);
// binding.tvIndexfraId.setText("CHEATID：" + IMKitClient.account());
}
// private void updateUI(UserInfo userInfo) {
// String name =
// TextUtils.isEmpty(userInfo.getName()) ? userInfo.getAccount() : userInfo.getName();
// String avaterurl = userInfo.getAvatar();
// if (TextUtils.isEmpty(avaterurl)) {
// binding.avIndexfraHead.setData(
// R.mipmap.default_head_img, name, AvatarColor.avatarColor(IMKitClient.account()));
// } else {
// binding.avIndexfraHead.setData(
// userInfo.getAvatar(), name, AvatarColor.avatarColor(IMKitClient.account()));
// }
//
//// binding.tvIndexfraNick.setText(name);
//// binding.tvIndexfraId.setText("CHEATID：" + IMKitClient.account());
// }
// @Override
// public void onResume() {
@@ -940,19 +948,19 @@ public class ContactFragment extends BaseFragment {
} else {
commonAdapterReadContents.setDates(usersExistBeans);
}
binding.tvIndexfmTbgzpull.setVisibility(usersExistBeans.size() > 3 ? View.VISIBLE : View.GONE);
binding.tebieguanzhuLy.setVisibility(View.VISIBLE);
binding.tvIndexfmTbgztitle.setText(getActivity().getResources().getString(R.string.tebiezhuanzhu_txt) + " " + usersExistBeans.size());
// binding.tvIndexfmTbgzpull.setVisibility(usersExistBeans.size() > 3 ? View.VISIBLE : View.GONE);
// binding.tebieguanzhuLy.setVisibility(View.VISIBLE);
// binding.tvIndexfmTbgztitle.setText(getActivity().getResources().getString(R.string.tebiezhuanzhu_txt) + " " + usersExistBeans.size());
} else {
binding.tebieguanzhuLy.setVisibility(View.GONE);
// binding.tebieguanzhuLy.setVisibility(View.GONE);
}
}
@Override
public void onError(int code, String msg) {
LogUtils.i("获取到的错误:" + code + "" + msg);
binding.tebieguanzhuLy.setVisibility(View.GONE);
// binding.tebieguanzhuLy.setVisibility(View.GONE);
}
});

28
app/src/main/java/com/hbl/lewan/main/chat/EditChatRecordlistActivity.java → app/src/main/java/com/hbl/yuliao/main/chat/EditChatRecordlistActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import static com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant.LIB_TAG;
@@ -15,19 +15,19 @@ import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityEditChatrecordBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.event.ConversationEditEvent;
import com.hbl.lewan.login.PhoneLoginActivity;
import com.hbl.lewan.model.NotifyCountBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityEditChatrecordBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.event.ConversationEditEvent;
import com.hbl.yuliao.login.PhoneLoginActivity;
import com.hbl.yuliao.model.NotifyCountBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

28
app/src/main/java/com/hbl/lewan/main/chat/FollowListFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/FollowListFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import android.os.Bundle;
import android.text.TextUtils;
@@ -12,19 +12,19 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentFollowlistBinding;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentFollowlistBinding;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

18
app/src/main/java/com/hbl/lewan/main/chat/FriendConversationFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/FriendConversationFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import static com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant.LIB_TAG;
@@ -17,14 +17,14 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentChatBinding;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentChatBinding;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

12
app/src/main/java/com/hbl/lewan/main/chat/TeamConversationFragment.java → app/src/main/java/com/hbl/yuliao/main/chat/TeamConversationFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.chat;
package com.hbl.yuliao.main.chat;
import static com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant.LIB_TAG;
@@ -20,11 +20,11 @@ import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentChatBinding;
import com.hbl.lewan.databinding.FragmentTeamconversationBinding;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentChatBinding;
import com.hbl.yuliao.databinding.FragmentTeamconversationBinding;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.alog.ALog;

26
app/src/main/java/com/hbl/lewan/main/home/CustomServicesActivity.java → app/src/main/java/com/hbl/yuliao/main/home/CustomServicesActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.home;
package com.hbl.yuliao.main.home;
import static com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant.LIB_TAG;
@@ -15,18 +15,18 @@ import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityCustomServicesBinding;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityCustomServicesBinding;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

66
app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java → app/src/main/java/com/hbl/yuliao/main/home/HomeFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.home;
package com.hbl.yuliao.main.home;
import android.content.Context;
import android.content.Intent;
@@ -21,38 +21,38 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.text.HtmlCompat;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentHomeNewBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.main.MainActivity;
//import com.hbl.lewan.main.index.AiChatActivity;
import com.hbl.lewan.main.message.NotifyMessageActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.AdBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.MessageBean;
import com.hbl.lewan.model.NotifyCountBean;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.model.UserRankBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ImageLoader;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.GiftInfoActivity;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.lewan.wallet.TopUpActivity;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentHomeNewBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.imkit.verify.FunVerifyListActivity;
import com.hbl.yuliao.main.MainActivity;
//import com.hbl.yuliao.main.index.AiChatActivity;
import com.hbl.yuliao.main.message.NotifyMessageActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.AdBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.MessageBean;
import com.hbl.yuliao.model.NotifyCountBean;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.model.UserRankBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.ImageLoader;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.GiftInfoActivity;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.wallet.TopUpActivity;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.Observer;
import com.netease.nimlib.sdk.friend.model.AddFriendNotify;

38
app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java → app/src/main/java/com/hbl/yuliao/main/index/AiChatActivity.java
View File

@@ -1,4 +1,4 @@
//package com.hbl.lewan.main.index;
//package com.hbl.yuliao.main.index;
//
//import static android.widget.RelativeLayout.ALIGN_PARENT_END;
//import static android.widget.RelativeLayout.ALIGN_PARENT_START;
@@ -20,24 +20,24 @@
//import androidx.recyclerview.widget.LinearLayoutManager;
//
//import com.bumptech.glide.Glide;
//import com.hbl.lewan.IMApplication;
//import com.hbl.lewan.R;
//import com.hbl.lewan.adapter.CommonAdapter;
//import com.hbl.lewan.adapter.ViewHolder;
//import com.hbl.lewan.base.LllChatBaseActivity;
//import com.hbl.lewan.databinding.ActivityAichatBinding;
//import com.hbl.lewan.dialog.ActionConfirmDialog;
//import com.hbl.lewan.model.AiConvertBean;
//import com.hbl.lewan.model.AiMessageBean;
//import com.hbl.lewan.network.Api;
//import com.hbl.lewan.network.BaseObserver;
//import com.hbl.lewan.network.Result;
//import com.hbl.lewan.pay.CollectionActivity;
//import com.hbl.lewan.utils.FileUtils;
//import com.hbl.lewan.utils.GsonUtils;
//import com.hbl.lewan.utils.KeyboardUtil;
//import com.hbl.lewan.utils.LogUtils;
//import com.hbl.lewan.utils.ShareDateUtils;
//import com.hbl.yuliao.IMApplication;
//import com.hbl.yuliao.R;
//import com.hbl.yuliao.adapter.CommonAdapter;
//import com.hbl.yuliao.adapter.ViewHolder;
//import com.hbl.yuliao.base.LllChatBaseActivity;
//import com.hbl.yuliao.databinding.ActivityAichatBinding;
//import com.hbl.yuliao.dialog.ActionConfirmDialog;
//import com.hbl.yuliao.model.AiConvertBean;
//import com.hbl.yuliao.model.AiMessageBean;
//import com.hbl.yuliao.network.Api;
//import com.hbl.yuliao.network.BaseObserver;
//import com.hbl.yuliao.network.Result;
//import com.hbl.yuliao.pay.CollectionActivity;
//import com.hbl.yuliao.utils.FileUtils;
//import com.hbl.yuliao.utils.GsonUtils;
//import com.hbl.yuliao.utils.KeyboardUtil;
//import com.hbl.yuliao.utils.LogUtils;
//import com.hbl.yuliao.utils.ShareDateUtils;
//import com.google.android.gms.common.util.JsonUtils;
//import com.google.android.gms.common.util.SharedPreferencesUtils;
//import com.google.gson.JsonParser;

56
app/src/main/java/com/hbl/lewan/main/index/Index2FragmentBf.java → app/src/main/java/com/hbl/yuliao/main/index/Index2FragmentBf.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.index;
package com.hbl.yuliao.main.index;
import static com.netease.yunxin.kit.chatkit.ui.fun.FunChatForwardSelectDialog.TAG;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.LIB_TAG;
@@ -25,33 +25,33 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentIndex2BfBinding;
import com.hbl.lewan.databinding.FragmentIndex2Binding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.index.adapter.IndexContactAdapter;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
import com.hbl.lewan.main.mine.setting.SettingNewActivity;
import com.hbl.lewan.model.AiChatUpdateEvent;
import com.hbl.lewan.model.AiMessageBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.model.UserUpdateEvent;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.FileUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentIndex2BfBinding;
import com.hbl.yuliao.databinding.FragmentIndex2Binding;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.imkit.verify.FunVerifyListActivity;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.index.adapter.IndexContactAdapter;
import com.hbl.yuliao.main.index.add.AddFriendsActivity;
import com.hbl.yuliao.main.mine.setting.SettingNewActivity;
import com.hbl.yuliao.model.AiChatUpdateEvent;
import com.hbl.yuliao.model.AiMessageBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.model.UserUpdateEvent;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.FileUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

42
app/src/main/java/com/hbl/lewan/main/index/IndexFragment.java → app/src/main/java/com/hbl/yuliao/main/index/IndexFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.index;
package com.hbl.yuliao.main.index;
import static com.netease.yunxin.kit.chatkit.ui.fun.FunChatForwardSelectDialog.TAG;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.LIB_TAG;
@@ -24,26 +24,26 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentIndexBinding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
import com.hbl.lewan.main.mine.setting.SettingNewActivity;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentIndexBinding;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.imkit.verify.FunVerifyListActivity;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.index.add.AddFriendsActivity;
import com.hbl.yuliao.main.mine.setting.SettingNewActivity;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.model.MuteListChangedNotify;
import com.netease.nimlib.sdk.msg.MsgService;

10
app/src/main/java/com/hbl/lewan/main/index/adapter/IndexContactAdapter.java → app/src/main/java/com/hbl/yuliao/main/index/adapter/IndexContactAdapter.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.index.adapter;
package com.hbl.yuliao.main.index.adapter;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -20,10 +20,10 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewbinding.ViewBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ItemContactlistBinding;
import com.hbl.lewan.databinding.TeamMembersViewHolderBinding;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ItemContactlistBinding;
import com.hbl.yuliao.databinding.TeamMembersViewHolderBinding;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.MsgService;

221
app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java → app/src/main/java/com/hbl/yuliao/main/index/add/AddFriendsActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.index.add;
package com.hbl.yuliao.main.index.add;
import static com.netease.yunxin.kit.chatkit.repo.ChatRepo.sendMessage;
import static com.netease.yunxin.kit.contactkit.ui.selector.BaseContactSelectorActivity.DEFAULT_MAX_SELECT_COUNT;
@@ -16,10 +16,12 @@ import android.os.Bundle;
import android.os.Handler;
import android.provider.ContactsContract;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -34,48 +36,51 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityAddfriendsBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.imkit.add.FunAddFriendActivity;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.authorize.AuthorizeActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.main.mine.FriendPermissionsActivity;
import com.hbl.lewan.main.mine.UserInfoActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.PaymentActivity;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.CommonUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.QRCodeScheme;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityAddfriendsBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.imkit.add.FunAddFriendActivity;
import com.hbl.yuliao.imkit.selector.FunContactSelectorActivity;
import com.hbl.yuliao.imkit.verify.FunVerifyListActivity;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.authorize.AuthorizeActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.main.mine.FriendPermissionsActivity;
import com.hbl.yuliao.main.mine.UserInfoActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.PaymentActivity;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.CommonUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.QRCodeScheme;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.hbl.yuliao.widget.CircleImageView;
import com.huawei.hms.hmsscankit.ScanUtilNew;
import com.huawei.hms.ml.scan.HmsScan;
import com.huawei.hms.ml.scan.HmsScanAnalyzerOptions;
@@ -147,7 +152,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
userinfoviewModel = new ViewModelProvider(this).get(UserInfoViewModel.class);
initAdapterRed();
binding.titleBarView.getRightImageView().setImageResource(R.mipmap.ic_index_setting);
binding.titleBarView.getRightImageView().setVisibility(View.VISIBLE);
// binding.titleBarView.getRightImageView().setVisibility(View.VISIBLE);
binding.titleBarView.getRightImageView().setOnClickListener(v -> startActivity(new Intent(AddFriendsActivity.this, FriendPermissionsActivity.class)));
initView();
permissionLauncher =
@@ -228,6 +233,15 @@ public class AddFriendsActivity extends LllChatBaseActivity {
}
@Override
public void onBackPressed() {
if(binding.qrRy.getVisibility()==View.VISIBLE){
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}else {
super.onBackPressed();
}
}
@RequiresApi(api = Build.VERSION_CODES.M)
public void initView() {
@@ -253,9 +267,12 @@ public class AddFriendsActivity extends LllChatBaseActivity {
if (PermissionUtils.hasPermissions(
AddFriendsActivity.this, Manifest.permission.READ_CONTACTS)) {
binding.tongxunluCly.setVisibility(View.GONE);
binding.tongxunluCly1.setVisibility(View.GONE);
getContactsList();
} else {
binding.tongxunluCly.setVisibility(View.VISIBLE);
binding.tongxunluCly1.setVisibility(View.VISIBLE);
}
permissionLauncherReadContacts =
@@ -269,6 +286,8 @@ public class AddFriendsActivity extends LllChatBaseActivity {
if (grant) {
if (TextUtils.equals(permission, Manifest.permission.READ_CONTACTS)) {
binding.tongxunluCly.setVisibility(View.GONE);
binding.tongxunluCly1.setVisibility(View.GONE);
getContactsList();
}
} else {
@@ -593,7 +612,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
default:
if (scheme.startsWith("http")) {
if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("http://admin.yuliao666.top/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
Intent intentweb = new Intent(Intent.ACTION_VIEW);
@@ -612,7 +631,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
}
} else {
if (scheme.startsWith("http")) {
if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("http://admin.yuliao666.top/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
// activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));
@@ -963,7 +982,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
private TextView groupNameTv;
private void showQrcodeView(String groupId) {
BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
// BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
View bottomView = LayoutInflater.from(AddFriendsActivity.this).inflate(R.layout.bottom_sheet_join_group, null);
coloseIv = (ImageView) bottomView.findViewById(R.id.colose_iv);
@@ -972,6 +991,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
joinTv = (TextView) bottomView.findViewById(R.id.join_tv);
Team team = NIMClient.getService(TeamService.class).queryTeamBlock(groupId);
groupNameTv = (TextView) bottomView.findViewById(R.id.group_name_tv);
bottomView.findViewById(R.id.join_title_tv_v).setVisibility(View.GONE);
if (team != null) {
if (TextUtils.isEmpty(team.getIcon())) {
groupHeadIv.setData(com.netease.yunxin.kit.contactkit.ui.R.mipmap.ic_group_defaulthead, "head");
@@ -991,7 +1011,8 @@ public class AddFriendsActivity extends LllChatBaseActivity {
}
joinTv.setOnClickListener(v -> {
if (team.isMyTeam()) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team)
.withContext(AddFriendsActivity.this)
@@ -1005,7 +1026,8 @@ public class AddFriendsActivity extends LllChatBaseActivity {
LogUtils.i("加入群聊成功4444444444444444444");
LogUtils.i("加入群聊成功：" + GsonUtils.beanToJSONString(team1));
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team1)
@@ -1017,20 +1039,23 @@ public class AddFriendsActivity extends LllChatBaseActivity {
public void onFailed(int code) {
//仅仅是申请成功,code 808
if (code == ResponseCode.RES_TEAM_APPLY_SUCCESS) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.dendaiqueren_txt);
}
// 已经在群里，code 809
else if (code == ResponseCode.RES_TEAM_ALREADY_IN) {
getJoinInfo(groupId, true, bottomSheetDialog);
getJoinInfo(groupId, true);
// 群人数已达上限
} else if (code == ResponseCode.RES_TEAM_LIMIT) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.team_num_limit);
} else {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast("failed, error code =" + code);
@@ -1040,7 +1065,8 @@ public class AddFriendsActivity extends LllChatBaseActivity {
@Override
public void onException(Throwable exception) {
// error
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(exception.getMessage());
@@ -1051,7 +1077,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
} else {
joinTitleTv.setText(R.string.join_group_txt);
joinTv.setText(R.string.join_group_txt);
getJoinInfo(groupId, false, bottomSheetDialog);
getJoinInfo(groupId, false);
LogUtils.i("加入群聊成功555555555555");
joinTv.setOnClickListener(v -> NIMClient.getService(TeamService.class).applyJoinTeam(groupId, null).setCallback(new RequestCallback<Team>() {
@@ -1059,7 +1085,8 @@ public class AddFriendsActivity extends LllChatBaseActivity {
public void onSuccess(Team team1) {
LogUtils.i("加入群聊成功：" + GsonUtils.beanToJSONString(true));
LogUtils.i("加入群聊成功6666666666666666");
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team1)
.withContext(AddFriendsActivity.this)
@@ -1070,21 +1097,24 @@ public class AddFriendsActivity extends LllChatBaseActivity {
public void onFailed(int code) {
//仅仅是申请成功,code 808
if (code == ResponseCode.RES_TEAM_APPLY_SUCCESS) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.dendaiqueren_txt);
}
// 已经在群里，code 809
else if (code == ResponseCode.RES_TEAM_ALREADY_IN) {
getJoinInfo(groupId, true, bottomSheetDialog);
getJoinInfo(groupId, true);
// 群人数已达上限
} else if (code == ResponseCode.RES_TEAM_LIMIT) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.team_num_limit);
} else {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast("failed, error code =" + code);
@@ -1105,21 +1135,24 @@ public class AddFriendsActivity extends LllChatBaseActivity {
coloseIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
});
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
}
// bottomSheetDialog.setContentView(bottomView);
// bottomSheetDialog.show();
//
// bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
// }
binding.qrRy.removeAllViews();
binding.qrRy.addView(bottomView);
binding.qrRy.setVisibility(View.VISIBLE);
}
private void getJoinInfo(String gid, boolean b, BottomSheetDialog dialog) {
private void getJoinInfo(String gid, boolean b) {
NIMClient.getService(TeamService.class).searchTeam(gid).setCallback(new RequestCallback<Team>() {
@Override
public void onSuccess(Team result) {
@@ -1129,7 +1162,8 @@ public class AddFriendsActivity extends LllChatBaseActivity {
groupNameTv.setText(result.getName());
} else {
LogUtils.i("加入群聊成功88888888888888");
dialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, result)
.withContext(AddFriendsActivity.this)
@@ -1140,12 +1174,14 @@ public class AddFriendsActivity extends LllChatBaseActivity {
@Override
public void onFailed(int code) {
dialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
@Override
public void onException(Throwable exception) {
dialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
});
}
@@ -1196,21 +1232,27 @@ public class AddFriendsActivity extends LllChatBaseActivity {
private ImageView coloseIv2;
private LinearLayout qrcodeLy;
private LinearLayout qrcodeLy1;
private ImageView qrcodeIv;
private TextView qrcodeTipsTv;
private LinearLayout qrcodeActionLy;
private TextView copyTv;
private TextView shareTv;
private TextView saveTv;
private TextView shuaxinTv;
// private TextView shuaxinTv;
private CircleImageView userIv;
private TextView userTv;
@RequiresApi(api = Build.VERSION_CODES.M)
private void showQrcodeView() {
BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
// BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.CustomBottomSheetDialog);
View bottomView = LayoutInflater.from(AddFriendsActivity.this).inflate(R.layout.bottom_sheet_qrcode_layout, null);
userIv = (CircleImageView) bottomView.findViewById(R.id.user_iv);
userTv = (TextView) bottomView.findViewById(R.id.user_tv);
coloseIv2 = (ImageView) bottomView.findViewById(R.id.colose_iv);
qrcodeLy1 = (LinearLayout) bottomView.findViewById(R.id.qrcode_ly1);
qrcodeLy = (LinearLayout) bottomView.findViewById(R.id.qrcode_ly);
qrcodeIv = (ImageView) bottomView.findViewById(R.id.qrcode_iv);
qrcodeTipsTv = (TextView) bottomView.findViewById(R.id.qrcode_tips_tv);
@@ -1218,9 +1260,10 @@ public class AddFriendsActivity extends LllChatBaseActivity {
copyTv = (TextView) bottomView.findViewById(R.id.copy_tv);
shareTv = (TextView) bottomView.findViewById(R.id.share_tv);
saveTv = (TextView) bottomView.findViewById(R.id.save_tv);
shuaxinTv = (TextView) bottomView.findViewById(R.id.shuaxin_tv);
// shuaxinTv = (TextView) bottomView.findViewById(R.id.shuaxin_tv);
LoginBean loginBean = DataUtils.getLocUserInfo();
LogUtils.i("地址是撒："+GsonUtils.beanToJSONString(loginBean));
Bitmap bitmap = CodeUtils.createQRCode(String.format(IMUIKitConfig.SHARE_INVCODE1, IMKitClient.account()), DataUtils.dip2px(this, 175.0f), null);
if (loginBean != null) {
bitmap = CodeUtils.createQRCode(String.format(IMUIKitConfig.SHARE_ADD_USER, loginBean.getUser().getInviteCode(), IMKitClient.account()), DataUtils.dip2px(this, 175.0f), null);
@@ -1229,17 +1272,20 @@ public class AddFriendsActivity extends LllChatBaseActivity {
qrcodeIv.setImageBitmap(bitmap);
}
shuaxinTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ToastX.showShortToast(R.string.shuaxinchenggong_txt);
}
});
userTv.setText(loginBean.getNickname()+"");
Glide.with(AddFriendsActivity.this).load(loginBean.getUserAvatarFileName()).into(userIv);
// shuaxinTv.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// ToastX.showShortToast(R.string.shuaxinchenggong_txt);
// }
// });
coloseIv2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
});
@@ -1293,12 +1339,15 @@ public class AddFriendsActivity extends LllChatBaseActivity {
ToastX.showShortToast(R.string.fuzhichenggong_txt);
}
});
// bottomSheetDialog.setContentView(bottomView);
// bottomSheetDialog.show();
// bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
// AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
//// bottomSheetDialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.MATCH_PARENT);
binding.qrRy.removeAllViews();
binding.qrRy.addView(bottomView);
binding.qrRy.setVisibility(View.VISIBLE);
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
}
private void requestCameraPermission(String permission) {
@@ -1441,7 +1490,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
*/
private void doSaveQrcode() {
// 先生成bitmap对象
Bitmap bmp = DataUtils.generateBitmap(qrcodeLy);
Bitmap bmp = DataUtils.generateBitmap(qrcodeLy1);
// bitmap对象生成成功
if (bmp != null) {
// 保存到相册成功

48
app/src/main/java/com/hbl/lewan/main/message/NotifyActMessageActivity.java → app/src/main/java/com/hbl/yuliao/main/message/NotifyActMessageActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.message;
package com.hbl.yuliao.main.message;
import android.app.NotificationManager;
import android.content.Context;
@@ -15,27 +15,27 @@ import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityMessageActBinding;
import com.hbl.lewan.databinding.ActivityMessageBinding;
import com.hbl.lewan.model.ActivityMsgBean;
import com.hbl.lewan.model.DongTaiActionBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.MessageBean;
import com.hbl.lewan.model.SendOrderBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.TopUpActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityMessageActBinding;
import com.hbl.yuliao.databinding.ActivityMessageBinding;
import com.hbl.yuliao.model.ActivityMsgBean;
import com.hbl.yuliao.model.DongTaiActionBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.MessageBean;
import com.hbl.yuliao.model.SendOrderBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.TopUpActivity;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
import com.netease.yunxin.kit.common.ui.utils.TimeFormatUtils;
import com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
@@ -77,6 +77,8 @@ public class NotifyActMessageActivity extends LllChatBaseActivity {
initList();
getActivityMsgList();
closeNotify();
DataUtils.set(NotifyActMessageActivity.this, "activity_message_count", 0);
}
//关闭通知栏
@@ -140,6 +142,8 @@ public class NotifyActMessageActivity extends LllChatBaseActivity {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<ActivityMsgBean> feedbackResp) {
DataUtils.set(NotifyActMessageActivity.this, "notify_message_time_" + IMKitClient.account(), System.currentTimeMillis());
changeDate(feedbackResp.data);
}

44
app/src/main/java/com/hbl/lewan/main/message/NotifyMessageActivity.java → app/src/main/java/com/hbl/yuliao/main/message/NotifyMessageActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.message;
package com.hbl.yuliao.main.message;
import android.content.Context;
import android.content.Intent;
@@ -15,27 +15,27 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityMessageBinding;
import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.CirPushMessage;
import com.hbl.lewan.model.DongTaiActionBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.MessageBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.MessageActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityMessageBinding;
import com.hbl.yuliao.imkit.verify.FunVerifyListActivity;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.CirPushMessage;
import com.hbl.yuliao.model.DongTaiActionBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.MessageBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.MessageActivity;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.Observer;
import com.netease.nimlib.sdk.friend.model.AddFriendNotify;

20
app/src/main/java/com/hbl/lewan/main/message/NotifyMessageDetailsActivity.java → app/src/main/java/com/hbl/yuliao/main/message/NotifyMessageDetailsActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.message;
package com.hbl.yuliao.main.message;
import android.content.Intent;
import android.net.Uri;
@@ -12,15 +12,15 @@ import android.webkit.WebViewClient;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityMessageActBinding;
import com.hbl.lewan.databinding.ActivityMessageActDetailsBinding;
import com.hbl.lewan.model.ActivityMsgBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityMessageActBinding;
import com.hbl.yuliao.databinding.ActivityMessageActDetailsBinding;
import com.hbl.yuliao.model.ActivityMsgBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import io.reactivex.android.schedulers.AndroidSchedulers;

42
app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/AccountAndSecurityActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.Intent;
import android.os.Bundle;
@@ -9,22 +9,22 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.login.ChongZhiActivity;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.BaseObserver1;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.lewan.wxapi.bean.WeiXin;
import com.hbl.lewan.wxapi.bean.WeiXinInfo;
import com.hbl.lewan.wxapi.bean.WeiXinToken;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.login.ChongZhiActivity;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.BaseObserver1;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.hbl.yuliao.wxapi.bean.WeiXin;
import com.hbl.yuliao.wxapi.bean.WeiXinInfo;
import com.hbl.yuliao.wxapi.bean.WeiXinToken;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.chatkit.ui.data.ChatDatabase;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
@@ -34,13 +34,13 @@ import com.netease.yunxin.kit.corekit.im.IMKitClient;
//import com.tencent.mm.opensdk.openapi.IWXAPI;
//import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.hbl.lewan.databinding.ActivitySecurityBinding;
import com.hbl.yuliao.databinding.ActivitySecurityBinding;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
public class AccountAndSecurityActivity extends BaseActivity {
@@ -231,7 +231,7 @@ public class AccountAndSecurityActivity extends BaseActivity {
});
viewBinding.accoutBt.setOnClickListener(v -> {
if(loginBean!=null&&(loginBean.getUserType()+"").equals("2")){
ToastX.showShortToast("副号不支持修改乐玩账号");
ToastX.showShortToast("副号不支持修改遇聊账号");
return;
}
startActivityForResult(new Intent(AccountAndSecurityActivity.this, SettingAccoutIdActivity.class), 888);

76
app/src/main/java/com/hbl/lewan/main/mine/AccoutListActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/AccoutListActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.Intent;
import android.graphics.Color;
@@ -24,43 +24,43 @@ import com.bumptech.glide.Glide;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityAccountListBinding;
import com.hbl.lewan.databinding.ActivityBuyAccountBinding;
import com.hbl.lewan.databinding.ActivityShimingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.PayDialog;
import com.hbl.lewan.dialog.SelectPayTypeDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.login.PhoneLoginActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.model.AccountsBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.ExchangeConfBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.PayInfoBean;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.model.TopUpBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GetAndroidUniqueMark;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.lewan.wallet.TopUpActivity;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityAccountListBinding;
import com.hbl.yuliao.databinding.ActivityBuyAccountBinding;
import com.hbl.yuliao.databinding.ActivityShimingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.dialog.SelectPayTypeDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.login.PhoneLoginActivity;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.AccountsBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.ExchangeConfBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.PayInfoBean;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.model.TopUpBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GetAndroidUniqueMark;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.wallet.TopUpActivity;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;

52
app/src/main/java/com/hbl/lewan/main/mine/BuyAccountActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/BuyAccountActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.Intent;
import android.graphics.Color;
@@ -17,31 +17,31 @@ import androidx.core.graphics.drawable.DrawableCompat;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityBuyAccountBinding;
import com.hbl.lewan.databinding.ActivityShimingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.PayDialog;
import com.hbl.lewan.dialog.SelectPayTypeDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.PayInfoBean;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.model.TopUpBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityBuyAccountBinding;
import com.hbl.yuliao.databinding.ActivityShimingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.dialog.SelectPayTypeDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.PayInfoBean;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.model.TopUpBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

48
app/src/main/java/com/hbl/lewan/main/mine/ChangeAccoutActionActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/ChangeAccoutActionActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.app.Activity;
import android.content.Intent;
@@ -30,31 +30,31 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.custom.PasswordEditText;
import com.hbl.lewan.databinding.ActivityChangeAccoutActionBinding;
import com.hbl.lewan.databinding.ActivitySetAccoutIdBinding;
import com.hbl.lewan.dialog.SelectCountryDialog;
import com.hbl.lewan.login.LoginActivity;
import com.hbl.lewan.login.RegisterActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.custom.PasswordEditText;
import com.hbl.yuliao.databinding.ActivityChangeAccoutActionBinding;
import com.hbl.yuliao.databinding.ActivitySetAccoutIdBinding;
import com.hbl.yuliao.dialog.SelectCountryDialog;
import com.hbl.yuliao.login.LoginActivity;
import com.hbl.yuliao.login.RegisterActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

26
app/src/main/java/com/hbl/lewan/main/mine/ChangePasswordActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/ChangePasswordActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.app.Activity;
import android.content.Intent;
@@ -16,19 +16,19 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.databinding.ActivityActivityChangeBinding;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.databinding.ActivityActivityChangeBinding;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

106
app/src/main/java/com/hbl/lewan/main/mine/ChangePhoneActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/ChangePhoneActivity.java
View File

@@ -1,7 +1,8 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.text.Editable;
@@ -20,29 +21,29 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.custom.PasswordEditText;
import com.hbl.lewan.databinding.ActivityChangeAccoutActionBinding;
import com.hbl.lewan.databinding.ActivityChangePhoneBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.ActionConfirmDialog1;
import com.hbl.lewan.dialog.SelectCountryDialog;
import com.hbl.lewan.login.LoginActivity;
import com.hbl.lewan.login.PhoneLoginActivity;
import com.hbl.lewan.login.WangjiActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.KeyboardUtil;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.custom.PasswordEditText;
import com.hbl.yuliao.databinding.ActivityChangeAccoutActionBinding;
import com.hbl.yuliao.databinding.ActivityChangePhoneBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.ActionConfirmDialog1;
import com.hbl.yuliao.dialog.SelectCountryDialog;
import com.hbl.yuliao.login.LoginActivity;
import com.hbl.yuliao.login.PhoneLoginActivity;
import com.hbl.yuliao.login.WangjiActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
@@ -59,8 +60,8 @@ public class ChangePhoneActivity extends BaseActivity {
ActivityChangePhoneBinding binding;
BindBean bean;
int step = 1;
String passwordOld = "";
String passwordNew = "";
// String passwordOld = "";
// String passwordNew = "";
CountryBean countryBean;
@Override
@@ -99,35 +100,54 @@ public class ChangePhoneActivity extends BaseActivity {
protected void initView() {
binding.settingTitleBar.getBackImageView().setOnClickListener(v -> finish());
binding.sendSmsTv.setPaintFlags(binding.sendSmsTv.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
binding.sendSmsTv1.setPaintFlags(binding.sendSmsTv.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
binding.passwordEditTextCode.setOnCompleteListener(new PasswordEditText.onCompletionListener() {
binding.passwordEditTextCode.addTextChangedListener(new TextWatcher() {
@Override
public void onCompletion(String code) {
passwordOld = code;
if (TextUtils.isEmpty(passwordOld) || passwordOld.length() < 4) {
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
if (TextUtils.isEmpty(binding.passwordEditTextCode.getText().toString().trim()) || binding.passwordEditTextCode.getText().toString().trim().length() < 4) {
setSubmitBackground(false);
} else {
setSubmitBackground(true);
}
}
@Override
public void afterTextChanged(Editable s) {
}
});
binding.passwordEditTextCode1.setOnCompleteListener(new PasswordEditText.onCompletionListener() {
binding.passwordEditTextCode1.addTextChangedListener(new TextWatcher() {
@Override
public void onCompletion(String code) {
passwordNew = code;
if (TextUtils.isEmpty(passwordNew) || passwordNew.length() < 4) {
// binding.sumbitBt.setBackgroundResource(R.drawable.logout_btn_sl_88);
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
if (TextUtils.isEmpty(binding.passwordEditTextCode1.getText().toString().trim()) || binding.passwordEditTextCode1.getText().toString().trim().length() < 4) {
setSubmitBackground(false);
} else {
// binding.sumbitBt.setBackgroundResource(R.drawable.logout_btn2);
setSubmitBackground(true);
}
}
@Override
public void afterTextChanged(Editable s) {
}
});
binding.sendSmsTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -175,7 +195,7 @@ public class ChangePhoneActivity extends BaseActivity {
step += 1;
changeShow(step);
} else if (step == 2) {
if (TextUtils.isEmpty(passwordOld)) {
if (TextUtils.isEmpty(binding.passwordEditTextCode.getText().toString().trim())) {
ToastX.showShortToast(getString(R.string.dxyzmbnwk_txt));
return;
}
@@ -189,7 +209,7 @@ public class ChangePhoneActivity extends BaseActivity {
step += 1;
changeShow(step);
} else if (step == 4) {
if (TextUtils.isEmpty(passwordNew)) {
if (TextUtils.isEmpty(binding.passwordEditTextCode1.getText().toString().trim())) {
ToastX.showShortToast(getString(R.string.dxyzmbnwk_txt));
return;
}
@@ -347,7 +367,7 @@ public class ChangePhoneActivity extends BaseActivity {
KeyboardUtil.hideSoftInput(this);
if (bean != null) {
Map<String, Object> maps = new HashMap<>();
maps.put("verifyCode", passwordOld);
maps.put("verifyCode", binding.passwordEditTextCode.getText().toString().trim());
maps.put("phone", bean.getPhone());
maps.put("areaCode", bean.getAreaCode());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
@@ -392,8 +412,8 @@ public class ChangePhoneActivity extends BaseActivity {
maps.put("areaCode", bean.getAreaCode());
maps.put("newPhone", binding.phoneEt.getText().toString().trim());
maps.put("newAreaCode", countryBean.getAreaCodeName());
maps.put("changeVerifyCode", passwordOld);
maps.put("bindVerifyCode", passwordNew);
maps.put("changeVerifyCode", binding.passwordEditTextCode.getText().toString().trim());
maps.put("bindVerifyCode", binding.passwordEditTextCode1.getText().toString().trim());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
@@ -482,7 +502,7 @@ public class ChangePhoneActivity extends BaseActivity {
binding.step2.setVisibility(View.VISIBLE);
binding.sumbitBt.setText(getString(R.string.next_txt));
binding.settingTitleBar.getTitleTextView().setText(getString(R.string.sfrz_txt));
if (TextUtils.isEmpty(passwordOld)) {
if (TextUtils.isEmpty(binding.passwordEditTextCode.getText().toString().trim())) {
// binding.sumbitBt.setBackgroundResource(com.netease.yunxin.kit.contactkit.ui.R.drawable.fun_themeblue_alpha70_btn_bg);
setSubmitBackground(false);
} else {
@@ -515,7 +535,7 @@ public class ChangePhoneActivity extends BaseActivity {
binding.sumbitBt.setText(getString(R.string.sure_txt));
binding.sendSmsTipsTv1.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt),
countryBean.getAreaCodeName() + " " + binding.phoneEt.getText().toString().trim())));
if (TextUtils.isEmpty(passwordNew)) {
if (TextUtils.isEmpty(binding.passwordEditTextCode1.getText().toString().trim())) {
setSubmitBackground(false);
// binding.sumbitBt.setBackgroundResource(com.netease.yunxin.kit.contactkit.ui.R.drawable.fun_themeblue_alpha70_btn_bg);
} else {

42
app/src/main/java/com/hbl/lewan/main/mine/CloseAccountActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/CloseAccountActivity.java
View File

@@ -2,11 +2,12 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
@@ -22,25 +23,25 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityChongzhiBinding;
import com.hbl.lewan.databinding.ActivityCloseAccountBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.ActionConfirmDialog1;
import com.hbl.lewan.login.LoginActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityChongzhiBinding;
import com.hbl.yuliao.databinding.ActivityCloseAccountBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.ActionConfirmDialog1;
import com.hbl.yuliao.login.LoginActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
@@ -83,6 +84,7 @@ public class CloseAccountActivity extends BaseActivity {
bindInfo(IMKitClient.account());
closeAccountBinding.sendSmsTv.setPaintFlags(closeAccountBinding.sendSmsTv.getPaintFlags()| Paint.UNDERLINE_TEXT_FLAG);
closeAccountBinding.sendSmsTv.setOnClickListener(v -> {
toStep2();
});

24
app/src/main/java/com/hbl/lewan/main/mine/EditFriendUserInfoActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/EditFriendUserInfoActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.Context;
import android.content.Intent;
@@ -28,17 +28,17 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityEditFriendnicknameBinding;
import com.hbl.lewan.databinding.ActivityEditNicknameBinding;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityEditFriendnicknameBinding;
import com.hbl.yuliao.databinding.ActivityEditNicknameBinding;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.FriendService;
import com.netease.nimlib.sdk.friend.constant.FriendFieldEnum;

93
app/src/main/java/com/hbl/lewan/main/mine/EditUserInfoActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/EditUserInfoActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.Context;
import android.content.Intent;
@@ -26,14 +26,14 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityEditNicknameBinding;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.Constant;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityEditNicknameBinding;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.Constant;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastUtils;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
@@ -81,6 +81,9 @@ public class EditUserInfoActivity extends BaseActivity {
} else {
Map<UserField, Object> map = new HashMap<>(1);
String result = binding.etNickname.getText().toString();
if(userField == UserField.Signature){
result = binding.etNickname1.getText().toString();
}
if (userField == UserField.Name && TextUtils.isEmpty(result)) {
result = userInfo.getAccount();
}
@@ -134,25 +137,53 @@ public class EditUserInfoActivity extends BaseActivity {
public void onTextChanged(CharSequence s, int start, int before, int count) {
if (userField == UserField.Name) {
if (TextUtils.isEmpty(binding.etNickname.getText().toString().trim())) {
binding.numberTv.setText("0/15");
binding.numberTv.setText("0/20");
changeDone(false);
} else {
binding.numberTv.setText((binding.etNickname.getText().toString().trim().length()) + "/15");
binding.numberTv.setText((binding.etNickname.getText().toString().trim().length()) + "/20");
changeDone(true);
}
} else {
}
}
@Override
public void afterTextChanged(Editable s) {
// if (TextUtils.isEmpty(String.valueOf(s))) {
// binding.ivClear.setVisibility(View.GONE);
// binding.tvDone.setEnabled(false);
// binding.tvDone.setAlpha(0.5f);
// } else {
// binding.ivClear.setVisibility(View.VISIBLE);
// binding.tvDone.setEnabled(true);
// binding.tvDone.setAlpha(1f);
// }
}
});
binding.etNickname1.addTextChangedListener(
new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
if (userField == UserField.Signature) {
if (TextUtils.isEmpty(binding.etNickname.getText().toString().trim())) {
if (TextUtils.isEmpty(binding.etNickname1.getText().toString().trim())) {
binding.numberTv.setText("0/50");
changeDone(false);
} else {
binding.numberTv.setText((binding.etNickname.getText().toString().trim().length()) + "/50");
binding.numberTv.setText((binding.etNickname1.getText().toString().trim().length()) + "/50");
changeDone(true);
}
}
}
}
@@ -267,33 +298,51 @@ public class EditUserInfoActivity extends BaseActivity {
if (TextUtils.equals(Constant.EDIT_NAME, editType)) {
remoteInfo = userInfo.getName();
userField = UserField.Name;
binding.etNickname.setFilters(new InputFilter[]{new InputFilter.LengthFilter(15)});
binding.etNickname.setFilters(new InputFilter[]{new InputFilter.LengthFilter(20)});
binding.tvTitle.setText(R.string.user_info_nickname);
binding.etNickname.setText(remoteInfo);
if (!TextUtils.isEmpty(remoteInfo)) {
binding.etNickname.setSelection(remoteInfo.length()>20?20:remoteInfo.length());
}
} else if (TextUtils.equals(Constant.EDIT_SIGN, editType)) {
remoteInfo = userInfo.getSignature();
userField = UserField.Signature;
binding.etNickname.setHint(getString(R.string.qsrmz_hint_txt1));
binding.etNickname.setFilters(new InputFilter[]{new InputFilter.LengthFilter(50)});
binding.etNickname1.setHint(getString(R.string.qsrmz_hint_txt1));
binding.etNickname1.setFilters(new InputFilter[]{new InputFilter.LengthFilter(50)});
binding.tvTitle.setText(R.string.user_info_sign);
binding.titleLeftName.setText(R.string.user_info_sign);
binding.etNicknames1.setVisibility(View.GONE);
binding.etNicknames2.setVisibility(View.VISIBLE);
binding.etNickname1.setText(remoteInfo);
if (!TextUtils.isEmpty(remoteInfo)) {
binding.etNickname1.setSelection(remoteInfo.length());
}
} else if (TextUtils.equals(Constant.EDIT_EMAIL, editType)) {
remoteInfo = userInfo.getEmail();
userField = UserField.Email;
binding.etNickname.setFilters(new InputFilter[]{new InputFilter.LengthFilter(30)});
binding.etNickname.setInputType(InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
binding.tvTitle.setText(R.string.user_info_email);
binding.etNickname.setText(remoteInfo);
if (!TextUtils.isEmpty(remoteInfo)) {
binding.etNickname.setSelection(remoteInfo.length());
}
} else if (TextUtils.equals(Constant.EDIT_PHONE, editType)) {
remoteInfo = userInfo.getMobile();
userField = UserField.Mobile;
binding.etNickname.setFilters(new InputFilter[]{new InputFilter.LengthFilter(11)});
binding.etNickname.setInputType(InputType.TYPE_CLASS_PHONE);
binding.tvTitle.setText(R.string.user_info_phone);
binding.etNickname.setText(remoteInfo);
if (!TextUtils.isEmpty(remoteInfo)) {
binding.etNickname.setSelection(remoteInfo.length());
}
}
binding.etNickname.setText(remoteInfo);
if (!TextUtils.isEmpty(remoteInfo)) {
binding.etNickname.setSelection(remoteInfo.length());
}
}
public static void launch(

22
app/src/main/java/com/hbl/lewan/main/mine/FriendPermissionsActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/FriendPermissionsActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.os.Bundle;
import android.text.TextUtils;
@@ -7,17 +7,17 @@ import android.view.View;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.SwitchCompat;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.databinding.FriendPermissionsActivityBinding;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.databinding.FriendPermissionsActivityBinding;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

36
app/src/main/java/com/hbl/lewan/main/mine/Help1Activity.java → app/src/main/java/com/hbl/yuliao/main/mine/Help1Activity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.Intent;
import android.os.Bundle;
@@ -21,25 +21,25 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.hbl.lewan.BuildConfig;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.BuildConfig;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityHelpBinding;
import com.hbl.lewan.databinding.ActivityMineSettingBinding;
import com.hbl.lewan.main.mine.setting.SettingViewModel;
import com.hbl.lewan.model.QuesBean;
import com.hbl.lewan.model.QuesListBean;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityHelpBinding;
import com.hbl.yuliao.databinding.ActivityMineSettingBinding;
import com.hbl.yuliao.main.mine.setting.SettingViewModel;
import com.hbl.yuliao.model.QuesBean;
import com.hbl.yuliao.model.QuesListBean;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;

22
app/src/main/java/com/hbl/lewan/main/mine/HelpActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/HelpActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.os.Bundle;
import android.view.MotionEvent;
@@ -14,17 +14,17 @@ import androidx.appcompat.widget.LinearLayoutCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.R;
import com.hbl.yuliao.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityGelpBinding;
import com.hbl.lewan.databinding.ActivityHelpBinding;
import com.hbl.lewan.model.QuesBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityGelpBinding;
import com.hbl.yuliao.databinding.ActivityHelpBinding;
import com.hbl.yuliao.model.QuesBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import java.util.ArrayList;

134
app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java → app/src/main/java/com/hbl/yuliao/main/mine/MineFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.app.Activity;
import android.content.Intent;
@@ -25,43 +25,43 @@ import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.app.ActivityOptionsCompat;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.about.AboutActivity;
import com.hbl.lewan.databinding.FragmentMineBinding;
import com.hbl.lewan.databinding.FragmentMineNewBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.VersionDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.login.PhoneLoginActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.mine.photo.UserPhotoListActivity;
import com.hbl.lewan.main.mine.setting.SettingActivity;
import com.hbl.lewan.main.mine.setting.SettingNotifyActivity;
import com.hbl.lewan.model.AccountsBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.VersionBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.pay.PaymentActivity;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.GiftInfoActivity;
import com.hbl.lewan.wallet.MyWalletActivity;
import com.hbl.lewan.wallet.PaySettingActivity;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.lewan.wallet.ShiMingActivity;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.about.AboutActivity;
import com.hbl.yuliao.databinding.FragmentMineBinding;
import com.hbl.yuliao.databinding.FragmentMineNewBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.VersionDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.login.PhoneLoginActivity;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.mine.photo.UserPhotoListActivity;
import com.hbl.yuliao.main.mine.setting.SettingActivity;
import com.hbl.yuliao.main.mine.setting.SettingNotifyActivity;
import com.hbl.yuliao.model.AccountsBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.VersionBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.pay.PaymentActivity;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.GiftInfoActivity;
import com.hbl.yuliao.wallet.MyWalletActivity;
import com.hbl.yuliao.wallet.PaySettingActivity;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.wallet.ShiMingActivity;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.hbl.yuliao.welcome.WelcomeActivity;
//import com.king.app.updater.AppUpdater;
import com.king.app.updater.AppUpdater;
import com.netease.yunxin.kit.alog.ALog;
@@ -83,7 +83,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.hbl.lewan.dialog.SelectLanguageDialog;
import com.hbl.yuliao.dialog.SelectLanguageDialog;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
@@ -144,14 +144,14 @@ public class MineFragment extends BaseFragment {
startActivity(new Intent(getActivity(), UserPhotoListActivity.class).putExtra("userId", IMKitClient.account()));
});
binding.jinbiTv.setOnClickListener(v -> {
toWalletInfo(true);
});
binding.jinbiTv1.setOnClickListener(v -> {
toWalletInfo(true);
});
// binding.jinbiTv.setOnClickListener(v -> {
// toWalletInfo(true);
//
// });
// binding.jinbiTv1.setOnClickListener(v -> {
// toWalletInfo(true);
//
// });
binding.yinbiTv.setOnClickListener(v -> {
toWalletInfo(false);
@@ -160,14 +160,14 @@ public class MineFragment extends BaseFragment {
toWalletInfo(false);
});
binding.tongbiTv.setOnClickListener(v -> {
toTongBi();
});
binding.tongbiTv1.setOnClickListener(v -> {
toTongBi();
});
// binding.tongbiTv.setOnClickListener(v -> {
// toTongBi();
//
// });
// binding.tongbiTv1.setOnClickListener(v -> {
// toTongBi();
//
// });
binding.tvName.setOnClickListener(
v -> {
@@ -255,15 +255,15 @@ public class MineFragment extends BaseFragment {
actionConfirmDialog.show();
});
binding.tvChange.setOnClickListener(v -> {
if (bindBean != null) {
// if (!bindBean.getPayPasswordSet()) {
// showDialogPay();
// } else {
checkAccounts();
// }
}
});
// binding.tvChange.setOnClickListener(v -> {
// if (bindBean != null) {
//// if (!bindBean.getPayPasswordSet()) {
//// showDialogPay();
//// } else {
// checkAccounts();
//// }
// }
// });
binding.friendTv.setOnClickListener(v ->
XKitRouter.withKey(RouterConstant.PATH_FUN_MY_BLACK_PAGE)
@@ -401,7 +401,7 @@ public class MineFragment extends BaseFragment {
private void getVersion() {
try {
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86") ? 7 : 0, DataUtils.getVersionCode(getActivity()), com.netease.yunxin.kit.chatkit.ui.network.ApiService.SUBSTATIONID1)
Api.getInstance().version(com.hbl.yuliao.network.ApiService.AREA_CODE.equals("+86") ? 7 : 0, DataUtils.getVersionCode(getActivity()), com.netease.yunxin.kit.chatkit.ui.network.ApiService.SUBSTATIONID1)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@@ -598,9 +598,9 @@ public class MineFragment extends BaseFragment {
private void changeInfo() {
if (walletBean != null) {
binding.jinbiTv.setText(AppUtils.getQian(walletBean.getGoldCoin()));
// binding.jinbiTv.setText(AppUtils.getQian(walletBean.getGoldCoin()));
binding.yinbiTv.setText(AppUtils.getQian(walletBean.getGoldCoin()));
binding.tongbiTv.setText(AppUtils.getQian(walletBean.getGiftCoin() * 100));
// binding.tongbiTv.setText(AppUtils.getQian(walletBean.getGiftCoin() * 100));
}
}

16
app/src/main/java/com/hbl/lewan/main/mine/MineFragmentBf.java → app/src/main/java/com/hbl/yuliao/main/mine/MineFragmentBf.java
View File

@@ -2,7 +2,7 @@
//// Use of this source code is governed by a MIT license that can be
//// found in the LICENSE file.
//
//package com.hbl.lewan.main.mine;
//package com.hbl.yuliao.main.mine;
//
//import android.app.Activity;
//import android.content.Intent;
@@ -21,13 +21,13 @@
//import androidx.annotation.Nullable;
//import androidx.core.app.ActivityOptionsCompat;
//
//import com.hbl.lewan.AppSkinConfig;
//import com.hbl.lewan.R;
//import com.hbl.lewan.about.AboutActivity;
//import com.hbl.lewan.databinding.FragmentMineBinding;
//import com.hbl.lewan.main.mine.setting.SettingActivity;
//import com.hbl.lewan.utils.Constant;
//import com.hbl.lewan.utils.LogUtils;
//import com.hbl.yuliao.AppSkinConfig;
//import com.hbl.yuliao.R;
//import com.hbl.yuliao.about.AboutActivity;
//import com.hbl.yuliao.databinding.FragmentMineBinding;
//import com.hbl.yuliao.main.mine.setting.SettingActivity;
//import com.hbl.yuliao.utils.Constant;
//import com.hbl.yuliao.utils.LogUtils;
//import com.netease.yunxin.kit.alog.ALog;
//import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
//import com.netease.yunxin.kit.common.ui.utils.AvatarColor;

10
app/src/main/java/com/hbl/lewan/main/mine/MineInfoActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/MineInfoActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.ClipData;
import android.content.ClipboardManager;
@@ -20,10 +20,10 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.netease.nimlib.sdk.uinfo.constant.GenderEnum;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityMineInfoBinding;
import com.hbl.lewan.utils.Constant;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityMineInfoBinding;
import com.hbl.yuliao.utils.Constant;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.photo.BasePhotoChoiceDialog;
import com.netease.yunxin.kit.common.ui.photo.PhotoChoiceDialog;

42
app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/SettingAccoutIdActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.res.ColorStateList;
import android.os.Build;
@@ -20,18 +20,18 @@ import android.widget.Toast;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.databinding.ActivityHeadUserEditBinding;
import com.hbl.lewan.databinding.ActivitySetAccoutIdBinding;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.databinding.ActivityHeadUserEditBinding;
import com.hbl.yuliao.databinding.ActivitySetAccoutIdBinding;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
@@ -229,14 +229,16 @@ public class SettingAccoutIdActivity extends BaseActivity {
@Override
public void onError(int code, String msg) {
binding.showErrorTv.setText(msg);
binding.showErrorTv.setVisibility(View.VISIBLE);
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
binding.showErrorTv.setVisibility(View.INVISIBLE);
}
}, 3000);
// binding.showErrorTv.setText(msg);
// binding.showErrorTv.setVisibility(View.VISIBLE);
// new Handler().postDelayed(new Runnable() {
// @Override
// public void run() {
// binding.showErrorTv.setVisibility(View.INVISIBLE);
// }
// }, 3000);
ToastX.showShortToast(msg);
}
});

10
app/src/main/java/com/hbl/lewan/main/mine/TypeSelectActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/TypeSelectActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.content.Context;
import android.content.Intent;
@@ -15,10 +15,10 @@ import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.content.res.AppCompatResources;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.TypeSelectActivityBinding;
import com.hbl.lewan.utils.Constant;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.TypeSelectActivityBinding;
import com.hbl.yuliao.utils.Constant;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.utils.SizeUtils;

24
app/src/main/java/com/hbl/lewan/main/mine/UnBindPhoneActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/UnBindPhoneActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.app.Activity;
import android.content.Intent;
@@ -13,18 +13,18 @@ import android.view.inputmethod.InputMethodManager;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.databinding.ActivityUnbindPhoneBinding;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.databinding.ActivityUnbindPhoneBinding;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

30
app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/UserHeadEditActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import static com.netease.yunxin.kit.chatkit.ui.common.ChatUserCache.getUserInfo;
@@ -39,20 +39,20 @@ import androidx.core.content.ContextCompat;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityHeadUserEditBinding;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.UserUpdateEvent;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.FileUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityHeadUserEditBinding;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.UserUpdateEvent;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.FileUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;

585
app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/UserInfoActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine;
package com.hbl.yuliao.main.mine;
import android.Manifest;
import android.app.Activity;
@@ -11,6 +11,7 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -45,46 +46,57 @@ import com.bumptech.glide.Glide;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.custom.CustomDatePickerNew;
import com.hbl.lewan.databinding.ActivityLocUserInfoBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.SelectSexDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.authorize.AuthorizeActivity;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionActivity;
import com.hbl.lewan.pay.PaymentActivity;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.CommonUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.QRCodeScheme;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.custom.CustomDatePickerNew;
import com.hbl.yuliao.databinding.ActivityLocUserInfoBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.SelectHeadDialog;
import com.hbl.yuliao.dialog.SelectSexDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.authorize.AuthorizeActivity;
import com.hbl.yuliao.main.index.add.AddFriendsActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.model.UserUpdateEvent;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionActivity;
import com.hbl.yuliao.pay.PaymentActivity;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.CommonUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.QRCodeScheme;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.hbl.yuliao.widget.CircleImageView;
import com.huawei.hms.hmsscankit.ScanUtilNew;
import com.huawei.hms.ml.scan.HmsScan;
import com.huawei.hms.ml.scan.HmsScanAnalyzerOptions;
import com.king.zxing.util.CodeUtils;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import com.luck.picture.lib.interfaces.OnResultCallbackListener;
import com.luck.picture.lib.style.BottomNavBarStyle;
import com.luck.picture.lib.style.PictureSelectorStyle;
import com.luck.picture.lib.style.SelectMainStyle;
import com.luck.picture.lib.style.TitleBarStyle;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.ResponseCode;
@@ -97,12 +109,16 @@ import com.netease.nimlib.sdk.uinfo.UserService;
import com.netease.nimlib.sdk.uinfo.constant.GenderEnum;
import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
import com.netease.yunxin.kit.chatkit.repo.ChatRepo;
import com.netease.yunxin.kit.chatkit.ui.common.GlideEngine;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
import com.netease.yunxin.kit.common.ui.photo.BasePhotoChoiceDialog;
import com.netease.yunxin.kit.common.ui.photo.PhotoChoiceDialog;
import com.netease.yunxin.kit.common.ui.photo.PhotoPicker;
import com.netease.yunxin.kit.common.ui.utils.AvatarColor;
import com.netease.yunxin.kit.common.ui.utils.CommonCallback;
import com.netease.yunxin.kit.common.ui.utils.Permission;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.CustomDatePicker;
@@ -112,6 +128,7 @@ import com.netease.yunxin.kit.common.utils.PermissionUtils;
import com.netease.yunxin.kit.common.utils.SizeUtils;
import com.netease.yunxin.kit.common.utils.UriUtils;
import com.netease.yunxin.kit.contactkit.ui.utils.ColorUtils;
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.model.UserField;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
@@ -121,18 +138,25 @@ import com.netease.yunxin.kit.corekit.im.repo.CommonRepo;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
import com.netease.yunxin.kit.teamkit.ui.fun.dialog.FunPhotoChoiceDialog;
import com.qiniu.android.storage.Configuration;
import com.qiniu.android.storage.UploadManager;
import com.qiniu.android.storage.UploadOptions;
import org.json.JSONException;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import cc.shinichi.library.ImagePreview;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class UserInfoActivity extends BaseActivity {
public class UserInfoActivity extends BaseActivity implements CommonCallback<File>{
private ActivityLocUserInfoBinding binding;
private ActivityResultLauncher<Intent> launcher;
private UserInfo userInfo;
@@ -141,16 +165,44 @@ public class UserInfoActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
getWindow().setDecorFitsSystemWindows(false);
} else {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
}
//SYSTEM_UI_FLAG_LAYOUT_STABLE
getWindow().setStatusBarColor(Color.TRANSPARENT);
super.onCreate(savedInstanceState);
binding = ActivityLocUserInfoBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
Window window = getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
window.setStatusBarColor(ContextCompat.getColor(this, R.color.color_white));
window.setNavigationBarColor(getResources().getColor(R.color.color_white));
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
binding.settingTitleBar.getBackImageView().setImageResource(R.mipmap.back_img1);
binding.settingTitleBar.getRightImageView().setImageResource(R.mipmap.user_more_img);
binding.settingTitleBar.setRightImageViewVisible(View.VISIBLE);
// Window window = getWindow();
// window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
// window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
// window.setStatusBarColor(ContextCompat.getColor(this, R.color.color_white));
// window.setNavigationBarColor(getResources().getColor(R.color.color_white));
// getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
binding.settingTitleBar.getRightImageView().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SelectHeadDialog selectHeadDialog = new SelectHeadDialog(UserInfoActivity.this);
selectHeadDialog.setOnToVipListener(type -> {
if(type == 0){
choicePhoto(false);
}else{
choicePhoto(true);
}
});
selectHeadDialog.show();
}
});
loginBean = DataUtils.getLocUserInfo();
launcher =
@@ -173,7 +225,31 @@ public class UserInfoActivity extends BaseActivity {
}
resultCode = result.getResultCode();
});
permissionLauncher2 =
registerForActivityResult(
new ActivityResultContracts.RequestMultiplePermissions(),
result -> {
if (result != null) {
for (Map.Entry<String, Boolean> entry : result.entrySet()) {
String permission = entry.getKey().toString();
boolean grant = (Boolean) entry.getValue();
if (grant) {
if (TextUtils.equals(
permission, Manifest.permission.READ_EXTERNAL_STORAGE) || TextUtils.equals(
permission, Manifest.permission.READ_MEDIA_IMAGES) || TextUtils.equals(
permission, Manifest.permission.READ_MEDIA_VIDEO)) {
startPickMedia(isBackageB);
}
} else {
if (shouldShowRequestPermissionRationale(permission)) {
ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_deny_tips));
} else {
ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage));
}
}
}
}
});
permissionLauncher =
registerForActivityResult(
new ActivityResultContracts.RequestMultiplePermissions(),
@@ -379,7 +455,7 @@ public class UserInfoActivity extends BaseActivity {
// break;
default:
if (scheme.startsWith("http")) {
if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("http://admin.yuliao666.top/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
// activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));
@@ -397,7 +473,7 @@ public class UserInfoActivity extends BaseActivity {
}
} else {
if (scheme.startsWith("http")) {
if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("http://admin.yuliao666.top/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
// activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));
@@ -741,6 +817,15 @@ public class UserInfoActivity extends BaseActivity {
actionConfirmDialog.show();
}
@Override
public void onBackPressed() {
if(binding.qrRy.getVisibility()==View.VISIBLE){
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}else {
super.onBackPressed();
}
}
private void initView() {
// binding.cavAvatar.setOnClickListener(v -> choicePhoto());
binding.settingTitleBar.setOnBackIconClickListener(v -> onBackPressed());
@@ -771,7 +856,12 @@ public class UserInfoActivity extends BaseActivity {
binding.ivAccountCopy.setOnClickListener(v -> copyAccount());
// binding.tvAccount.setOnClickListener(v -> copyAccount());
binding.cardView.setOnClickListener(v -> {
binding.forbgIv.setOnClickListener(v -> {
if(locUser !=null){
if(loginBean != null && loginBean.getUser() != null ){
loginBean.getUser().setPostHomepageBackground(locUser.getPostHomepageBackground());
}
}
if (loginBean != null && loginBean.getUser() != null && !TextUtils.isEmpty(loginBean.getUser().getPostHomepageBackground())) {
List<String> urls = new ArrayList<>();
String url = IMUIKitConfig.OSS_URL + loginBean.getUser().getPostHomepageBackground();
@@ -942,7 +1032,7 @@ public class UserInfoActivity extends BaseActivity {
changeStatusBarColor(R.color.fun_page_bg_color);
binding.clRoot.setBackgroundResource(R.color.fun_page_bg_color);
// binding.clRoot.setBackgroundResource(R.color.fun_page_bg_color);
binding.llUserInfo.setBackgroundResource(R.color.color_white);
ViewGroup.MarginLayoutParams layoutParamsN =
@@ -964,10 +1054,17 @@ public class UserInfoActivity extends BaseActivity {
loginBean = DataUtils.getLocUserInfo();
if (loginBean != null) {
if (!TextUtils.isEmpty(loginBean.getUser().getPostHomepageBackground())) {
if(locUser != null ){
loginBean.getUser().setPostHomepageBackground(locUser.getPostHomepageBackground());
}
String pram = loginBean.getUser().getPostHomepageBackground();
String url = IMUIKitConfig.OSS_URL + pram;
Glide.with(UserInfoActivity.this)
.load(url)
.placeholder(R.color.color_themepink)
.error(R.color.color_themepink)
.into(binding.forbgIv);
}
}
@@ -986,10 +1083,23 @@ public class UserInfoActivity extends BaseActivity {
@Override
public void onSuccess(Result<LoginBean> feedbackResp) {
locUser = feedbackResp.data;
loginBean.getUser().setPostHomepageBackground(locUser.getPostHomepageBackground());
if(feedbackResp.data.getUserType().equals("2")) {
binding.tvPhone.setText(locUser.getUser_mail());
}
changeIndex(feedbackResp.data);
DataUtils.set(UserInfoActivity.this, "login_bean", GsonUtils.beanToJSONString(loginBean));
String pram = locUser.getPostHomepageBackground();
String url = IMUIKitConfig.OSS_URL + pram;
Glide.with(UserInfoActivity.this)
.load(url)
.placeholder(R.color.color_themepink)
.error(R.color.color_themepink)
.into(binding.forbgIv);
}
@Override
@@ -1160,6 +1270,8 @@ public class UserInfoActivity extends BaseActivity {
userInfo.getAvatar(), "",
AvatarColor.avatarColor(IMKitClient.account()));
}
int cornerRadius = SizeUtils.dp2px(40);
binding.cavAvatar.setCornerRadius(cornerRadius);
binding.tvName.setText(userInfo.getName());
int sexualValue = R.string.sexual_unknown;
@@ -1270,15 +1382,17 @@ public class UserInfoActivity extends BaseActivity {
private TextView copyTv;
private TextView shareTv;
private TextView saveTv;
private TextView shuaxinTv;
// private TextView shuaxinTv;
private AppCompatButton saomiaoBt;
private CircleImageView userIv;
private TextView userTv;
@RequiresApi(api = Build.VERSION_CODES.M)
private void showQrcodeView() {
BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
// BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
View bottomView = LayoutInflater.from(UserInfoActivity.this).inflate(R.layout.bottom_sheet_qrcode_layout1, null);
userIv = (CircleImageView) bottomView.findViewById(R.id.user_iv);
userTv = (TextView) bottomView.findViewById(R.id.user_tv);
coloseIv = (ImageView) bottomView.findViewById(R.id.colose_iv);
qrcodeLy = (LinearLayout) bottomView.findViewById(R.id.qrcode_ly);
qrcodeIv = (ImageView) bottomView.findViewById(R.id.qrcode_iv);
@@ -1287,7 +1401,7 @@ public class UserInfoActivity extends BaseActivity {
copyTv = (TextView) bottomView.findViewById(R.id.copy_tv);
shareTv = (TextView) bottomView.findViewById(R.id.share_tv);
saveTv = (TextView) bottomView.findViewById(R.id.save_tv);
shuaxinTv = (TextView) bottomView.findViewById(R.id.shuaxin_tv);
// shuaxinTv = (TextView) bottomView.findViewById(R.id.shuaxin_tv);
saomiaoBt = (AppCompatButton) bottomView.findViewById(R.id.saomiao_bt);
LoginBean loginBean = DataUtils.getLocUserInfo();
Bitmap bitmap = CodeUtils.createQRCode(String.format(IMUIKitConfig.SHARE_INVCODE1, IMKitClient.account()), DataUtils.dip2px(this, 175.0f), null);
@@ -1298,16 +1412,20 @@ public class UserInfoActivity extends BaseActivity {
qrcodeIv.setImageBitmap(bitmap);
}
shuaxinTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ToastX.showShortToast(R.string.shuaxinchenggong_txt);
}
});
userTv.setText(loginBean.getNickname()+"");
Glide.with(UserInfoActivity.this).load(loginBean.getUserAvatarFileName()).into(userIv);
// shuaxinTv.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// ToastX.showShortToast(R.string.shuaxinchenggong_txt);
// }
// });
coloseIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomSheetDialog.dismiss();
// bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
});
saveTv.setOnClickListener(v -> {
@@ -1362,17 +1480,16 @@ public class UserInfoActivity extends BaseActivity {
saomiaoBt.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
toScan();
}
});
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
binding.qrRy.removeAllViews();
binding.qrRy.addView(bottomView);
binding.qrRy.setVisibility(View.VISIBLE);
}
@@ -1503,6 +1620,7 @@ public class UserInfoActivity extends BaseActivity {
protected ActivityResultLauncher<String[]> permissionLauncher;
protected ActivityResultLauncher<String[]> permissionLauncher1;
protected ActivityResultLauncher<String[]> permissionLauncher2;
private void requestCameraPermission() {
permissionLauncher.launch(new String[]{Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO});
@@ -1631,7 +1749,7 @@ public class UserInfoActivity extends BaseActivity {
private TextView groupNameTv;
private void showQrcodeView(String groupId) {
BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
// BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
View bottomView = LayoutInflater.from(UserInfoActivity.this).inflate(R.layout.bottom_sheet_join_group, null);
coloseIv1 = (ImageView) bottomView.findViewById(R.id.colose_iv);
@@ -1655,7 +1773,8 @@ public class UserInfoActivity extends BaseActivity {
}
joinTv.setOnClickListener(v -> {
if (team.isMyTeam()) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team)
.withContext(UserInfoActivity.this)
@@ -1669,7 +1788,8 @@ public class UserInfoActivity extends BaseActivity {
LogUtils.i("加入群聊成功4444444444444444444");
LogUtils.i("加入群聊成功：" + GsonUtils.beanToJSONString(team1));
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team1)
@@ -1681,21 +1801,25 @@ public class UserInfoActivity extends BaseActivity {
public void onFailed(int code) {
//仅仅是申请成功,code 808
if (code == ResponseCode.RES_TEAM_APPLY_SUCCESS) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.dendaiqueren_txt);
}
// 已经在群里，code 809
else if (code == ResponseCode.RES_TEAM_ALREADY_IN) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
getJoinInfo(groupId, true);
// 群人数已达上限
} else if (code == ResponseCode.RES_TEAM_LIMIT) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.team_num_limit);
} else {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast("failed, error code =" + code);
@@ -1705,7 +1829,8 @@ public class UserInfoActivity extends BaseActivity {
@Override
public void onException(Throwable exception) {
// error
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(exception.getMessage());
@@ -1735,22 +1860,26 @@ public class UserInfoActivity extends BaseActivity {
public void onFailed(int code) {
//仅仅是申请成功,code 808
if (code == ResponseCode.RES_TEAM_APPLY_SUCCESS) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.dendaiqueren_txt);
}
// 已经在群里，code 809
else if (code == ResponseCode.RES_TEAM_ALREADY_IN) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
getJoinInfo(groupId, true);
// 群人数已达上限
} else if (code == ResponseCode.RES_TEAM_LIMIT) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast(R.string.team_num_limit);
} else {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
ToastX.showShortToast("failed, error code =" + code);
@@ -1771,17 +1900,14 @@ public class UserInfoActivity extends BaseActivity {
coloseIv1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomSheetDialog.dismiss();
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
});
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
}
binding.qrRy.removeAllViews();
binding.qrRy.addView(bottomView);
binding.qrRy.setVisibility(View.VISIBLE);
}
@@ -1795,7 +1921,8 @@ public class UserInfoActivity extends BaseActivity {
groupNameTv.setText(result.getName());
} else {
LogUtils.i("加入群聊成功88888888888888");
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, result)
.withContext(UserInfoActivity.this)
@@ -1806,14 +1933,294 @@ public class UserInfoActivity extends BaseActivity {
@Override
public void onFailed(int code) {
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
@Override
public void onException(Throwable exception) {
binding.qrRy.removeAllViews();
binding.qrRy.setVisibility(View.GONE);
}
});
}
boolean isBackageB = false;
private void choicePhoto(boolean isBg) {
this.isBackageB = isBg;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
if (PermissionUtils.hasPermissions(
UserInfoActivity.this, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)) {
startPickMedia(isBg);
} else {
permissionLauncher2.launch(new String[]{Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO});
}
} else {
if (PermissionUtils.hasPermissions(
UserInfoActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
startPickMedia(isBg);
} else {
permissionLauncher2.launch(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE});
}
}
}
private void startPickMedia(boolean isBg) {
if (!isBg) {
PhotoPicker.getInstance().getAPhotoFromAlbumCropAndUpload(UserInfoActivity.this, this);
} else {
TitleBarStyle whiteTitleBarStyle = new TitleBarStyle();
whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
whiteTitleBarStyle.setTitleDrawableRightResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.ic_orange_arrow_down);
whiteTitleBarStyle.setTitleLeftBackResource(com.netease.yunxin.kit.common.ui.R.drawable.ic_back);
whiteTitleBarStyle.setTitleTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_black));
whiteTitleBarStyle.setTitleCancelTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
whiteTitleBarStyle.setDisplayTitleBarLine(true);
BottomNavBarStyle whiteBottomNavBarStyle = new BottomNavBarStyle();
// whiteBottomNavBarStyle.setBottomPreviewSelectText(getResources().getString(R.string.chat_team_ait_all));
whiteBottomNavBarStyle.setBottomNarBarBackgroundColor(Color.parseColor("#FFFFFF"));
whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
whiteBottomNavBarStyle.setBottomPreviewNormalTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
whiteBottomNavBarStyle.setCompleteCountTips(false);
whiteBottomNavBarStyle.setBottomEditorTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
whiteBottomNavBarStyle.setBottomOriginalTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
SelectMainStyle selectMainStyle = new SelectMainStyle();
selectMainStyle.setStatusBarColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
selectMainStyle.setDarkStatusBarBlack(true);
selectMainStyle.setSelectNormalTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
selectMainStyle.setSelectTextColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
selectMainStyle.setPreviewSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_demo_white_preview_selector);
selectMainStyle.setSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_checkbox_selector);
// selectMainStyle.setSelectText(R.string.ps_done_front_num);
selectMainStyle.setMainListBackgroundColor(ContextCompat.getColor(UserInfoActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
PictureSelectorStyle selectorStyle = new PictureSelectorStyle();
selectorStyle.setTitleBarStyle(whiteTitleBarStyle);
selectorStyle.setBottomBarStyle(whiteBottomNavBarStyle);
selectorStyle.setSelectMainStyle(selectMainStyle);
PictureSelector.create(this)
.openGallery(SelectMimeType.ofImage())
.setImageEngine(GlideEngine.createGlideEngine())
.setMaxSelectNum(1)
// .setMaxVideoSelectNum(9)
.setSelectorUIStyle(selectorStyle)
.forResult(new OnResultCallbackListener<LocalMedia>() {
@Override
public void onResult(ArrayList<LocalMedia> result) {
for (int i = 0; i < result.size(); ++i) {
// Uri uri = Uri.parse(result.get(i).getAvailablePath());
LogUtils.i("地址是啥：" + result.get(i).getRealPath());
File file = new File(result.get(i).getRealPath());
toUpdateBg(file, false);
}
}
@Override
public void onCancel() {
}
});
}
}
//
// @Override
// public void onException(@Nullable Throwable throwable) {
//
// }
//
// @Override
// public void onFailed(int i) {
//
// }
//
// @Override
// public void onSuccess(@Nullable File file) {
// if (!isBackageB) {
//// toUpdate(file);
// toUpdateBg(file, true);
// } else {
// toUpdateBg(file, false);
// }
// }
private void toUpdateBg(File file, boolean isHead) {
if (!isHead) {
Glide.with(UserInfoActivity.this)
.load(file.getAbsolutePath())
.into(binding.forbgIv);
} else {
// Glide.with(UserHeadEditActivity.this)
// .load(file.getAbsolutePath())
// .into(binding.cavAvatar);
ColorUtils.loadAvator(file.getAbsolutePath(), binding.cavAvatar);
// binding.cavAvatar.setData(
// file.getAbsolutePath(),
// userInfo.getName() == null ? "" : userInfo.getName(),
// AvatarColor.avatarColor(IMKitClient.account()));
}
toShangchuanAli(file, isHead);
}
String stsCredentialsBean;
private void toShangchuanAli(File file, boolean isHead) {
showLoadingDialog(isHead?"正在上传头像":"正在上传背景图");
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<String> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
// toAliYunOss(file, isHead);
toQIiNiuYunOss(file, isHead);
}
@Override
public void onError(int code, String msg) {
dimessLoadingDialog();
}
});
}
public LoadingDialog loadingDialog;
public void showLoadingDialog() {
if (loadingDialog == null)
loadingDialog = new LoadingDialog(this);
loadingDialog.show();
}
public void showLoadingDialog(String msg) {
if (loadingDialog == null)
loadingDialog = new LoadingDialog(this);
loadingDialog.setLoadingText(msg);
loadingDialog.show();
}
public void dimessLoadingDialog() {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
private void toQIiNiuYunOss(File file, boolean isHead) {
String updatePathPic = "postHomepageBackground";
String updatePathPicHead = "userAvatarFileName";
UploadOptions options = new UploadOptions(null, null, true,
(key, percent) -> {
}, () -> {
return false;
});
Configuration configuration = new Configuration.Builder()
.build();
UploadManager uploadManager = new UploadManager(configuration);
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath());
String files = "media/" + updatePathPic + "/" + fileName;
if (isHead) {
files = "media/" + updatePathPicHead + "/" + fileName;
}
uploadManager.put(file, files, stsCredentialsBean, (key, info, response) -> {
dimessLoadingDialog();
if (info != null && info.isOK()) {
// 上传成功
try {
if (isHead) {
toPush(IMUIKitConfig.OSS_URL + response.getString("key"), isHead);
} else {
toPush(response.getString("key"), isHead);
}
} catch (JSONException e) {
throw new RuntimeException(e);
}
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
ToastX.showShortToast(info.error);
}
}, options);
}
private void toPush(String fileName, boolean isHead) {
Map<String, Object> maps = new HashMap<>();
if (isHead) {
maps.put("userAvatarFileName", fileName);
} else {
maps.put("postHomepageBackground", fileName);
}
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
Api.getInstance().authUser(IMKitClient.account(), maps)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result feedbackResp) {
dimessLoadingDialog();
getUserInfo(IMKitClient.account());
loadData(IMKitClient.account());
if (isHead) {
EventCenter.notifyEvent(new UserUpdateEvent());
}
}
@Override
public void onError(int code, String msg) {
dimessLoadingDialog();
ToastX.showShortToast(msg);
}
});
}
@Override
public void onException(@Nullable Throwable throwable) {
}
@Override
public void onFailed(int i) {
}
@Override
public void onSuccess(@Nullable File file) {
if (!isBackageB) {
toUpdateBg(file, true);
} else {
toUpdateBg(file, false);
}
}
}

36
app/src/main/java/com/hbl/lewan/main/mine/photo/AddPhotoActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/photo/AddPhotoActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine.photo;
package com.hbl.yuliao.main.mine.photo;
import android.Manifest;
import android.content.res.ColorStateList;
@@ -30,23 +30,23 @@ import androidx.recyclerview.widget.RecyclerView;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityAddphotosBinding;
import com.hbl.lewan.dialog.SelectPhotoTypeDialog;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ItemDragTouchHelperCallback;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityAddphotosBinding;
import com.hbl.yuliao.dialog.SelectPhotoTypeDialog;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.ItemDragTouchHelperCallback;
import com.hbl.yuliao.utils.LogUtils;
import com.google.gson.Gson;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;

36
app/src/main/java/com/hbl/lewan/main/mine/photo/EditPhotoActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/photo/EditPhotoActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine.photo;
package com.hbl.yuliao.main.mine.photo;
import android.Manifest;
import android.content.Intent;
@@ -32,23 +32,23 @@ import androidx.recyclerview.widget.RecyclerView;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityAddphotosBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.SelectPhotoTypeDialog;
import com.hbl.lewan.event.UserAlbumsUpdateEvent;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.CharInputFilter;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityAddphotosBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.SelectPhotoTypeDialog;
import com.hbl.yuliao.event.UserAlbumsUpdateEvent;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.CharInputFilter;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.event.EventCenter;

58
app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoDetailsActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/photo/UserPhotoDetailsActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine.photo;
package com.hbl.yuliao.main.mine.photo;
import android.Manifest;
import android.app.Activity;
@@ -39,34 +39,34 @@ import androidx.recyclerview.widget.RecyclerView;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityUserphotosBinding;
import com.hbl.lewan.databinding.ActivityUserphotosDetailsBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.ActionInputConfirmDialog;
import com.hbl.lewan.dialog.SelectPhotosMoveDialog;
import com.hbl.lewan.event.UserAlbumsUpdateEvent;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.AlbumItemBean;
import com.hbl.lewan.model.HisChatShowBean;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.voom.TiktokActivity;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityUserphotosBinding;
import com.hbl.yuliao.databinding.ActivityUserphotosDetailsBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.ActionInputConfirmDialog;
import com.hbl.yuliao.dialog.SelectPhotosMoveDialog;
import com.hbl.yuliao.event.UserAlbumsUpdateEvent;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.AlbumItemBean;
import com.hbl.yuliao.model.HisChatShowBean;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.voom.TiktokActivity;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.hbl.yuliao.widget.CircleImageView;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;

58
app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoListActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/photo/UserPhotoListActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine.photo;
package com.hbl.yuliao.main.mine.photo;
import android.Manifest;
import android.content.Intent;
@@ -37,35 +37,35 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityUserphotosBinding;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityUserphotosBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.ActionInputConfirmDialog;
import com.hbl.lewan.dialog.SelectPhotoTypeDialog;
import com.hbl.lewan.event.UserAlbumsUpdateEvent;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ItemDragTouchHelperCallback;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.PushActivity;
import com.hbl.lewan.voom.TiktokActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.lewan.widget.GridItemDecoration;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.ActionInputConfirmDialog;
import com.hbl.yuliao.dialog.SelectPhotoTypeDialog;
import com.hbl.yuliao.event.UserAlbumsUpdateEvent;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.ItemDragTouchHelperCallback;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.PushActivity;
import com.hbl.yuliao.voom.TiktokActivity;
import com.hbl.yuliao.widget.CircleImageView;
import com.hbl.yuliao.widget.GridItemDecoration;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;

36
app/src/main/java/com/hbl/lewan/main/mine/photo/UserSelectPhotoActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/photo/UserSelectPhotoActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine.photo;
package com.hbl.yuliao.main.mine.photo;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_ICON;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_NAME;
@@ -31,23 +31,23 @@ import androidx.recyclerview.widget.RecyclerView;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityUserphotosDetailsBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.AlbumItemBean;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityUserphotosDetailsBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.model.AlbumItemBean;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;

48
app/src/main/java/com/hbl/lewan/main/mine/photo/WatchImagesActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/photo/WatchImagesActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.main.mine.photo;
package com.hbl.yuliao.main.mine.photo;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -31,25 +31,25 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityWatchPhotosBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.event.UserAlbumsUpdateEvent;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.model.AlbumItemBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityWatchPhotosBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.event.UserAlbumsUpdateEvent;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.AlbumItemBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.hbl.yuliao.widget.CircleImageView;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.luck.picture.lib.photoview.PhotoView;
import com.netease.nim.highavailable.LogUtils;
@@ -381,7 +381,7 @@ public class WatchImagesActivity extends LllChatBaseActivity {
// s.getTeamInfo().getIcon(), s.getTeamInfo().getName(), AvatarColor.avatarColor(s.getTeamInfo().getId()));
holder.setText(R.id.title_tv, s.getTeamInfo().getName());
} else {
com.hbl.lewan.utils.LogUtils.i("用户信息：" + GsonUtils.beanToJSONString(s.getFriendInfo()));
com.hbl.yuliao.utils.LogUtils.i("用户信息：" + GsonUtils.beanToJSONString(s.getFriendInfo()));
FriendInfo friendInfo = s.getFriendInfo();
NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(friendInfo.getAccount());
@@ -402,7 +402,7 @@ public class WatchImagesActivity extends LllChatBaseActivity {
holder.getView(R.id.big_bg).setOnClickListener(v -> {
titleUsersIsCheck.set(index, !titleUsersIsCheck.get(index));
commonAdapter.notifyItemChanged(index, titleUsersIsCheck.get(index));
com.hbl.lewan.utils.LogUtils.i("0000000000");
com.hbl.yuliao.utils.LogUtils.i("0000000000");
changeItemButton();
});
@@ -412,7 +412,7 @@ public class WatchImagesActivity extends LllChatBaseActivity {
}
private void changeItemButton() {
com.hbl.lewan.utils.LogUtils.i("1111111111111111");
com.hbl.yuliao.utils.LogUtils.i("1111111111111111");
boolean isSelcet = false;
for (boolean item : titleUsersIsCheck) {
if (item) {
@@ -425,7 +425,7 @@ public class WatchImagesActivity extends LllChatBaseActivity {
}
private void chagnBottom(boolean b) {
com.hbl.lewan.utils.LogUtils.i("22222222222:" + b);
com.hbl.yuliao.utils.LogUtils.i("22222222222:" + b);
if (b) {
shareBt.setBackground(getResources().getDrawable(R.drawable.button_true_bg));

8
app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/ClearCacheActivity.java
View File

@@ -2,14 +2,14 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityClearCacheBinding;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityClearCacheBinding;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.ui.viewmodel.LoadStatus;

2
app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheViewModel.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/ClearCacheViewModel.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import androidx.annotation.Nullable;
import androidx.lifecycle.MutableLiveData;

18
app/src/main/java/com/hbl/lewan/main/mine/setting/SettingActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import android.content.Intent;
import android.os.Bundle;
@@ -14,14 +14,14 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityMineSettingBinding;
import com.hbl.lewan.login.LoginActivity;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityMineSettingBinding;
import com.hbl.yuliao.login.LoginActivity;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.yunxin.kit.chatkit.ui.custom.ChatConfigManager;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.utils.SizeUtils;

20
app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNewActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNewActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import android.content.Intent;
import android.os.Bundle;
@@ -15,15 +15,15 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityMineSettingBinding;
import com.hbl.lewan.databinding.ActivitySettingBinding;
import com.hbl.lewan.main.mine.MineFragment;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityMineSettingBinding;
import com.hbl.yuliao.databinding.ActivitySettingBinding;
import com.hbl.yuliao.main.mine.MineFragment;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
//import com.google.android.gms.maps.CameraUpdateFactory;
//import com.google.android.gms.maps.GoogleMap;
//import com.google.android.gms.maps.MapFragment;

14
app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import android.app.Service;
import android.content.Intent;
@@ -17,10 +17,10 @@ import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.lifecycle.ViewModelProvider;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityMineSettingNotifyBinding;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityMineSettingNotifyBinding;
import com.hbl.yuliao.utils.GsonUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.viewmodel.LoadStatus;
import com.netease.yunxin.kit.common.utils.SizeUtils;
@@ -34,8 +34,8 @@ public class SettingNotifyActivity extends BaseActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
changeStatusBarColor(R.color.color_f7f7f7);
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_f7f7f7));
// changeStatusBarColor(R.color.color_f7f7f7);
// getWindow().setNavigationBarColor(getResources().getColor(R.color.color_f7f7f7));
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR|View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
// String extension = IMKitClient.getUserInfo().getExtension();

24
app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyRingActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyRingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import android.content.Context;
import android.media.AudioManager;
@@ -17,14 +17,14 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityRingSetBinding;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityRingSetBinding;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.netease.yunxin.kit.chatkit.ui.model.IMUserExtension;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -48,8 +48,8 @@ public class SettingNotifyRingActivity extends BaseActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
changeStatusBarColor(R.color.color_f7f7f7);
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_f7f7f7));
// changeStatusBarColor(R.color.color_f7f7f7);
// getWindow().setNavigationBarColor(getResources().getColor(R.color.color_f7f7f7));
super.onCreate(savedInstanceState);
viewBinding = ActivityRingSetBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
@@ -153,7 +153,7 @@ public class SettingNotifyRingActivity extends BaseActivity {
public void playRing(String name) {
try {
//用于获取手机 默认提示音（RingtoneManager.TYPE_NOTIFICATION） 的Uri
Uri ringUri = Uri.parse("android.resource://com.hbl.lewan/raw/" + name);
Uri ringUri = Uri.parse("android.resource://com.hbl.yuliao/raw/" + name);
if (mMediaPlayer == null) {
mMediaPlayer = new MediaPlayer();
}

6
app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyViewModel.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyViewModel.java
View File

@@ -2,12 +2,12 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import androidx.annotation.Nullable;
import androidx.lifecycle.MutableLiveData;
import com.hbl.lewan.R;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.ui.viewmodel.BaseViewModel;
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;

2
app/src/main/java/com/hbl/lewan/main/mine/setting/SettingViewModel.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingViewModel.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import com.netease.yunxin.kit.common.ui.viewmodel.BaseViewModel;
import com.netease.yunxin.kit.corekit.im.repo.SettingRepo;

10
app/src/main/java/com/hbl/lewan/main/mine/setting/SkinActivity.java → app/src/main/java/com/hbl/yuliao/main/mine/setting/SkinActivity.java
View File

@@ -2,14 +2,14 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.main.mine.setting;
package com.hbl.yuliao.main.mine.setting;
import android.os.Bundle;
import androidx.annotation.Nullable;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivitySkinSettingBinding;
import com.hbl.lewan.main.MainActivity;
import com.hbl.yuliao.AppSkinConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivitySkinSettingBinding;
import com.hbl.yuliao.main.MainActivity;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.corekit.event.EventCenter;

40
app/src/main/java/com/hbl/lewan/map/LocationPageActivity1.java → app/src/main/java/com/hbl/yuliao/map/LocationPageActivity1.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.map;
package com.hbl.yuliao.map;
import static com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant.LIB_TAG;
@@ -42,23 +42,23 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.bumptech.glide.Glide;
import com.hbl.lewan.BuildConfig;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityLocation1Binding;
import com.hbl.lewan.model.AdBean;
import com.hbl.lewan.model.BillBean;
import com.hbl.lewan.model.NearbySearchBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.BaseObserverNew;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.network.ResultNew;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.KeyboardUtil;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.BuildConfig;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityLocation1Binding;
import com.hbl.yuliao.model.AdBean;
import com.hbl.yuliao.model.BillBean;
import com.hbl.yuliao.model.NearbySearchBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.BaseObserverNew;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.network.ResultNew;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.api.GoogleApiClient;
//import com.google.android.gms.location.LocationRequest;
@@ -144,7 +144,7 @@ public class LocationPageActivity1 extends BaseActivity implements GoogleApiClie
// MapFragment mapFragment = (MapFragment) getFragmentManager()
// .findFragmentById(com.hbl.lewan.R.id.mapview);
// .findFragmentById(com.hbl.yuliao.R.id.mapview);
// mapFragment.getMapAsync(LocationPageActivity1.this);
binding.mapViewCancel.setOnClickListener(v -> finish());
binding.mapDetailBack.setOnClickListener(v -> finish());
@@ -467,7 +467,7 @@ public class LocationPageActivity1 extends BaseActivity implements GoogleApiClie
// mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 13));
// }
// LogUtils.i("地点是啥："+location.getLongitude()+";"+location.getLatitude()+";"+ GsonUtils.beanToJSONString(location));
// Api.getInstance().nearbysearch(location.getLatitude()+","+location.getLongitude(),"10000","","true",getString(com.hbl.lewan.R.string.google_map_key))
// Api.getInstance().nearbysearch(location.getLatitude()+","+location.getLongitude(),"10000","","true",getString(com.hbl.yuliao.R.string.google_map_key))
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result>() {

2
app/src/main/java/com/hbl/lewan/model/AccountsBean.java → app/src/main/java/com/hbl/yuliao/model/AccountsBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
/**
* **********************

2
app/src/main/java/com/hbl/lewan/model/ActivityMsgBean.java → app/src/main/java/com/hbl/yuliao/model/ActivityMsgBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/AdBean.java → app/src/main/java/com/hbl/yuliao/model/AdBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class AdBean {

2
app/src/main/java/com/hbl/lewan/model/AddFriendBean.java → app/src/main/java/com/hbl/yuliao/model/AddFriendBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class AddFriendBean {
public String user_uid;

2
app/src/main/java/com/hbl/lewan/model/AfterCountBean.java → app/src/main/java/com/hbl/yuliao/model/AfterCountBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class AfterCountBean {

2
app/src/main/java/com/hbl/lewan/model/AiChatUpdateEvent.java → app/src/main/java/com/hbl/yuliao/model/AiChatUpdateEvent.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

2
app/src/main/java/com/hbl/lewan/model/AiConvertBean.java → app/src/main/java/com/hbl/yuliao/model/AiConvertBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class AiConvertBean {

2
app/src/main/java/com/hbl/lewan/model/AiMessageBean.java → app/src/main/java/com/hbl/yuliao/model/AiMessageBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import androidx.annotation.NonNull;

2
app/src/main/java/com/hbl/lewan/model/AlbumBean.java → app/src/main/java/com/hbl/yuliao/model/AlbumBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/AlbumItemBean.java → app/src/main/java/com/hbl/yuliao/model/AlbumItemBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/AuthorizeBean.java → app/src/main/java/com/hbl/yuliao/model/AuthorizeBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class AuthorizeBean {

2
app/src/main/java/com/hbl/lewan/model/AvaterBean.java → app/src/main/java/com/hbl/yuliao/model/AvaterBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class AvaterBean {

2
app/src/main/java/com/hbl/lewan/model/BankBean.java → app/src/main/java/com/hbl/yuliao/model/BankBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class BankBean {

2
app/src/main/java/com/hbl/lewan/model/BankListBean.java → app/src/main/java/com/hbl/yuliao/model/BankListBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class BankListBean {

2
app/src/main/java/com/hbl/lewan/model/BillBean.java → app/src/main/java/com/hbl/yuliao/model/BillBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;

2
app/src/main/java/com/hbl/lewan/model/BindBean.java → app/src/main/java/com/hbl/yuliao/model/BindBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/BindUserBean.java → app/src/main/java/com/hbl/yuliao/model/BindUserBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/CallBean.java → app/src/main/java/com/hbl/yuliao/model/CallBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class CallBean {
/**0 语音消息 1 视频消息*/

2
app/src/main/java/com/hbl/lewan/model/ChargingBean.java → app/src/main/java/com/hbl/yuliao/model/ChargingBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class ChargingBean {

2
app/src/main/java/com/hbl/lewan/model/ChongZhiLogBean.java → app/src/main/java/com/hbl/yuliao/model/ChongZhiLogBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
/**
* **********************

2
app/src/main/java/com/hbl/lewan/model/ChongZhiQuDaoBean.java → app/src/main/java/com/hbl/yuliao/model/ChongZhiQuDaoBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
/**
* **********************

2
app/src/main/java/com/hbl/lewan/model/CirPushMessage.java → app/src/main/java/com/hbl/yuliao/model/CirPushMessage.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class CirPushMessage {

2
app/src/main/java/com/hbl/lewan/model/CircleShareBean.java → app/src/main/java/com/hbl/yuliao/model/CircleShareBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.netease.yunxin.kit.chatkit.ui.custom.StickerAttachment;

2
app/src/main/java/com/hbl/lewan/model/CommentBean.java → app/src/main/java/com/hbl/yuliao/model/CommentBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/ConfigBean.java → app/src/main/java/com/hbl/yuliao/model/ConfigBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
/**
* 配置开关

10
app/src/main/java/com/hbl/lewan/model/CountryBean.java → app/src/main/java/com/hbl/yuliao/model/CountryBean.java
View File

@@ -1,12 +1,12 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import android.content.Context;
import android.text.TextUtils;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import java.io.BufferedReader;
import java.io.IOException;

2
app/src/main/java/com/hbl/lewan/model/CreditsConfBean.java → app/src/main/java/com/hbl/yuliao/model/CreditsConfBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class CreditsConfBean {

2
app/src/main/java/com/hbl/lewan/model/DongTaiActionBean.java → app/src/main/java/com/hbl/yuliao/model/DongTaiActionBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class DongTaiActionBean {

2
app/src/main/java/com/hbl/lewan/model/EditMessageBean.java → app/src/main/java/com/hbl/yuliao/model/EditMessageBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/ExchangeConfBean.java → app/src/main/java/com/hbl/yuliao/model/ExchangeConfBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/ExplorePostPinglunBean.java → app/src/main/java/com/hbl/yuliao/model/ExplorePostPinglunBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class ExplorePostPinglunBean {

2
app/src/main/java/com/hbl/lewan/model/ForBiddenInfoBean.java → app/src/main/java/com/hbl/yuliao/model/ForBiddenInfoBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class ForBiddenInfoBean {

2
app/src/main/java/com/hbl/lewan/model/FukuanResultBean.java → app/src/main/java/com/hbl/yuliao/model/FukuanResultBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class FukuanResultBean {

2
app/src/main/java/com/hbl/lewan/model/GameBean.java → app/src/main/java/com/hbl/yuliao/model/GameBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;

2
app/src/main/java/com/hbl/lewan/model/GroupActionBean.java → app/src/main/java/com/hbl/yuliao/model/GroupActionBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class GroupActionBean {

2
app/src/main/java/com/hbl/lewan/model/GroupAtMessageBean.java → app/src/main/java/com/hbl/yuliao/model/GroupAtMessageBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/GroupBeanResult.java → app/src/main/java/com/hbl/yuliao/model/GroupBeanResult.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/GroupListBean.java → app/src/main/java/com/hbl/yuliao/model/GroupListBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class GroupListBean {

2
app/src/main/java/com/hbl/lewan/model/H5ChangeTitle.java → app/src/main/java/com/hbl/yuliao/model/H5ChangeTitle.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class H5ChangeTitle {

2
app/src/main/java/com/hbl/lewan/model/HisChatShowBean.java → app/src/main/java/com/hbl/yuliao/model/HisChatShowBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.netease.yunxin.kit.chatkit.model.IMMessageInfo;

2
app/src/main/java/com/hbl/lewan/model/InstallmentBean.java → app/src/main/java/com/hbl/yuliao/model/InstallmentBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/InviteDetailsBean.java → app/src/main/java/com/hbl/yuliao/model/InviteDetailsBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;

2
app/src/main/java/com/hbl/lewan/model/JsBridgeOrderBean.java → app/src/main/java/com/hbl/yuliao/model/JsBridgeOrderBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class JsBridgeOrderBean {

2
app/src/main/java/com/hbl/lewan/model/LikeBean.java → app/src/main/java/com/hbl/yuliao/model/LikeBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/LinkBean.java → app/src/main/java/com/hbl/yuliao/model/LinkBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class LinkBean {

2
app/src/main/java/com/hbl/lewan/model/ListBeanResult.java → app/src/main/java/com/hbl/yuliao/model/ListBeanResult.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/LngLat.java → app/src/main/java/com/hbl/yuliao/model/LngLat.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class LngLat {
public double longitude;

2
app/src/main/java/com/hbl/lewan/model/LoginBean.java → app/src/main/java/com/hbl/yuliao/model/LoginBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class LoginBean extends RosterElementEntity {

2
app/src/main/java/com/hbl/lewan/model/LoginBeanJiaXu.java → app/src/main/java/com/hbl/yuliao/model/LoginBeanJiaXu.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class LoginBeanJiaXu {
private String loginUrl;

2
app/src/main/java/com/hbl/lewan/model/LoginUserBean.java → app/src/main/java/com/hbl/yuliao/model/LoginUserBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class LoginUserBean {

2
app/src/main/java/com/hbl/lewan/model/Message54Bean.java → app/src/main/java/com/hbl/yuliao/model/Message54Bean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/MessageAtQuBean.java → app/src/main/java/com/hbl/yuliao/model/MessageAtQuBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class MessageAtQuBean {
private String content;

2
app/src/main/java/com/hbl/lewan/model/MessageBean.java → app/src/main/java/com/hbl/yuliao/model/MessageBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class MessageBean{

2
app/src/main/java/com/hbl/lewan/model/MessagefcmBean.java → app/src/main/java/com/hbl/yuliao/model/MessagefcmBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class MessagefcmBean {

2
app/src/main/java/com/hbl/lewan/model/NearbySearchBean.java → app/src/main/java/com/hbl/yuliao/model/NearbySearchBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

6
app/src/main/java/com/hbl/lewan/model/NewsBean.java → app/src/main/java/com/hbl/yuliao/model/NewsBean.java
View File

@@ -1,9 +1,9 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.utils.DataUtils;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/NotifyCountBean.java → app/src/main/java/com/hbl/yuliao/model/NotifyCountBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import android.print.PageRange;

2
app/src/main/java/com/hbl/lewan/model/NotifyExtraBean.java → app/src/main/java/com/hbl/yuliao/model/NotifyExtraBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/OauthAppBean.java → app/src/main/java/com/hbl/yuliao/model/OauthAppBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class OauthAppBean {

2
app/src/main/java/com/hbl/lewan/model/PassWordLoginBean.java → app/src/main/java/com/hbl/yuliao/model/PassWordLoginBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class PassWordLoginBean {
private String phone;

2
app/src/main/java/com/hbl/lewan/model/PayInfoBean.java → app/src/main/java/com/hbl/yuliao/model/PayInfoBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class PayInfoBean {

2
app/src/main/java/com/hbl/lewan/model/PayInfoWxBean.java → app/src/main/java/com/hbl/yuliao/model/PayInfoWxBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class PayInfoWxBean {

6
app/src/main/java/com/hbl/lewan/model/PushBean.java → app/src/main/java/com/hbl/yuliao/model/PushBean.java
View File

@@ -1,7 +1,7 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.R;
import java.util.ArrayList;
import java.util.List;

6
app/src/main/java/com/hbl/lewan/model/QuesBean.java → app/src/main/java/com/hbl/yuliao/model/QuesBean.java
View File

@@ -1,9 +1,9 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.utils.DataUtils;
import java.io.Serializable;

6
app/src/main/java/com/hbl/lewan/model/QuesListBean.java → app/src/main/java/com/hbl/yuliao/model/QuesListBean.java
View File

@@ -1,7 +1,7 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.utils.DataUtils;
import java.util.List;

6
app/src/main/java/com/hbl/lewan/model/QuestionBean.java → app/src/main/java/com/hbl/yuliao/model/QuestionBean.java
View File

@@ -1,8 +1,8 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.utils.DataUtils;
public class QuestionBean {

2
app/src/main/java/com/hbl/lewan/model/QuoteMessageBean.java → app/src/main/java/com/hbl/yuliao/model/QuoteMessageBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/ReadBean.java → app/src/main/java/com/hbl/yuliao/model/ReadBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;

2
app/src/main/java/com/hbl/lewan/model/ReadMessageBean.java → app/src/main/java/com/hbl/yuliao/model/ReadMessageBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/ReadRxBusBean.java → app/src/main/java/com/hbl/yuliao/model/ReadRxBusBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class ReadRxBusBean {
public int type;

2
app/src/main/java/com/hbl/lewan/model/RebootMessageBean.java → app/src/main/java/com/hbl/yuliao/model/RebootMessageBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class RebootMessageBean {
private String content;

2
app/src/main/java/com/hbl/lewan/model/RedBean.java → app/src/main/java/com/hbl/yuliao/model/RedBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;

2
app/src/main/java/com/hbl/lewan/model/RedLogBean.java → app/src/main/java/com/hbl/yuliao/model/RedLogBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/RefreshTokenBean.java → app/src/main/java/com/hbl/yuliao/model/RefreshTokenBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class RefreshTokenBean {
private String refreshToken;

2
app/src/main/java/com/hbl/lewan/model/RegisteredBean.java → app/src/main/java/com/hbl/yuliao/model/RegisteredBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class RegisteredBean {
private boolean registered;

2
app/src/main/java/com/hbl/lewan/model/ReportBean.java → app/src/main/java/com/hbl/yuliao/model/ReportBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class ReportBean {
private int index;

4
app/src/main/java/com/hbl/lewan/model/RosterElementEntity.java → app/src/main/java/com/hbl/yuliao/model/RosterElementEntity.java
View File

@@ -1,10 +1,10 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
//
// Source code recreated from a .class file by IntelliJ IDEA
// (powered by FernFlower decompiler)
//
import com.hbl.lewan.utils.CommonUtils;
import com.hbl.yuliao.utils.CommonUtils;
import java.io.Serializable;
import java.util.ArrayList;

2
app/src/main/java/com/hbl/lewan/model/RtcTokenBean.java → app/src/main/java/com/hbl/yuliao/model/RtcTokenBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class RtcTokenBean {
private int role;

2
app/src/main/java/com/hbl/lewan/model/RtcTokenResBean.java → app/src/main/java/com/hbl/yuliao/model/RtcTokenResBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class RtcTokenResBean {

2
app/src/main/java/com/hbl/lewan/model/RxBusEditMessage.java → app/src/main/java/com/hbl/yuliao/model/RxBusEditMessage.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class RxBusEditMessage {
private String toUid;

2
app/src/main/java/com/hbl/lewan/model/RxBusLoadMoreListBean.java → app/src/main/java/com/hbl/yuliao/model/RxBusLoadMoreListBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class RxBusLoadMoreListBean {
private int type;

2
app/src/main/java/com/hbl/lewan/model/RxCommLikeBean.java → app/src/main/java/com/hbl/yuliao/model/RxCommLikeBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class RxCommLikeBean {
private String postId;

2
app/src/main/java/com/hbl/lewan/model/SearchBean.java → app/src/main/java/com/hbl/yuliao/model/SearchBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class SearchBean {
public String searchText;

2
app/src/main/java/com/hbl/lewan/model/SendOrderBean.java → app/src/main/java/com/hbl/yuliao/model/SendOrderBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import android.os.Parcel;
import android.os.Parcelable;

2
app/src/main/java/com/hbl/lewan/model/SeqBean.java → app/src/main/java/com/hbl/yuliao/model/SeqBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
/**
* **********************

2
app/src/main/java/com/hbl/lewan/model/SeqBeanTop.java → app/src/main/java/com/hbl/yuliao/model/SeqBeanTop.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/SetUpdatesBean.java → app/src/main/java/com/hbl/yuliao/model/SetUpdatesBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/StaffServiceIdBean.java → app/src/main/java/com/hbl/yuliao/model/StaffServiceIdBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class StaffServiceIdBean {

2
app/src/main/java/com/hbl/lewan/model/StatisticsBean.java → app/src/main/java/com/hbl/yuliao/model/StatisticsBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class StatisticsBean {

2
app/src/main/java/com/hbl/lewan/model/StsCredentialsBean.java → app/src/main/java/com/hbl/yuliao/model/StsCredentialsBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class StsCredentialsBean {

2
app/src/main/java/com/hbl/lewan/model/SystemResultBean.java → app/src/main/java/com/hbl/yuliao/model/SystemResultBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class SystemResultBean {

2
app/src/main/java/com/hbl/lewan/model/TaskBean.java → app/src/main/java/com/hbl/yuliao/model/TaskBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class TaskBean {

2
app/src/main/java/com/hbl/lewan/model/TeamUpdateEvent.java → app/src/main/java/com/hbl/yuliao/model/TeamUpdateEvent.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import androidx.annotation.NonNull;

2
app/src/main/java/com/hbl/lewan/model/TiXianConfBean.java → app/src/main/java/com/hbl/yuliao/model/TiXianConfBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
/**
* **********************

2
app/src/main/java/com/hbl/lewan/model/TiXianLogBean.java → app/src/main/java/com/hbl/yuliao/model/TiXianLogBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
/**
* **********************

4
app/src/main/java/com/hbl/lewan/model/TimeBean.java → app/src/main/java/com/hbl/yuliao/model/TimeBean.java
View File

@@ -1,8 +1,8 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import android.content.Context;
import com.hbl.lewan.R;
import com.hbl.yuliao.R;
import java.util.ArrayList;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/TopBean.java → app/src/main/java/com/hbl/yuliao/model/TopBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/TopOrderBean.java → app/src/main/java/com/hbl/yuliao/model/TopOrderBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;

2
app/src/main/java/com/hbl/lewan/model/TopUpBean.java → app/src/main/java/com/hbl/yuliao/model/TopUpBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class TopUpBean {

2
app/src/main/java/com/hbl/lewan/model/TransferMoneyBean.java → app/src/main/java/com/hbl/yuliao/model/TransferMoneyBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
/**
* 转账记录

2
app/src/main/java/com/hbl/lewan/model/TrcGroupBean.java → app/src/main/java/com/hbl/yuliao/model/TrcGroupBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class TrcGroupBean {
private int rtcType;

6
app/src/main/java/com/hbl/lewan/model/TypeBean.java → app/src/main/java/com/hbl/yuliao/model/TypeBean.java
View File

@@ -1,7 +1,7 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.R;
import java.util.ArrayList;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/UserAlbumBean.java → app/src/main/java/com/hbl/yuliao/model/UserAlbumBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import java.io.Serializable;
import java.util.List;

2
app/src/main/java/com/hbl/lewan/model/UserRankBean.java → app/src/main/java/com/hbl/yuliao/model/UserRankBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class UserRankBean {

2
app/src/main/java/com/hbl/lewan/model/UserShareBean.java → app/src/main/java/com/hbl/yuliao/model/UserShareBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.corekit.im.model.FriendInfo;

2
app/src/main/java/com/hbl/lewan/model/UserUpdateEvent.java → app/src/main/java/com/hbl/yuliao/model/UserUpdateEvent.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
import androidx.annotation.NonNull;

2
app/src/main/java/com/hbl/lewan/model/UsersExistBean.java → app/src/main/java/com/hbl/yuliao/model/UsersExistBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class UsersExistBean {

2
app/src/main/java/com/hbl/lewan/model/VersionBean.java → app/src/main/java/com/hbl/yuliao/model/VersionBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class VersionBean {

2
app/src/main/java/com/hbl/lewan/model/WalletBean.java → app/src/main/java/com/hbl/yuliao/model/WalletBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class WalletBean {

2
app/src/main/java/com/hbl/lewan/model/WithCashBean.java → app/src/main/java/com/hbl/yuliao/model/WithCashBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class WithCashBean {

2
app/src/main/java/com/hbl/lewan/model/WithdrawCashBean.java → app/src/main/java/com/hbl/yuliao/model/WithdrawCashBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class WithdrawCashBean {

2
app/src/main/java/com/hbl/lewan/model/WorldChatBean.java → app/src/main/java/com/hbl/yuliao/model/WorldChatBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.model;
package com.hbl.yuliao.model;
public class WorldChatBean {

4
app/src/main/java/com/hbl/lewan/network/Api.java → app/src/main/java/com/hbl/yuliao/network/Api.java
View File

@@ -1,7 +1,7 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.utils.LogUtils;
import java.net.Proxy;
import java.util.concurrent.TimeUnit;

137
app/src/main/java/com/hbl/lewan/network/ApiService.java → app/src/main/java/com/hbl/yuliao/network/ApiService.java
View File

@@ -1,71 +1,71 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import com.hbl.lewan.BuildConfig;
import com.hbl.lewan.model.AccountsBean;
import com.hbl.lewan.model.ActivityMsgBean;
import com.hbl.lewan.model.AdBean;
import com.hbl.lewan.model.AfterCountBean;
import com.hbl.lewan.model.AiConvertBean;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.AuthorizeBean;
import com.hbl.lewan.model.AvaterBean;
import com.hbl.lewan.model.BankBean;
import com.hbl.lewan.model.BankListBean;
import com.hbl.lewan.model.BillBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.ChargingBean;
import com.hbl.lewan.model.ChongZhiLogBean;
import com.hbl.lewan.model.ChongZhiQuDaoBean;
import com.hbl.lewan.model.ConfigBean;
import com.hbl.lewan.model.CreditsConfBean;
import com.hbl.lewan.model.ExchangeConfBean;
import com.hbl.lewan.model.ForBiddenInfoBean;
import com.hbl.lewan.model.FukuanResultBean;
import com.hbl.lewan.model.GameBean;
import com.hbl.lewan.model.GroupActionBean;
import com.hbl.lewan.model.GroupBeanResult;
import com.hbl.lewan.model.InstallmentBean;
import com.hbl.lewan.model.InviteDetailsBean;
import com.hbl.lewan.model.LinkBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.LoginBeanJiaXu;
import com.hbl.lewan.model.MessageBean;
import com.hbl.lewan.model.NearbySearchBean;
import com.hbl.lewan.model.NewsBean;
import com.hbl.lewan.model.NotifyCountBean;
import com.hbl.lewan.model.PassWordLoginBean;
import com.hbl.lewan.model.PayInfoBean;
import com.hbl.lewan.model.PayInfoWxBean;
import com.hbl.lewan.model.QuesListBean;
import com.hbl.lewan.model.ReadMessageBean;
import com.hbl.lewan.model.RedLogBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.model.RtcTokenBean;
import com.hbl.lewan.model.RtcTokenResBean;
import com.hbl.lewan.model.SendOrderBean;
import com.hbl.lewan.model.SeqBeanTop;
import com.hbl.lewan.model.SetUpdatesBean;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.model.StatisticsBean;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.model.TaskBean;
import com.hbl.lewan.model.TiXianConfBean;
import com.hbl.lewan.model.TiXianLogBean;
import com.hbl.lewan.model.TopBean;
import com.hbl.lewan.model.TopOrderBean;
import com.hbl.lewan.model.TopUpBean;
import com.hbl.lewan.model.TrcGroupBean;
import com.hbl.lewan.model.UserAlbumBean;
import com.hbl.lewan.model.UserRankBean;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.model.VersionBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.model.WithCashBean;
import com.hbl.lewan.model.WorldChatBean;
import com.hbl.lewan.wxapi.bean.WeiXinInfo;
import com.hbl.lewan.wxapi.bean.WeiXinToken;
import com.hbl.yuliao.BuildConfig;
import com.hbl.yuliao.model.AccountsBean;
import com.hbl.yuliao.model.ActivityMsgBean;
import com.hbl.yuliao.model.AdBean;
import com.hbl.yuliao.model.AfterCountBean;
import com.hbl.yuliao.model.AiConvertBean;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.AuthorizeBean;
import com.hbl.yuliao.model.AvaterBean;
import com.hbl.yuliao.model.BankBean;
import com.hbl.yuliao.model.BankListBean;
import com.hbl.yuliao.model.BillBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.ChargingBean;
import com.hbl.yuliao.model.ChongZhiLogBean;
import com.hbl.yuliao.model.ChongZhiQuDaoBean;
import com.hbl.yuliao.model.ConfigBean;
import com.hbl.yuliao.model.CreditsConfBean;
import com.hbl.yuliao.model.ExchangeConfBean;
import com.hbl.yuliao.model.ForBiddenInfoBean;
import com.hbl.yuliao.model.FukuanResultBean;
import com.hbl.yuliao.model.GameBean;
import com.hbl.yuliao.model.GroupActionBean;
import com.hbl.yuliao.model.GroupBeanResult;
import com.hbl.yuliao.model.InstallmentBean;
import com.hbl.yuliao.model.InviteDetailsBean;
import com.hbl.yuliao.model.LinkBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.LoginBeanJiaXu;
import com.hbl.yuliao.model.MessageBean;
import com.hbl.yuliao.model.NearbySearchBean;
import com.hbl.yuliao.model.NewsBean;
import com.hbl.yuliao.model.NotifyCountBean;
import com.hbl.yuliao.model.PassWordLoginBean;
import com.hbl.yuliao.model.PayInfoBean;
import com.hbl.yuliao.model.PayInfoWxBean;
import com.hbl.yuliao.model.QuesListBean;
import com.hbl.yuliao.model.ReadMessageBean;
import com.hbl.yuliao.model.RedLogBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.model.RtcTokenBean;
import com.hbl.yuliao.model.RtcTokenResBean;
import com.hbl.yuliao.model.SendOrderBean;
import com.hbl.yuliao.model.SeqBeanTop;
import com.hbl.yuliao.model.SetUpdatesBean;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.model.StatisticsBean;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.model.TaskBean;
import com.hbl.yuliao.model.TiXianConfBean;
import com.hbl.yuliao.model.TiXianLogBean;
import com.hbl.yuliao.model.TopBean;
import com.hbl.yuliao.model.TopOrderBean;
import com.hbl.yuliao.model.TopUpBean;
import com.hbl.yuliao.model.TrcGroupBean;
import com.hbl.yuliao.model.UserAlbumBean;
import com.hbl.yuliao.model.UserRankBean;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.model.VersionBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.model.WithCashBean;
import com.hbl.yuliao.model.WorldChatBean;
import com.hbl.yuliao.wxapi.bean.WeiXinInfo;
import com.hbl.yuliao.wxapi.bean.WeiXinToken;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketBean;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketGroupBean;
import com.netease.yunxin.kit.chatkit.ui.model.TransferBean;
@@ -1225,6 +1225,11 @@ public interface ApiService {
@GET("/redEnvelope/group/unclaimed/{userId}")
Observable<Result<ListBeanResult<RedpacketGroupBean>>> unclaimed(@Path("userId") String userId, @Query("page") int page, @Query("size") int size, @Query("groupId") String groupId);
}

2
app/src/main/java/com/hbl/lewan/network/BaseApi.java → app/src/main/java/com/hbl/yuliao/network/BaseApi.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import okhttp3.OkHttpClient;
import retrofit2.Retrofit;

10
app/src/main/java/com/hbl/lewan/network/BaseObserver.java → app/src/main/java/com/hbl/yuliao/network/BaseObserver.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
@@ -10,10 +10,10 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.google.gson.JsonParseException;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

2
app/src/main/java/com/hbl/lewan/network/BaseObserver1.java → app/src/main/java/com/hbl/yuliao/network/BaseObserver1.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import com.google.gson.JsonParseException;

8
app/src/main/java/com/hbl/lewan/network/BaseObserverNew.java → app/src/main/java/com/hbl/yuliao/network/BaseObserverNew.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
@@ -7,9 +7,9 @@ import android.content.Intent;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.google.gson.JsonParseException;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

16
app/src/main/java/com/hbl/lewan/network/HeaderInterceptor.java → app/src/main/java/com/hbl/yuliao/network/HeaderInterceptor.java
View File

@@ -1,7 +1,11 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.utils.DataUtils;
import android.os.Build;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GetAndroidUniqueMark;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import java.io.IOException;
@@ -38,6 +42,12 @@ public class HeaderInterceptor implements Interceptor {
Request request = chain.request().newBuilder()
.addHeader("Authorization", DataUtils.getToken())
.addHeader("Accept-Language",lauguage)
.addHeader("X-IMEI", GetAndroidUniqueMark.getUniqueId(IMKitClient.getApplicationContext()))
.addHeader("X-System","Android")
.addHeader("X-Phone-Type", Build.MANUFACTURER+"_"+ android.os.Build.BRAND+"_"+Build.MODEL)
.addHeader("X-System-Version",Build.VERSION.RELEASE)
.addHeader("X-App-Version",DataUtils.getVersionNames(IMKitClient.getApplicationContext()))
// .addHeader("Channel", channel)
.build();

4
app/src/main/java/com/hbl/lewan/network/Result.java → app/src/main/java/com/hbl/yuliao/network/Result.java
View File

@@ -1,6 +1,6 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.utils.GsonUtils;
import java.io.Serializable;

4
app/src/main/java/com/hbl/lewan/network/ResultNew.java → app/src/main/java/com/hbl/yuliao/network/ResultNew.java
View File

@@ -1,6 +1,6 @@
package com.hbl.lewan.network;
package com.hbl.yuliao.network;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.yuliao.utils.GsonUtils;
import java.io.Serializable;

42
app/src/main/java/com/hbl/lewan/pay/CollectionActivity.java → app/src/main/java/com/hbl/yuliao/pay/CollectionActivity.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.pay;
package com.hbl.yuliao.pay;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -20,26 +20,26 @@ import com.bumptech.glide.Glide;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityCollectionBinding;
import com.hbl.lewan.databinding.ActivityPaymentBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.FukuanResultBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.KeyboardUtil;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityCollectionBinding;
import com.hbl.yuliao.databinding.ActivityPaymentBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.FukuanResultBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.king.zxing.util.CodeUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.uinfo.UserService;

40
app/src/main/java/com/hbl/lewan/pay/CollectionAndPaymentActivity.java → app/src/main/java/com/hbl/yuliao/pay/CollectionAndPaymentActivity.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.pay;
package com.hbl.yuliao.pay;
import android.graphics.Bitmap;
import android.os.Build;
@@ -20,30 +20,30 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.PayInfoBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.model.PayInfoBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.ToolKits;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.R;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.SelectPayTypeDialog;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.ImageCacheLoader;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.PaySettingActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.R;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.SelectPayTypeDialog;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.ImageCacheLoader;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.PaySettingActivity;
import com.king.zxing.util.CodeUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.hbl.lewan.databinding.ActivityCollectionAndPaymentBinding;
import com.hbl.yuliao.databinding.ActivityCollectionAndPaymentBinding;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

36
app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanActivity.java → app/src/main/java/com/hbl/yuliao/pay/LipinDuiHuanActivity.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.pay;
package com.hbl.yuliao.pay;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -20,23 +20,23 @@ import androidx.annotation.RequiresApi;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityCollectionAndPaymentBinding;
import com.hbl.lewan.databinding.ActivityLipinduihuanBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.SelectPayTypeDialog;
import com.hbl.lewan.model.PayInfoBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityCollectionAndPaymentBinding;
import com.hbl.yuliao.databinding.ActivityLipinduihuanBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.SelectPayTypeDialog;
import com.hbl.yuliao.model.PayInfoBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.king.zxing.util.CodeUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

14
app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanSuccessActivity.java → app/src/main/java/com/hbl/yuliao/pay/LipinDuiHuanSuccessActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.pay;
package com.hbl.yuliao.pay;
import android.content.Intent;
import android.os.Build;
@@ -13,13 +13,13 @@ import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.bumptech.glide.Glide;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityLipinSuccessBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityLipinSuccessBinding;
import com.hbl.lewan.model.FukuanResultBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.yuliao.model.FukuanResultBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import io.reactivex.android.schedulers.AndroidSchedulers;

10
app/src/main/java/com/hbl/lewan/pay/NfcReaderActivity.java → app/src/main/java/com/hbl/yuliao/pay/NfcReaderActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.pay;
package com.hbl.yuliao.pay;
import android.content.Context;
import android.content.Intent;
@@ -18,9 +18,9 @@ import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import com.bumptech.glide.Glide;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityNfcreaderBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.base.LllChatBaseActivity;
import com.hbl.yuliao.databinding.ActivityNfcreaderBinding;
import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -135,7 +135,7 @@ public class NfcReaderActivity extends LllChatBaseActivity {
if (isStart) {
tvTitle.setVisibility(View.VISIBLE);
tvCancel.setVisibility(View.VISIBLE);
tvStatus.setText(getString(com.hbl.lewan.R.string.nfctitle_dialog_status));
tvStatus.setText(getString(com.hbl.yuliao.R.string.nfctitle_dialog_status));
Glide.with(this).load(R.mipmap.nfc_read).into(ivStatus);
tvCancel.setOnClickListener(view -> {
nfcAdapter.disableReaderMode(this);

56
app/src/main/java/com/hbl/lewan/pay/PaymentActivity.java → app/src/main/java/com/hbl/yuliao/pay/PaymentActivity.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.pay;
package com.hbl.yuliao.pay;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -24,33 +24,33 @@ import com.bumptech.glide.Glide;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.contact.UserInfoActivity;
import com.hbl.lewan.databinding.ActivityCollectionAndPaymentBinding;
import com.hbl.lewan.databinding.ActivityPaymentBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.PayDialog;
import com.hbl.lewan.dialog.SelectPayTypeDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.redpack.TransferAccountsActivity;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.KeyboardUtil;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.lewan.wallet.PaySettingActivity;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.databinding.ActivityCollectionAndPaymentBinding;
import com.hbl.yuliao.databinding.ActivityPaymentBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.dialog.SelectPayTypeDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.redpack.TransferAccountsActivity;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.hbl.yuliao.wallet.PaySettingActivity;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

52
app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java → app/src/main/java/com/hbl/yuliao/pay/PaymentActivity1.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.pay;
package com.hbl.yuliao.pay;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.LIB_TAG;
@@ -28,31 +28,31 @@ import androidx.recyclerview.widget.RecyclerView;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityPayment1Binding;
import com.hbl.lewan.databinding.ActivityPaymentBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.KeyboardUtil;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityPayment1Binding;
import com.hbl.yuliao.databinding.ActivityPaymentBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.UsersExistBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.wallet.SetPayPasswordActivity;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.FriendService;

8
app/src/main/java/com/hbl/lewan/pay/PaymentSuccessActivity.java → app/src/main/java/com/hbl/yuliao/pay/PaymentSuccessActivity.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.pay;
package com.hbl.yuliao.pay;
import android.content.Intent;
import android.os.Build;
@@ -10,9 +10,9 @@ import android.view.View;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityPaymentSuccessBinding;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityPaymentSuccessBinding;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.uinfo.UserService;

2
app/src/main/java/com/hbl/lewan/push/HWPushMessageService.java → app/src/main/java/com/hbl/yuliao/push/HWPushMessageService.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.push;
package com.hbl.yuliao.push;
//import com.huawei.hms.push.RemoteMessage;
import com.google.firebase.messaging.RemoteMessage;

4
app/src/main/java/com/hbl/lewan/push/PushMessageHandler.java → app/src/main/java/com/hbl/yuliao/push/PushMessageHandler.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.push;
package com.hbl.yuliao.push;
import android.app.Activity;
import android.content.ComponentName;
@@ -14,7 +14,7 @@ import com.netease.nimlib.sdk.mixpush.MixPushMessageHandler;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.hbl.lewan.NimSDKOptionConfig;
import com.hbl.yuliao.NimSDKOptionConfig;
import java.util.ArrayList;
import java.util.Map;

4
app/src/main/java/com/hbl/lewan/push/PushUserInfoProvider.java → app/src/main/java/com/hbl/yuliao/push/PushUserInfoProvider.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.push;
package com.hbl.yuliao.push;
import android.content.Context;
import android.graphics.Bitmap;
@@ -19,7 +19,7 @@ import com.netease.nimlib.sdk.nos.NosService;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.nimlib.sdk.uinfo.UserInfoProvider;
import com.netease.nimlib.sdk.uinfo.model.UserInfo;
import com.hbl.lewan.R;
import com.hbl.yuliao.R;
import com.netease.yunxin.kit.corekit.im.provider.TeamProvider;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

62
app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java → app/src/main/java/com/hbl/yuliao/redpack/ReceiveRedPacketActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.redpack;
package com.hbl.yuliao.redpack;
import android.annotation.SuppressLint;
import android.content.Intent;
@@ -10,26 +10,27 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.network.Api;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.network.Api;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.R;
import com.hbl.yuliao.R;
import com.hbl.lewan.databinding.ActivityReceiveRedPacketBinding;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ImageCacheLoader;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.lewan.wallet.WalletInfoNewActivity;
import com.hbl.yuliao.databinding.ActivityReceiveRedPacketBinding;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.ImageCacheLoader;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.hbl.yuliao.wallet.WalletInfoNewActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.uinfo.UserService;
import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
@@ -85,7 +86,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
if (!isGroup) {
redpacketBean = (RedpacketBean) getIntent().getSerializableExtra("bean");
if (redpacketBean.getCoinType() == null || redpacketBean.getCoinType() == 0) {
viewBinding.zhutiBg.setBackgroundResource(R.mipmap.red_packet_top_bg);
viewBinding.zhutiBg.setBackgroundResource(R.mipmap.hb_tp);
viewBinding.bileixinIv.setImageResource(R.mipmap.wallet_jinbi_img);
} else {
viewBinding.zhutiBg.setBackgroundResource(R.mipmap.red_packet_top_bg_s);
@@ -99,7 +100,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
} else {
redpacketGroupBean = (RedpacketGroupBean) getIntent().getSerializableExtra("bean");
if (redpacketGroupBean.getCoinType() == null || redpacketGroupBean.getCoinType() == 0) {
viewBinding.zhutiBg.setBackgroundResource(R.mipmap.red_packet_top_bg);
viewBinding.zhutiBg.setBackgroundResource(R.mipmap.hb_tp);
viewBinding.bileixinIv.setImageResource(R.mipmap.wallet_jinbi_img);
} else if (redpacketGroupBean.getCoinType() == 1) {
@@ -434,6 +435,9 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
}
if(!TextUtils.isEmpty(redpacketGroupBean.getFinishTime())){
viewBinding.titleTipsTv.setText( viewBinding.titleTipsTv.getText().toString()+","+getTimes(redpacketGroupBean));
}
}
}
@@ -449,6 +453,30 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
}
}
private String getTimes(RedpacketGroupBean redpacketGroupBean) {
long time = DataUtils.dateToStamp(redpacketGroupBean.getFinishTime());
long time1 = DataUtils.dateToStamp(redpacketGroupBean.getSendTime());
String times = getEndTime(time-time1);
return times+"抢完";
}
/**
* 订单剩余时间 分/秒/00
* @param l
* @return
*/
private String getEndTime(long l) {
if(l/(1000*60)>0){
long mm = l/(1000*60);
long ss = l%(1000*60)/1000;
return mm+"分"+(ss<10?"0"+ss:""+ss)+"秒";
}else{
long ss = l/1000;
return ss+"秒";
}
}
private void initList() {
viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(this));
commonAdapter = new CommonAdapter<GrabbersBean>(ReceiveRedPacketActivity.this, R.layout.item_red_list, titles) {

40
app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java → app/src/main/java/com/hbl/yuliao/redpack/SendGiftRedPacketActivity.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.redpack;
package com.hbl.yuliao.redpack;
import android.app.Activity;
import android.content.Intent;
@@ -23,25 +23,25 @@ import androidx.annotation.RequiresApi;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivitySendGiftRedpacketBinding;
import com.hbl.lewan.databinding.ActivitySendRedPacketBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivitySendGiftRedpacketBinding;
import com.hbl.yuliao.databinding.ActivitySendRedPacketBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;

89
app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java → app/src/main/java/com/hbl/yuliao/redpack/SendRedPacketActivity.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.redpack;
package com.hbl.yuliao.redpack;
import android.app.Activity;
import android.content.Intent;
@@ -30,33 +30,35 @@ import androidx.core.graphics.drawable.DrawableCompat;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.databinding.ActivitySendRedPacketBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.PayDialog;
import com.hbl.lewan.dialog.SelectPayTypeDialog;
import com.hbl.lewan.imkit.team.TeamMembersList1Activity;
import com.hbl.lewan.imkit.team.TeamMembersListActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.TeamUpdateEvent;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.PaySettingActivity;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.yuliao.databinding.ActivitySendRedPacketBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.dialog.SelectPayTypeDialog;
import com.hbl.yuliao.imkit.team.TeamMembersList1Activity;
import com.hbl.yuliao.imkit.team.TeamMembersListActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.TeamUpdateEvent;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.PaySettingActivity;
import com.hbl.yuliao.wallet.ShiMingActivity;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
@@ -351,10 +353,12 @@ public class SendRedPacketActivity extends BaseActivity {
viewBinding.tipsTv.setText(getString(R.string.psjhb_txt));
viewBinding.groupRedLy.setVisibility(View.VISIBLE);
viewBinding.zhuanshuLy.setVisibility(View.GONE);
viewBinding.zhuanshuV.setVisibility(View.GONE);
} else {
viewBinding.tipsTv.setText("专属红包");
viewBinding.groupRedLy.setVisibility(View.GONE);
viewBinding.zhuanshuLy.setVisibility(View.VISIBLE);
viewBinding.zhuanshuV.setVisibility(View.VISIBLE);
changeUser();
}
@@ -897,7 +901,11 @@ public class SendRedPacketActivity extends BaseActivity {
@Override
public void onError(int code, String msg) {
ToastX.showShortToast(msg);
if(code == 40102){
showToShiMing(msg);
}else {
ToastX.showShortToast(msg);
}
}
});
@@ -942,12 +950,35 @@ public class SendRedPacketActivity extends BaseActivity {
@Override
public void onError(int code, String msg) {
ToastX.showShortToast(msg);
if(code == 40102){
showToShiMing(msg);
}else {
ToastX.showShortToast(msg);
}
}
});
}
}
private void showToShiMing(String message) {
ActionConfirmDialog actionDialog = new ActionConfirmDialog(SendRedPacketActivity.this,
message,"取消","去绑定",true);
actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
@Override
public void toSumbit() {
Intent intent = new Intent(SendRedPacketActivity.this, ShiMingActivity.class);
startActivity(intent);
}
@Override
public void toCancel() {
}
});
actionDialog.show();
}
private void toShareMessage(RedPacketAttachment customerAttachment) {
IMMessage customMessage = MessageBuilder.createCustomMessage(getIntent().getStringExtra("receiverUid"), SessionTypeEnum.P2P,

77
app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java → app/src/main/java/com/hbl/yuliao/redpack/TransferAccountsActivity.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.redpack;
package com.hbl.yuliao.redpack;
import android.app.Activity;
import android.content.Intent;
@@ -19,27 +19,28 @@ import androidx.annotation.RequiresApi;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityTransferAccountsBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayCashDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.PayDialog;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityTransferAccountsBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayCashDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.yuliao.wallet.ShiMingActivity;
import com.hbl.yuliao.wallet.WalletInfoActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
@@ -76,7 +77,7 @@ public class TransferAccountsActivity extends BaseActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
getWindow().setStatusBarColor(getResources().getColor(R.color.white));
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_fffafa));
// getWindow().setNavigationBarColor(getResources().getColor(R.color.color_fffafa));
super.onCreate(savedInstanceState);
viewBinding = ActivityTransferAccountsBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
@@ -92,7 +93,7 @@ public class TransferAccountsActivity extends BaseActivity {
protected void initView() {
viewBinding.contactListActivityTitleBar.getBackImageView().setImageResource(R.mipmap.dialog_colose_img);
viewBinding.contactListActivityTitleBar.getBackImageView().setOnClickListener(v -> finish());
viewBinding.ivJinbiType.setImageResource(isJinBi ? R.mipmap.wallet_jinbi_img : R.mipmap.wallet_yinbi_img);
// viewBinding.ivJinbiType.setImageResource(isJinBi ? R.mipmap.wallet_jinbi_img : R.mipmap.wallet_yinbi_img);
// u = lu1();
// 设置标题（自定义标题栏后的title文本设置是不同的哦，见CustomeTitleBar中的说明）
this.setTitle(getString(R.string.zhuanzhang_txt));
@@ -298,12 +299,14 @@ public class TransferAccountsActivity extends BaseActivity {
LoginBean userInfoBean;
private void getUserInfo(String user_uid) {
showLoading();
Api.getInstance().userInfo(user_uid)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<LoginBean>>() {
@Override
public void onSuccess(Result<LoginBean> feedbackResp) {
dismissLoading();
userInfoBean = feedbackResp.data;
if (userInfoBean != null) {
viewBinding.userNameTv.setText(String.format(getString(R.string.zhuanzhangjineto_txt), userInfoBean.getNickNameWithRemark()));
@@ -318,6 +321,7 @@ public class TransferAccountsActivity extends BaseActivity {
@Override
public void onError(int code, String msg) {
dismissLoading();
LogUtils.i("获取到的错误:" + code + "" + msg);
}
});
@@ -382,12 +386,33 @@ public class TransferAccountsActivity extends BaseActivity {
@Override
public void onError(int code, String msg) {
ToastX.showShortToast(msg);
if(code == 40102){
showToShiMing(msg);
}else {
ToastX.showShortToast(msg);
}
}
});
}
private void showToShiMing(String message) {
ActionConfirmDialog actionDialog = new ActionConfirmDialog(TransferAccountsActivity.this,
message,"取消","去绑定",true);
actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
@Override
public void toSumbit() {
Intent intent = new Intent(TransferAccountsActivity.this, ShiMingActivity.class);
startActivity(intent);
}
@Override
public void toCancel() {
}
});
actionDialog.show();
}
private void toShareMessage(TransferAttachment customerAttachment) {
IMMessage customMessage = MessageBuilder.createCustomMessage(getIntent().getStringExtra("receiverUid"), SessionTypeEnum.P2P,
getString(com.netease.yunxin.kit.chatkit.ui.R.string.zhuangzhang_chat_txt), customerAttachment);
@@ -427,7 +452,7 @@ public class TransferAccountsActivity extends BaseActivity {
Api.getInstance().bindInfo(IMKitClient.account())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<BindBean>>() {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<BindBean> feedbackResp) {
bindBean = feedbackResp.data;
@@ -451,7 +476,7 @@ public class TransferAccountsActivity extends BaseActivity {
Api.getInstance().walletInfo(IMKitClient.account())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<WalletBean>>() {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<WalletBean> feedbackResp) {

56
app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java → app/src/main/java/com/hbl/yuliao/redpack/TransferInfoActivity.java
View File

@@ -1,6 +1,7 @@
package com.hbl.lewan.redpack;
package com.hbl.yuliao.redpack;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
@@ -8,22 +9,23 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.databinding.ActivityTransferInfoBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.databinding.ActivityTransferInfoBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.wallet.ShiMingActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
@@ -247,7 +249,12 @@ public class TransferInfoActivity extends BaseActivity
@Override
public void onError(int code, String msg) {
LogUtils.i("获取到数据ERROR："+code+";;"+msg);
// LogUtils.i("获取到数据ERROR："+code+";;"+msg);
if(code == 40102){
showToShiMing(msg);
}else {
ToastX.showShortToast(msg);
}
}
});
@@ -256,6 +263,23 @@ public class TransferInfoActivity extends BaseActivity
}
private void showToShiMing(String message) {
ActionConfirmDialog actionDialog = new ActionConfirmDialog(TransferInfoActivity.this,
message,"取消","去绑定",true);
actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
@Override
public void toSumbit() {
Intent intent = new Intent(TransferInfoActivity.this, ShiMingActivity.class);
startActivity(intent);
}
@Override
public void toCancel() {
}
});
actionDialog.show();
}
private void toShareMessage(TransferAttachment customerAttachment) {
IMMessage customMessage = MessageBuilder.createCustomMessage(customerAttachment.getSenderUid()+"", SessionTypeEnum.P2P,
getString(com.netease.yunxin.kit.chatkit.ui.R.string.zhuangzhang_chat_txt), customerAttachment);

4
app/src/main/java/com/hbl/lewan/repository/LoginUserRepository.java → app/src/main/java/com/hbl/yuliao/repository/LoginUserRepository.java
View File

@@ -1,10 +1,10 @@
package com.hbl.lewan.repository;
package com.hbl.yuliao.repository;
import android.annotation.SuppressLint;
import androidx.lifecycle.MutableLiveData;
import com.hbl.lewan.model.LoginUserBean;
import com.hbl.yuliao.model.LoginUserBean;
import java.util.Map;

4
app/src/main/java/com/hbl/lewan/utils/AdaptScreenUtils.java → app/src/main/java/com/hbl/yuliao/utils/AdaptScreenUtils.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.app.Dialog;
@@ -14,7 +14,7 @@ import android.view.Window;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import com.hbl.lewan.IMApplication;
import com.hbl.yuliao.IMApplication;
import java.lang.reflect.Field;
import java.util.ArrayList;

2
app/src/main/java/com/hbl/lewan/utils/AnimUtil.java → app/src/main/java/com/hbl/yuliao/utils/AnimUtil.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.view.View;

26
app/src/main/java/com/hbl/lewan/utils/AppUtils.java → app/src/main/java/com/hbl/yuliao/utils/AppUtils.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.app.Activity;
import android.content.Context;
@@ -58,22 +58,22 @@ public class AppUtils {
public static String getQian(long number) {
if (number % 100 == 0) {
long numbers = number/100;
DecimalFormat decimalFormat = new DecimalFormat("#,###,###");
String formattedNumber = decimalFormat.format(numbers);
return String.format("%s", formattedNumber);
} else if (number % 10 == 0) {
float numbers = number/100f;
DecimalFormat decimalFormat = new DecimalFormat("#,###,##0.0");
String formattedNumber = decimalFormat.format(numbers);
return String.format("%s", formattedNumber);
} else {
// if (number % 100 == 0) {
// long numbers = number/100;
// DecimalFormat decimalFormat = new DecimalFormat("#,###,###");
// String formattedNumber = decimalFormat.format(numbers);
// return String.format("%s", formattedNumber);
// } else if (number % 10 == 0) {
// float numbers = number/100f;
// DecimalFormat decimalFormat = new DecimalFormat("#,###,##0.0");
// String formattedNumber = decimalFormat.format(numbers);
// return String.format("%s", formattedNumber);
// } else {
float numbers = number/100f;
DecimalFormat decimalFormat = new DecimalFormat("#,###,##0.00");
String formattedNumber = decimalFormat.format(numbers);
return String.format("%s", formattedNumber);
}
// }
}
/**

2
app/src/main/java/com/hbl/lewan/utils/CharInputFilter.java → app/src/main/java/com/hbl/yuliao/utils/CharInputFilter.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.text.InputFilter;
import android.text.Spanned;

2
app/src/main/java/com/hbl/lewan/utils/CommonUtils.java → app/src/main/java/com/hbl/yuliao/utils/CommonUtils.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import java.lang.reflect.Method;
import java.math.BigDecimal;

2
app/src/main/java/com/hbl/lewan/utils/Constant.java → app/src/main/java/com/hbl/yuliao/utils/Constant.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
public class Constant {

33
app/src/main/java/com/hbl/lewan/utils/DataUtils.java → app/src/main/java/com/hbl/yuliao/utils/DataUtils.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.content.ClipboardManager;
import android.content.Context;
@@ -17,13 +17,13 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.network.ApiService;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.network.ApiService;
import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -214,7 +214,24 @@ public class DataUtils {
return version;
}
/**
* 获取版本号
*
* @return
*/
public static String getVersionNames(Context context) {
String version ="2.2.6";
PackageManager packagemanager = context.getPackageManager();
try {
PackageInfo packinfo = packagemanager.getPackageInfo(context.getPackageName(), 0);
version = packinfo.versionName;
} catch (PackageManager.NameNotFoundException e) {
}finally {
return version;
}
}
/**
* 实现文本复制功能

2
app/src/main/java/com/hbl/lewan/utils/DateUtil.java → app/src/main/java/com/hbl/yuliao/utils/DateUtil.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import java.text.ParseException;
import java.text.SimpleDateFormat;

6
app/src/main/java/com/hbl/lewan/utils/FileUtils.java → app/src/main/java/com/hbl/yuliao/utils/FileUtils.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.app.Activity;
import android.content.ContentResolver;
@@ -9,8 +9,8 @@ import android.net.Uri;
import android.provider.MediaStore;
import com.blankj.utilcode.util.ToastUtils;
import com.hbl.lewan.model.AiChatUpdateEvent;
import com.hbl.lewan.model.AiMessageBean;
import com.hbl.yuliao.model.AiChatUpdateEvent;
import com.hbl.yuliao.model.AiMessageBean;
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

2
app/src/main/java/com/hbl/lewan/utils/GetAndroidUniqueMark.java → app/src/main/java/com/hbl/yuliao/utils/GetAndroidUniqueMark.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.annotation.SuppressLint;
import android.content.Context;

2
app/src/main/java/com/hbl/lewan/utils/GsonUtils.java → app/src/main/java/com/hbl/yuliao/utils/GsonUtils.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.text.TextUtils;

8
app/src/main/java/com/hbl/lewan/utils/ImageCacheLoader.java → app/src/main/java/com/hbl/yuliao/utils/ImageCacheLoader.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.content.Context;
import android.widget.ImageView;
@@ -16,9 +16,9 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.transition.DrawableCrossFadeFactory;
import com.bumptech.glide.signature.ObjectKey;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
/**

4
app/src/main/java/com/hbl/lewan/utils/ImageLoader.java → app/src/main/java/com/hbl/yuliao/utils/ImageLoader.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
@@ -10,7 +10,7 @@ import com.bumptech.glide.annotation.GlideModule;
import com.bumptech.glide.module.AppGlideModule;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.model.AdBean;
import com.hbl.yuliao.model.AdBean;
/**
* Created by Meiji on 2017/5/31.

2
app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelper.java → app/src/main/java/com/hbl/yuliao/utils/ItemDragTouchHelper.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import androidx.recyclerview.widget.RecyclerView;

2
app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelperCallback.java → app/src/main/java/com/hbl/yuliao/utils/ItemDragTouchHelperCallback.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

2
app/src/main/java/com/hbl/lewan/utils/KeyboardUtil.java → app/src/main/java/com/hbl/yuliao/utils/KeyboardUtil.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.app.Activity;
import android.content.Context;

4
app/src/main/java/com/hbl/lewan/utils/LogUtils.java → app/src/main/java/com/hbl/yuliao/utils/LogUtils.java
View File

@@ -1,8 +1,8 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.util.Log;
import com.hbl.lewan.BuildConfig;
import com.hbl.yuliao.BuildConfig;
/**

2
app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java → app/src/main/java/com/hbl/yuliao/utils/QRCodeScheme.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.util.Log;

4
app/src/main/java/com/hbl/lewan/utils/ScreenUtils.java → app/src/main/java/com/hbl/yuliao/utils/ScreenUtils.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import static android.Manifest.permission.WRITE_SETTINGS;
@@ -20,7 +20,7 @@ import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresPermission;
import com.hbl.lewan.IMApplication;
import com.hbl.yuliao.IMApplication;
/**
* <pre>

10
app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java → app/src/main/java/com/hbl/yuliao/utils/ShareDateUtils.java
View File

@@ -1,13 +1,13 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.text.TextUtils;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.model.UsersExistBean;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.chatkit.model.ConversationInfo;

2
app/src/main/java/com/hbl/lewan/utils/SoftHideKeyBoardUtil.java → app/src/main/java/com/hbl/yuliao/utils/SoftHideKeyBoardUtil.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.app.Activity;
import android.graphics.Rect;

2
app/src/main/java/com/hbl/lewan/utils/StickyTopicScroller.java → app/src/main/java/com/hbl/yuliao/utils/StickyTopicScroller.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.content.Context;
import android.util.DisplayMetrics;

2
app/src/main/java/com/hbl/lewan/utils/TaiWanIDCardUtils.java → app/src/main/java/com/hbl/yuliao/utils/TaiWanIDCardUtils.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import java.util.ArrayList;

2
app/src/main/java/com/hbl/lewan/utils/ToolKits.java → app/src/main/java/com/hbl/yuliao/utils/ToolKits.java
View File

@@ -1,5 +1,5 @@
package com.hbl.lewan.utils;
package com.hbl.yuliao.utils;
import android.app.Activity;
import android.content.ClipData;

2
app/src/main/java/com/hbl/lewan/utils/play/AmountBean.java → app/src/main/java/com/hbl/yuliao/utils/play/AmountBean.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils.play;
package com.hbl.yuliao.utils.play;
public class AmountBean {

2
app/src/main/java/com/hbl/lewan/utils/play/PlaySound.java → app/src/main/java/com/hbl/yuliao/utils/play/PlaySound.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.utils.play;
package com.hbl.yuliao.utils.play;
public class PlaySound {

6
app/src/main/java/com/hbl/lewan/utils/play/VoiceUtils.java → app/src/main/java/com/hbl/yuliao/utils/play/VoiceUtils.java
View File

@@ -1,11 +1,11 @@
package com.hbl.lewan.utils.play;
package com.hbl.yuliao.utils.play;
import android.content.Context;
import android.media.MediaPlayer;
import android.media.PlaybackParams;
import com.hbl.lewan.R;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.utils.LogUtils;
import java.io.IOException;
import java.util.ArrayList;

42
app/src/main/java/com/hbl/lewan/voom/CircleFragment.java → app/src/main/java/com/hbl/yuliao/voom/CircleFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.app.Activity;
import android.content.Intent;
@@ -39,26 +39,26 @@ import com.bumptech.glide.request.target.ImageViewTarget;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentCircleBinding;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.RxBusLoadMoreListBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ScreenUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentCircleBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.RxBusLoadMoreListBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ScreenUtils;
import com.hbl.yuliao.widget.CircleImageView;
//import com.ethanhua.skeleton.Skeleton;
//import com.ethanhua.skeleton.SkeletonScreen;
import com.netease.yunxin.kit.alog.ALog;

8
app/src/main/java/com/hbl/lewan/voom/CirclePicFragment.java → app/src/main/java/com/hbl/yuliao/voom/CirclePicFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -15,9 +15,9 @@ import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentCirclePicBinding;
import com.hbl.lewan.utils.Constant;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentCirclePicBinding;
import com.hbl.yuliao.utils.Constant;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;

36
app/src/main/java/com/hbl/lewan/voom/CommentFragment.java → app/src/main/java/com/hbl/yuliao/voom/CommentFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.os.Bundle;
import android.os.Handler;
@@ -22,23 +22,23 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentCommentBinding;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.CommentBean;
import com.hbl.lewan.model.RxCommLikeBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.KeyboardUtil;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentCommentBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.CommentBean;
import com.hbl.yuliao.model.RxCommLikeBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;

26
app/src/main/java/com/hbl/lewan/voom/LikeFragment.java → app/src/main/java/com/hbl/yuliao/voom/LikeFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.os.Bundle;
import android.text.TextUtils;
@@ -21,18 +21,18 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentCommentBinding;
import com.hbl.lewan.databinding.FragmentLikeBinding;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.CommentBean;
import com.hbl.lewan.model.LikeBean;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentCommentBinding;
import com.hbl.yuliao.databinding.FragmentLikeBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.CommentBean;
import com.hbl.yuliao.model.LikeBean;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.FriendService;
import com.netease.nimlib.sdk.friend.model.Friend;

40
app/src/main/java/com/hbl/lewan/voom/MessageActivity.java → app/src/main/java/com/hbl/yuliao/voom/MessageActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.content.Intent;
@@ -17,25 +17,25 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityMessageBinding;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.CirPushMessage;
import com.hbl.lewan.model.DongTaiActionBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.MessageBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityMessageBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.CirPushMessage;
import com.hbl.yuliao.model.DongTaiActionBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.MessageBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;

36
app/src/main/java/com/hbl/lewan/voom/PushActivity.java → app/src/main/java/com/hbl/yuliao/voom/PushActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.Manifest;
@@ -37,23 +37,23 @@ import androidx.recyclerview.widget.ItemTouchHelper;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityPushBinding;
import com.hbl.lewan.dialog.SelectPushTypeDialog;
import com.hbl.lewan.model.StsCredentialsBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ItemDragTouchHelperCallback;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityPushBinding;
import com.hbl.yuliao.dialog.SelectPushTypeDialog;
import com.hbl.yuliao.model.StsCredentialsBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.ItemDragTouchHelperCallback;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;

46
app/src/main/java/com/hbl/lewan/voom/TiktoInfokActivity.java → app/src/main/java/com/hbl/yuliao/voom/TiktoInfokActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.Manifest;
import android.content.DialogInterface;
@@ -37,28 +37,28 @@ import androidx.viewpager2.widget.ViewPager2;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.contact.ReportActivity;
import com.hbl.lewan.contact.UserInfoActivity;
import com.hbl.lewan.databinding.ActivityTiktokinfoBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.RxCommLikeBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.contact.ReportActivity;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.databinding.ActivityTiktokinfoBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.RxCommLikeBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;

56
app/src/main/java/com/hbl/lewan/voom/TiktokActivity.java → app/src/main/java/com/hbl/yuliao/voom/TiktokActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.Manifest;
import android.content.DialogInterface;
@@ -37,35 +37,35 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.contact.ReportActivity;
import com.hbl.lewan.contact.UserInfoActivity;
import com.hbl.lewan.databinding.ActivityTiktokBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.RxCommLikeBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.contact.ReportActivity;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.databinding.ActivityTiktokBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.RxCommLikeBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.voom.comm.CircleFragment1;
import com.hbl.lewan.voom.comm.CircleFragment2;
import com.hbl.lewan.voom.comm.CusVideoView;
import com.hbl.lewan.voom.comm.OnViewPagerListener;
import com.hbl.lewan.voom.comm.TiktokAdapter;
import com.hbl.lewan.voom.comm.ViewPagerLayoutManager;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.voom.comm.CircleFragment1;
import com.hbl.yuliao.voom.comm.CircleFragment2;
import com.hbl.yuliao.voom.comm.CusVideoView;
import com.hbl.yuliao.voom.comm.OnViewPagerListener;
import com.hbl.yuliao.voom.comm.TiktokAdapter;
import com.hbl.yuliao.voom.comm.ViewPagerLayoutManager;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;

60
app/src/main/java/com/hbl/lewan/voom/TiktokActivityMe.java → app/src/main/java/com/hbl/yuliao/voom/TiktokActivityMe.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.Manifest;
import android.content.DialogInterface;
@@ -35,35 +35,35 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.contact.ReportActivity;
import com.hbl.lewan.contact.UserInfoActivity;
import com.hbl.lewan.databinding.ActivityTiktokBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.RxBusLoadMoreListBean;
import com.hbl.lewan.model.RxCommLikeBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.voom.comm.CircleFragment1;
import com.hbl.lewan.voom.comm.CircleFragment2;
import com.hbl.lewan.voom.comm.CusVideoView;
import com.hbl.lewan.voom.comm.OnViewPagerListener;
import com.hbl.lewan.voom.comm.TiktokAdapterMe;
import com.hbl.lewan.voom.comm.ViewPagerLayoutManager;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.contact.ReportActivity;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.databinding.ActivityTiktokBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.RxBusLoadMoreListBean;
import com.hbl.yuliao.model.RxCommLikeBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.voom.comm.CircleFragment1;
import com.hbl.yuliao.voom.comm.CircleFragment2;
import com.hbl.yuliao.voom.comm.CusVideoView;
import com.hbl.yuliao.voom.comm.OnViewPagerListener;
import com.hbl.yuliao.voom.comm.TiktokAdapterMe;
import com.hbl.yuliao.voom.comm.ViewPagerLayoutManager;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;

28
app/src/main/java/com/hbl/lewan/voom/VoomFragment.java → app/src/main/java/com/hbl/yuliao/voom/VoomFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom;
package com.hbl.yuliao.voom;
import android.content.Intent;
import android.os.Bundle;
@@ -16,19 +16,19 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentVoomBinding;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.MessageBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.comm.CircleFragment1;
import com.hbl.lewan.voom.comm.CircleFragment2;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentVoomBinding;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.MessageBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.comm.CircleFragment1;
import com.hbl.yuliao.voom.comm.CircleFragment2;
import com.google.android.material.tabs.TabLayoutMediator;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;

44
app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment1.java → app/src/main/java/com/hbl/yuliao/voom/comm/CircleFragment1.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom.comm;
package com.hbl.yuliao.voom.comm;
import android.app.Activity;
import android.content.Intent;
@@ -37,27 +37,27 @@ import com.bumptech.glide.request.target.ImageViewTarget;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentCircleBinding;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.RxBusLoadMoreListBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ScreenUtils;
import com.hbl.lewan.voom.TiktokActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentCircleBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.RxBusLoadMoreListBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ScreenUtils;
import com.hbl.yuliao.voom.TiktokActivity;
import com.hbl.yuliao.widget.CircleImageView;
//import com.ethanhua.skeleton.Skeleton;
//import com.ethanhua.skeleton.SkeletonScreen;
import com.netease.yunxin.kit.alog.ALog;

42
app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment2.java → app/src/main/java/com/hbl/yuliao/voom/comm/CircleFragment2.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.voom.comm;
package com.hbl.yuliao.voom.comm;
import android.Manifest;
import android.app.Activity;
@@ -39,26 +39,26 @@ import com.bumptech.glide.request.target.ImageViewTarget;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentCircleBinding;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.RxBusLoadMoreListBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ScreenUtils;
import com.hbl.lewan.voom.TiktokActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentCircleBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.RxBusLoadMoreListBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ScreenUtils;
import com.hbl.yuliao.voom.TiktokActivity;
import com.hbl.yuliao.widget.CircleImageView;
//import com.ethanhua.skeleton.Skeleton;
//import com.ethanhua.skeleton.SkeletonScreen;
import com.netease.yunxin.kit.alog.ALog;

2
app/src/main/java/com/hbl/lewan/voom/comm/CusVideoView.java → app/src/main/java/com/hbl/yuliao/voom/comm/CusVideoView.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.voom.comm;
package com.hbl.yuliao.voom.comm;
import android.content.Context;
import android.util.AttributeSet;

4
app/src/main/java/com/hbl/lewan/voom/comm/CustomLayoutManager.java → app/src/main/java/com/hbl/yuliao/voom/comm/CustomLayoutManager.java
View File

@@ -1,4 +1,4 @@
//package com.hbl.lewan.voom.comm;
//package com.hbl.yuliao.voom.comm;
//
//import android.content.Context;
//import android.view.View;
@@ -8,7 +8,7 @@
//import androidx.recyclerview.widget.PagerSnapHelper;
//import androidx.recyclerview.widget.RecyclerView;
//
//import com.hbl.lewan.utils.StickyTopicScroller;
//import com.hbl.yuliao.utils.StickyTopicScroller;
//
///**
// * 作者：created by Jarchie

2
app/src/main/java/com/hbl/lewan/voom/comm/OnPageSlideListener.java → app/src/main/java/com/hbl/yuliao/voom/comm/OnPageSlideListener.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.voom.comm;
package com.hbl.yuliao.voom.comm;
/**
* 作者：created by Jarchie

2
app/src/main/java/com/hbl/lewan/voom/comm/OnViewPagerListener.java → app/src/main/java/com/hbl/yuliao/voom/comm/OnViewPagerListener.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.voom.comm;
package com.hbl.yuliao.voom.comm;
/**
* Created by 钉某人

30
app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapter.java → app/src/main/java/com/hbl/yuliao/voom/comm/TiktokAdapter.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.voom.comm;
package com.hbl.yuliao.voom.comm;
import static android.app.PendingIntent.getActivity;
@@ -27,20 +27,20 @@ import androidx.viewpager2.widget.ViewPager2;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.RxBusLoadMoreListBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.CircleFragment;
import com.hbl.lewan.voom.CirclePicFragment;
import com.hbl.lewan.voom.TiktokActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.RxBusLoadMoreListBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.CircleFragment;
import com.hbl.yuliao.voom.CirclePicFragment;
import com.hbl.yuliao.voom.TiktokActivity;
import com.hbl.yuliao.widget.CircleImageView;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;

30
app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapterMe.java → app/src/main/java/com/hbl/yuliao/voom/comm/TiktokAdapterMe.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.voom.comm;
package com.hbl.yuliao.voom.comm;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -24,20 +24,20 @@ import androidx.viewpager2.widget.ViewPager2;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.model.AlbumBean;
import com.hbl.lewan.model.RxBusLoadMoreListBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.CirclePicFragment;
import com.hbl.lewan.voom.TiktoInfokActivity;
import com.hbl.lewan.voom.TiktokActivityMe;
import com.hbl.lewan.widget.CircleImageView;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.RxBusLoadMoreListBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.CirclePicFragment;
import com.hbl.yuliao.voom.TiktoInfokActivity;
import com.hbl.yuliao.voom.TiktokActivityMe;
import com.hbl.yuliao.widget.CircleImageView;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;

2
app/src/main/java/com/hbl/lewan/voom/comm/ViewPagerLayoutManager.java → app/src/main/java/com/hbl/yuliao/voom/comm/ViewPagerLayoutManager.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.voom.comm;
package com.hbl.yuliao.voom.comm;
import android.content.Context;
import android.view.View;

26
app/src/main/java/com/hbl/lewan/wallet/AddBankActivity.java → app/src/main/java/com/hbl/yuliao/wallet/AddBankActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.os.Bundle;
@@ -7,18 +7,18 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityAddBankBinding;
import com.hbl.lewan.databinding.ActivityShimingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityAddBankBinding;
import com.hbl.yuliao.databinding.ActivityShimingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

30
app/src/main/java/com/hbl/lewan/wallet/AddOrChangeUSDTActivity.java → app/src/main/java/com/hbl/yuliao/wallet/AddOrChangeUSDTActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.Manifest;
import android.content.Intent;
@@ -14,20 +14,20 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityBindUsdtBinding;
import com.hbl.lewan.databinding.ActivityBindWechatAlipayBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.PayInfoWxBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityBindUsdtBinding;
import com.hbl.yuliao.databinding.ActivityBindWechatAlipayBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.PayInfoWxBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;

34
app/src/main/java/com/hbl/lewan/wallet/BankListActivity.java → app/src/main/java/com/hbl/yuliao/wallet/BankListActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.os.Bundle;
@@ -7,22 +7,22 @@ import android.view.View;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityBankListBinding;
import com.hbl.lewan.databinding.ActivityShimingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BankBean;
import com.hbl.lewan.model.BankListBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityBankListBinding;
import com.hbl.yuliao.databinding.ActivityShimingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BankBean;
import com.hbl.yuliao.model.BankListBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

28
app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java → app/src/main/java/com/hbl/yuliao/wallet/BindWeChatOrAliPayActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.Manifest;
import android.content.Intent;
@@ -14,19 +14,19 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityBindWechatAlipayBinding;
import com.hbl.lewan.databinding.ActivityShimingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityBindWechatAlipayBinding;
import com.hbl.yuliao.databinding.ActivityShimingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;

6
app/src/main/java/com/hbl/lewan/wallet/ChongZhiLogActivity.java → app/src/main/java/com/hbl/yuliao/wallet/ChongZhiLogActivity.java
View File

@@ -1,12 +1,12 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityChongzhiLogBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityChongzhiLogBinding;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
public class ChongZhiLogActivity extends BaseActivity {

32
app/src/main/java/com/hbl/lewan/wallet/GiftInfoActivity.java → app/src/main/java/com/hbl/yuliao/wallet/GiftInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.os.Bundle;
@@ -6,21 +6,21 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityGiftInfoBinding;
import com.hbl.lewan.databinding.ActivityWalletInfoBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.LipinDuiHuanActivity;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityGiftInfoBinding;
import com.hbl.yuliao.databinding.ActivityWalletInfoBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.LipinDuiHuanActivity;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

44
app/src/main/java/com/hbl/lewan/wallet/GiftInfoFragment.java → app/src/main/java/com/hbl/yuliao/wallet/GiftInfoFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.os.Bundle;
import android.text.TextUtils;
@@ -13,27 +13,27 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentWalletInfo1Binding;
import com.hbl.lewan.databinding.FragmentWalletInfoBinding;
import com.hbl.lewan.dialog.SelectTypeDialog;
import com.hbl.lewan.model.BillBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.StatisticsBean;
import com.hbl.lewan.model.TaskBean;
import com.hbl.lewan.model.TypeBean;
import com.hbl.lewan.model.WithdrawCashBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentWalletInfo1Binding;
import com.hbl.yuliao.databinding.FragmentWalletInfoBinding;
import com.hbl.yuliao.dialog.SelectTypeDialog;
import com.hbl.yuliao.model.BillBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.StatisticsBean;
import com.hbl.yuliao.model.TaskBean;
import com.hbl.yuliao.model.TypeBean;
import com.hbl.yuliao.model.WithdrawCashBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;

44
app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java → app/src/main/java/com/hbl/yuliao/wallet/MyWalletActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.graphics.drawable.Drawable;
@@ -10,26 +10,26 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityMywalletBinding;
import com.hbl.lewan.databinding.ActivityWalletInfoNewBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.AccoutListActivity;
import com.hbl.lewan.main.mine.BuyAccountActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.AccountsBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.PayInfoWxBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.LipinDuiHuanActivity;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityMywalletBinding;
import com.hbl.yuliao.databinding.ActivityWalletInfoNewBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.AccoutListActivity;
import com.hbl.yuliao.main.mine.BuyAccountActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.AccountsBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.PayInfoWxBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.LipinDuiHuanActivity;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -173,7 +173,7 @@ public class MyWalletActivity extends BaseActivity {
protected void onResume() {
super.onResume();
getWallet();
checkAccounts();
// checkAccounts();
}

32
app/src/main/java/com/hbl/lewan/wallet/PayPasswordActivity.java → app/src/main/java/com/hbl/yuliao/wallet/PayPasswordActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.os.Bundle;
@@ -14,18 +14,18 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.custom.PasswordEditText;
import com.hbl.lewan.databinding.ActivityChangePaypasswordBinding;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.KeyboardUtil;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.custom.PasswordEditText;
import com.hbl.yuliao.databinding.ActivityChangePaypasswordBinding;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -67,12 +67,8 @@ public class PayPasswordActivity extends BaseActivity {
code = getIntent().getStringExtra("code");
viewBinding.backStep2Bt.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onBackPressed();
}
});
viewBinding.aboutTitleBar.setOnBackIconClickListener(v -> onBackPressed());
bindInfo(IMKitClient.account());

60
app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java → app/src/main/java/com/hbl/yuliao/wallet/PaySettingActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import static com.blankj.utilcode.util.SnackbarUtils.dismiss;
import static com.codersun.fingerprintcompat.FingerManager.SupportResult.DEVICE_UNSUPPORTED;
@@ -22,32 +22,32 @@ import androidx.annotation.RequiresApi;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityCollectionAndPaymentBinding;
import com.hbl.lewan.databinding.ActivityPaySettingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.MianMiDialog;
import com.hbl.lewan.dialog.MianMiXieyiDialog;
import com.hbl.lewan.dialog.PayCashFingerDialog;
import com.hbl.lewan.dialog.PayDialog;
import com.hbl.lewan.dialog.SelectPayTypeDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.login.RegisterActivity;
import com.hbl.lewan.main.mine.AccountAndSecurityActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.TopUpBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityCollectionAndPaymentBinding;
import com.hbl.yuliao.databinding.ActivityPaySettingBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.MianMiDialog;
import com.hbl.yuliao.dialog.MianMiXieyiDialog;
import com.hbl.yuliao.dialog.PayCashFingerDialog;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.dialog.SelectPayTypeDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.login.RegisterActivity;
import com.hbl.yuliao.main.mine.AccountAndSecurityActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.TopUpBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
@@ -335,18 +335,18 @@ public class PaySettingActivity extends BaseActivity implements SelectPayTypeDia
switch (FingerManager.checkSupport(PaySettingActivity.this)) {
case DEVICE_UNSUPPORTED:
viewBinding.zhiwenFy.setVisibility(View.GONE);
viewBinding.zhiwenLine.setVisibility(View.GONE);
// viewBinding.zhiwenLine.setVisibility(View.GONE);
isShowFinger = 0;
break;
case SUPPORT_WITHOUT_DATA:
viewBinding.zhiwenFy.setVisibility(View.VISIBLE);
viewBinding.zhiwenLine.setVisibility(View.VISIBLE);
// viewBinding.zhiwenLine.setVisibility(View.VISIBLE);
isShowFinger = 1;
break;
case SUPPORT:
viewBinding.zhiwenFy.setVisibility(View.VISIBLE);
viewBinding.zhiwenLine.setVisibility(View.VISIBLE);
// viewBinding.zhiwenLine.setVisibility(View.VISIBLE);
isShowFinger = 2;
break;
}

61
app/src/main/java/com/hbl/lewan/wallet/SetPayPasswordActivity.java → app/src/main/java/com/hbl/yuliao/wallet/SetPayPasswordActivity.java
View File

@@ -2,11 +2,12 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Paint;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
@@ -22,24 +23,24 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityChongzhiBinding;
import com.hbl.lewan.databinding.ActivityChongzhiPayBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.login.LoginActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.CountryBean;
import com.hbl.lewan.model.RegisteredBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityChongzhiBinding;
import com.hbl.yuliao.databinding.ActivityChongzhiPayBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.login.LoginActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.CountryBean;
import com.hbl.yuliao.model.RegisteredBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
@@ -58,7 +59,7 @@ import io.reactivex.schedulers.Schedulers;
*/
public class SetPayPasswordActivity extends BaseActivity {
protected ActivityResultLauncher<String[]> permissionLauncher;
String passwordCode = null;
// String passwordCode = null;
private static final String TAG = "WelcomeActivity";
private ActivityChongzhiPayBinding activityWelcomeBinding;
@@ -80,12 +81,12 @@ public class SetPayPasswordActivity extends BaseActivity {
activityWelcomeBinding.aboutTitleBar.setOnBackIconClickListener(v -> {
onBackPressed();
});
activityWelcomeBinding.sendSmsTv.setPaintFlags(activityWelcomeBinding.sendSmsTv.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
countryBean = DataUtils.getLocCountry(SetPayPasswordActivity.this);
changeArea();
activityWelcomeBinding.nextIv.setOnClickListener(v -> {
if (TextUtils.isEmpty(passwordCode)) {
if (TextUtils.isEmpty(activityWelcomeBinding.passwordEditTextCode.getText().toString().trim())) {
ToastX.showShortToast(R.string.dxyzmbnwk_txt);
return;
}
@@ -93,10 +94,10 @@ public class SetPayPasswordActivity extends BaseActivity {
});
activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
passwordCode = code;
});
// activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
// passwordCode = code;
//
// });
activityWelcomeBinding.sendSmsTv.setOnClickListener(v -> {
@@ -104,8 +105,8 @@ public class SetPayPasswordActivity extends BaseActivity {
});
AnimUtil.setAnimViews(activityWelcomeBinding.sendSmsTv, activityWelcomeBinding.changePassTv,
activityWelcomeBinding.nextIv, activityWelcomeBinding.changeSmsCodeTv);
AnimUtil.setAnimViews(activityWelcomeBinding.sendSmsTv,
activityWelcomeBinding.nextIv);
bindInfo(IMKitClient.account());
}
@@ -136,7 +137,7 @@ public class SetPayPasswordActivity extends BaseActivity {
private void checkVerfyCode() {
Map<String, Object> maps = new HashMap<>();
maps.put("verifyCode", passwordCode);
maps.put("verifyCode", activityWelcomeBinding.passwordEditTextCode.getText().toString().trim());
maps.put("phone", bean.getPhone());
maps.put("areaCode", bean.getAreaCode());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
@@ -152,7 +153,7 @@ public class SetPayPasswordActivity extends BaseActivity {
// dimessLoadingDialog();
if (feedbackResp.data.isCorrect()) {
Intent intent = new Intent(SetPayPasswordActivity.this, PayPasswordActivity.class);
intent.putExtra("code", passwordCode);
intent.putExtra("code", activityWelcomeBinding.passwordEditTextCode.getText().toString().trim());
startActivityForResult(intent, 777);
} else {
ToastX.showShortToast(R.string.yzmbzq_txt);

42
app/src/main/java/com/hbl/lewan/wallet/ShiMingActivity.java → app/src/main/java/com/hbl/yuliao/wallet/ShiMingActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.graphics.drawable.Drawable;
@@ -13,26 +13,26 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityShimingBinding;
import com.hbl.lewan.databinding.ActivityWalletInfoNewBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.LipinDuiHuanActivity;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityShimingBinding;
import com.hbl.yuliao.databinding.ActivityWalletInfoNewBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.LipinDuiHuanActivity;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.welcome.WelcomeActivity;
import com.netease.yunxin.kit.chatkit.ui.data.ChatDatabase;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

467
app/src/main/java/com/hbl/yuliao/wallet/SumbitUsdtActivity.java Normal file
View File

@@ -0,0 +1,467 @@
package com.hbl.yuliao.wallet;
import android.Manifest;
import android.content.Context;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.Editable;
import android.text.Html;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.request.RequestOptions;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ReportActivityBinding;
import com.hbl.yuliao.databinding.SumbitUsdtActivityBinding;
import com.hbl.yuliao.model.AlbumBean;
import com.hbl.yuliao.model.ReportBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.KeyboardUtil;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.widget.CircleImageView;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import com.luck.picture.lib.interfaces.OnResultCallbackListener;
import com.luck.picture.lib.style.BottomNavBarStyle;
import com.luck.picture.lib.style.PictureSelectorStyle;
import com.luck.picture.lib.style.SelectMainStyle;
import com.luck.picture.lib.style.TitleBarStyle;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.nimlib.sdk.uinfo.UserService;
import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
import com.netease.yunxin.kit.chatkit.ui.common.GlideEngine;
import com.netease.yunxin.kit.chatkit.ui.dialog.PermissionExplainDialog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.utils.PermissionUtils;
import com.netease.yunxin.kit.contactkit.ui.utils.ColorUtils;
import com.qiniu.android.storage.Configuration;
import com.qiniu.android.storage.UploadManager;
import com.qiniu.android.storage.UploadOptions;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import okhttp3.MultipartBody;
public class SumbitUsdtActivity extends BaseActivity {
List<Uri> uris = new ArrayList<>();
List<String> uriStrings = new ArrayList<>();
CommonAdapter commonAdapter;
List<LocalMedia> localMedias = new ArrayList<>();
List<String> outputStrings = new ArrayList<>();
int number = 0;
private SumbitUsdtActivityBinding viewBinding;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
// getWindow().setStatusBarColor(getResources().getColor(R.color.color_fcfcfc));
// getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
super.onCreate(savedInstanceState);
viewBinding = SumbitUsdtActivityBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
initView();
}
protected void initView() {
number = getIntent().getIntExtra("number",0);
viewBinding.mainAboutTitleBar.getBackImageView().setOnClickListener(v -> finish());
viewBinding.numberTv.setText(number+"");
initAdapter();
viewBinding.tupianzhenmingTv.setText("上传充值截图（0/5）");
viewBinding.tijiaoTv.setOnClickListener(v -> {
KeyboardUtil.hideSoftInput(SumbitUsdtActivity.this);
if (localMedias == null || localMedias.size() == 0) {
ToastX.showShortToast("请先上传充值凭证");
} else {
toShangchuanAli();
}
});
permissionLauncher =
registerForActivityResult(
new ActivityResultContracts.RequestMultiplePermissions(),
result -> {
if (result != null) {
for (Map.Entry<String, Boolean> entry : result.entrySet()) {
String permission = entry.getKey().toString();
boolean grant = (Boolean) entry.getValue();
if (grant) {
if (TextUtils.equals(
permission, Manifest.permission.READ_EXTERNAL_STORAGE) || TextUtils.equals(
permission, Manifest.permission.READ_MEDIA_IMAGES) || TextUtils.equals(
permission, Manifest.permission.READ_MEDIA_VIDEO)) {
startPickMedia();
}
} else {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (shouldShowRequestPermissionRationale(permission)) {
ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_deny_tips));
} else {
ToastX.showShortToast(getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage));
}
}
}
}
}
if (permissionExplainDialog != null) {
permissionExplainDialog.dismiss();
}
});
}
String stsCredentialsBean;
private void toShangchuanAli() {
showLoadingDialog("正在上传凭证…");
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<String> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
toUpdateOssNew(0);
}
@Override
public void onError(int code, String msg) {
dimessLoadingDialog();
}
});
}
// private void toAliYunOss() {
// String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
// String accessKeyId = "stsCredentialsBean.getAccessKeyId()";
// String accessKeySecret = "stsCredentialsBean.getAccessKeySecret()";
// String securityToken = "stsCredentialsBean.getSecurityToken()";
// String bucketName = IMUIKitConfig.bucketName;
//
// OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
// OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
// toUpdateOss(bucketName, 0, oss);
//
// }
//
private void toUpdateOssNew( int i) {
String updatePathPic = "userAvatarFileName";
UploadOptions options = new UploadOptions(null, null, true,
(key, percent) -> {
LogUtils.i("结果是啥进度：" + percent);
}, () -> {
LogUtils.i("结果是啥进度112222222111：");
return false;
});
Configuration configuration = new Configuration.Builder()
.build();
UploadManager uploadManager = new UploadManager(configuration);
if (i < uris.size()) {
File file = new File(localMedias.get(i).getRealPath());
LogUtils.i("结果是啥开始111："+localMedias.get(i).getRealPath());
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath());
String files = "media/" + updatePathPic + "/" + fileName;
uploadManager.put(file, files, stsCredentialsBean, (key, info, response) -> {
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
dimessLoadingDialog();
if (info != null && info.isOK()) {
// 上传成功
outputStrings.add(IMUIKitConfig.OSS_URL + files);
if (i == uris.size() - 1) {
sumbit();
} else {
toUpdateOssNew(i + 1);
}
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
}
}, options);
}
}
private void sumbit() {
List<MultipartBody.Part> map = new ArrayList<>();
for (int i = 0; i < outputStrings.size(); i++) {
MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("screenshot" + (i + 1), outputStrings.get(i));
map.add(imageBodyPart);
}
Api.getInstance().report(map)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result>() {
@Override
public void onSuccess(Result feedbackResp) {
dimessLoadingDialog();
if (feedbackResp.data != null) {
}
}
@Override
public void onError(int code, String msg) {
dimessLoadingDialog();
LogUtils.i("获取到的错误:" + code + "" + msg);
ToastX.showShortToast(msg);
}
});
}
LoadingDialog loadingDialog;
public void showLoadingDialog() {
if (loadingDialog == null)
loadingDialog = new LoadingDialog(this);
loadingDialog.show();
}
public void showLoadingDialog(String msg) {
if (loadingDialog == null)
loadingDialog = new LoadingDialog(this);
loadingDialog.setLoadingText(msg);
loadingDialog.show();
}
public void dimessLoadingDialog() {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
private void initAdapter() {
uriStrings = getList(uriStrings);
viewBinding.recylerview1.setLayoutManager(new GridLayoutManager(this, 3));
commonAdapter = new CommonAdapter<>(this, R.layout.item_post_circle, uriStrings) {
@Override
public void convert(ViewHolder holder, String s, int index) {
if (uriStrings.get(index).equals("add")) {
holder.getView(R.id.item_image_iv).setVisibility(View.GONE);
holder.getView(R.id.item_image_iv1).setVisibility(View.VISIBLE);
holder.getView(R.id.colose_iv).setVisibility(View.GONE);
} else {
holder.getView(R.id.item_image_iv).setVisibility(View.VISIBLE);
holder.getView(R.id.item_image_iv1).setVisibility(View.GONE);
holder.getView(R.id.colose_iv).setVisibility(View.VISIBLE);
Glide.with(SumbitUsdtActivity.this).load(uris.get(index)).into((CircleImageView) holder.getView(R.id.item_image_iv));
}
holder.getView(R.id.item_image_iv1).setOnClickListener(v -> {
if (uriStrings.get(index).equals("add")) {
addPic();
}
});
holder.getView(R.id.colose_iv).setOnClickListener(v -> {
uris.remove(index);
localMedias.remove(index);
viewBinding.tupianzhenmingTv.setText("上传充值截图（"+uris.size()+"/5）");
uriStrings.remove(index);
if (uris.size() == 4 || uriStrings.size() == 0) {
uriStrings = getList(uriStrings);
}
notifyDataSetChanged();
});
}
};
viewBinding.recylerview1.setAdapter(commonAdapter);
}
private void addPic() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
if (PermissionUtils.hasPermissions(
SumbitUsdtActivity.this, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)) {
startPickMedia();
} else {
requestCameraPermission();
}
} else {
if (PermissionUtils.hasPermissions(
SumbitUsdtActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
startPickMedia();
} else {
requestCameraPermission(
Manifest.permission.READ_EXTERNAL_STORAGE);
}
}
}
protected ActivityResultLauncher<String[]> permissionLauncher;
PermissionExplainDialog permissionExplainDialog;
private void requestCameraPermission(String permission) {
permissionExplainDialog = new PermissionExplainDialog(this, getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_title), getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_content));
permissionExplainDialog.show();
permissionLauncher.launch(new String[]{permission});
}
private void requestCameraPermission() {
permissionExplainDialog = new PermissionExplainDialog(this, getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_title), getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_storage_content));
permissionExplainDialog.show();
permissionLauncher.launch(new String[]{Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO});
}
protected void startPickMedia() {
// pickMediaLauncher.launch("image/*;video/*");
TitleBarStyle whiteTitleBarStyle = new TitleBarStyle();
whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
whiteTitleBarStyle.setTitleDrawableRightResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.ic_orange_arrow_down);
whiteTitleBarStyle.setTitleLeftBackResource(com.netease.yunxin.kit.common.ui.R.drawable.ic_back);
whiteTitleBarStyle.setTitleTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_black));
whiteTitleBarStyle.setTitleCancelTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
whiteTitleBarStyle.setDisplayTitleBarLine(true);
BottomNavBarStyle whiteBottomNavBarStyle = new BottomNavBarStyle();
whiteBottomNavBarStyle.setBottomNarBarBackgroundColor(Color.parseColor("#FFFFFF"));
whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
whiteBottomNavBarStyle.setBottomPreviewNormalTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
whiteBottomNavBarStyle.setCompleteCountTips(false);
whiteBottomNavBarStyle.setBottomEditorTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
whiteBottomNavBarStyle.setBottomOriginalTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
SelectMainStyle selectMainStyle = new SelectMainStyle();
selectMainStyle.setStatusBarColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
selectMainStyle.setDarkStatusBarBlack(true);
selectMainStyle.setSelectNormalTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
selectMainStyle.setSelectTextColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
selectMainStyle.setPreviewSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_demo_white_preview_selector);
selectMainStyle.setSelectBackground(com.netease.yunxin.kit.chatkit.ui.R.drawable.ps_checkbox_selector);
// selectMainStyle.setSelectText(R.string.ps_done_front_num);
selectMainStyle.setMainListBackgroundColor(ContextCompat.getColor(SumbitUsdtActivity.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
PictureSelectorStyle selectorStyle = new PictureSelectorStyle();
selectorStyle.setTitleBarStyle(whiteTitleBarStyle);
selectorStyle.setBottomBarStyle(whiteBottomNavBarStyle);
selectorStyle.setSelectMainStyle(selectMainStyle);
PictureSelector.create(this)
.openGallery(SelectMimeType.ofImage())
.setImageEngine(GlideEngine.createGlideEngine())
.setMaxSelectNum(5-localMedias.size())
// .setMaxVideoSelectNum(9)
.setSelectorUIStyle(selectorStyle)
.forResult(new OnResultCallbackListener<>() {
@Override
public void onResult(ArrayList<LocalMedia> result) {
if (uriStrings.size() > 1) {
uriStrings.remove(uriStrings.size() - 1);
// uriStrings.addAll(Matisse.obtainPathResult(data));
// uris.addAll(Matisse.obtainResult(data));
localMedias.addAll(result);
for (int i = 0; i < result.size(); ++i) {
Uri uri = Uri.parse(result.get(i).getAvailablePath());
uris.add(uri);
uriStrings.add(result.get(i).getAvailablePath());
}
} else {
uris.clear();
uriStrings.clear();
localMedias = result;
for (int i = 0; i < result.size(); ++i) {
Uri uri = Uri.parse(result.get(i).getAvailablePath());
uris.add(uri);
uriStrings.add(result.get(i).getAvailablePath());
}
}
// viewBinding.tupianzhenmingTv.setText(String.format(getString(R.string.tupianzhengming_txt), localMedias.size()));
viewBinding.tupianzhenmingTv.setText("上传充值截图（"+localMedias.size()+"/5）");
getList(uriStrings);
commonAdapter.setDates(uriStrings);
}
@Override
public void onCancel() {
}
});
}
private List<String> getList(List<String> list) {
if (list == null) {
list = new ArrayList<>();
}
if (list.size() < 5) {
list.add("add");
}
return list;
}
public boolean onTouchEvent(MotionEvent event) {
if(null != this.getCurrentFocus()){
/**
* 点击空白位置 隐藏软键盘
*/
InputMethodManager mInputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
return mInputMethodManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);
}
return super .onTouchEvent(event);
}
}

61
app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java → app/src/main/java/com/hbl/yuliao/wallet/TiXianActivity.java
View File

@@ -1,7 +1,8 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Paint;
import android.net.Uri;
import android.os.Bundle;
import android.text.Editable;
@@ -20,34 +21,34 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityTixianBinding;
import com.hbl.lewan.databinding.ActivityTopupBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.PayDialog;
import com.hbl.lewan.dialog.SelectBanksDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BankBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.ExchangeConfBean;
import com.hbl.lewan.model.InstallmentBean;
import com.hbl.lewan.model.PayInfoWxBean;
import com.hbl.lewan.model.SendOrderBean;
import com.hbl.lewan.model.TiXianConfBean;
import com.hbl.lewan.model.TopUpBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityTixianBinding;
import com.hbl.yuliao.databinding.ActivityTopupBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.dialog.PayDialog;
import com.hbl.yuliao.dialog.SelectBanksDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BankBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.ExchangeConfBean;
import com.hbl.yuliao.model.InstallmentBean;
import com.hbl.yuliao.model.PayInfoWxBean;
import com.hbl.yuliao.model.SendOrderBean;
import com.hbl.yuliao.model.TiXianConfBean;
import com.hbl.yuliao.model.TopUpBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
@@ -92,6 +93,8 @@ public class TiXianActivity extends BaseActivity {
getWallet();
getBankList();
authPayInfo();
viewBinding.allTxTv.setPaintFlags(viewBinding.allTxTv.getPaintFlags()| Paint.UNDERLINE_TEXT_FLAG);
}

6
app/src/main/java/com/hbl/lewan/wallet/TiXianLogActivity.java → app/src/main/java/com/hbl/yuliao/wallet/TiXianLogActivity.java
View File

@@ -1,12 +1,12 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityTixianLogBinding;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityTixianLogBinding;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
public class TiXianLogActivity extends BaseActivity {

28
app/src/main/java/com/hbl/lewan/wallet/ToBindWeChatOrAliPayActivity.java → app/src/main/java/com/hbl/yuliao/wallet/ToBindWeChatOrAliPayActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.os.Bundle;
@@ -8,19 +8,19 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityShimingBinding;
import com.hbl.lewan.databinding.ActivityToBindWechatAlipayBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.PayInfoWxBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityShimingBinding;
import com.hbl.yuliao.databinding.ActivityToBindWechatAlipayBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.PayInfoWxBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

214
app/src/main/java/com/hbl/lewan/wallet/TopUpActivity.java → app/src/main/java/com/hbl/yuliao/wallet/TopUpActivity.java
View File

@@ -1,5 +1,6 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
@@ -10,7 +11,9 @@ import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
@@ -18,29 +21,32 @@ import androidx.core.graphics.drawable.DrawableCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityTopupBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.ChongZhiQuDaoBean;
import com.hbl.lewan.model.ExchangeConfBean;
import com.hbl.lewan.model.InstallmentBean;
import com.hbl.lewan.model.SendOrderBean;
import com.hbl.lewan.model.SeqBean;
import com.hbl.lewan.model.SeqBeanTop;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityTopupBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.ChongZhiQuDaoBean;
import com.hbl.yuliao.model.ExchangeConfBean;
import com.hbl.yuliao.model.InstallmentBean;
import com.hbl.yuliao.model.SendOrderBean;
import com.hbl.yuliao.model.SeqBean;
import com.hbl.yuliao.model.SeqBeanTop;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
@@ -62,7 +68,7 @@ public class TopUpActivity extends BaseActivity {
private List<SeqBean> globalAmountList = new ArrayList<>();
private List<ChongZhiQuDaoBean> installmentBeans = new ArrayList<>();
CommonAdapter commonAdapter;
CommonAdapter installmentAdapter;
// CommonAdapter installmentAdapter;
int defaultIndex = 0; //输入的金额
private boolean isFenqi = false;
private int installmentNum; //分期數
@@ -114,16 +120,6 @@ public class TopUpActivity extends BaseActivity {
public void setSelector(boolean fenqi) {
isFenqi = fenqi;
// if (fenqi) {
//// viewBinding.tvPaytypeCard.setCompoundDrawablesWithIntrinsicBounds(null, null, getResources().getDrawable(R.mipmap.dialog_gou_ff), null);
//// viewBinding.tvPaytypeFenqi.setCompoundDrawablesWithIntrinsicBounds(null, null, getResources().getDrawable(R.mipmap.ic_single_selected), null);
// } else {
// viewBinding.tvPaytypeCard.setCompoundDrawablesWithIntrinsicBounds(null, null, getResources().getDrawable(R.mipmap.ic_single_selected), null);
// viewBinding.tvPaytypeFenqi.setCompoundDrawablesWithIntrinsicBounds(null, null, getResources().getDrawable(R.mipmap.dialog_gou_ff), null);
installmentNum = 0;
if (installmentAdapter != null)
installmentAdapter.notifyDataSetChanged();
// }
}
@Override
@@ -151,116 +147,9 @@ public class TopUpActivity extends BaseActivity {
}
private void getFee() {
// Map<String, Object> params = new HashMap<>();
// params.put("amount", defaultIndex);
Api.getInstance().chargeChannels(defaultIndex)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<List<ChongZhiQuDaoBean>> feedbackResp) {
// LogUtils.i("获取到的数据：" + feedbackResp.data);
installmentBeans.clear();
if (feedbackResp.data != null && feedbackResp.data.size() > 0) {
installmentBeans.addAll(feedbackResp.data);
installmentNum = 0;
}
installmentAdapter.notifyDataSetChanged();
}
@Override
public void onError(int code, String msg) {
LogUtils.i("获取到的错误:" + code + "" + msg);
}
});
}
//
// private void payInstallment(int installment) {
// if (exchangeConfBean != null) {
// if ((defaultIndex < exchangeConfBean.getMinAmount()) || (defaultIndex > exchangeConfBean.getMaxAmount())) {
// ToastUtils.showShort(String.format(getString(R.string.taixiao_topup_txt), exchangeConfBean.getMinAmount() / exchangeConfBean.getExchangeRatio(), exchangeConfBean.getMaxAmount() / exchangeConfBean.getExchangeRatio()));
// return;
// }
// Map<String, Object> maps = new HashMap<>();
// maps.put("amount", defaultIndex);
// maps.put("type", 5);
// maps.put("installment", installment);
// Api.getInstance().payInstallment(maps)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<>() {
// @Override
// public void onSuccess(Result<String> feedbackResp) {
// LogUtils.i("获取到的数据：" + feedbackResp.data);
// if (!TextUtils.isEmpty(feedbackResp.data)) {
//// String packageName = "com.chailease.tw.app.android.ccfappcust.uat"; // 目标应用的包名
//// PackageManager packageManager = getPackageManager();
//// Intent intent = new Intent();
//// intent = packageManager.getLaunchIntentForPackage(packageName);
//// intent.setData(Uri.parse(feedbackResp.data));
//// if (intent == null) {
//// ToastUtils.showShort("请安装银角零卡APP");
//// } else {
//// startActivity(intent);
//// }
// Intent intent = new Intent(Intent.ACTION_VIEW);
// intent.setData(Uri.parse(feedbackResp.data));
// startActivity(intent);
//// Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(feedbackResp.data));
//// startActivity(intent);
//// BrowseActivity.Companion.launch(
//// TopUpActivity.this, getString(R.string.cash_cuzhi_txt), feedbackResp.data);
//// startActivity(new Intent(TopUpActivity.this, PayWebActivity.class).putExtra("url", feedbackResp.data));
//
// }
// }
//
// @Override
// public void onError(int code, String msg) {
// LogUtils.i("获取到的错误:" + code + "" + msg);
// }
// });
// }
//
// }
protected void initView() {
viewBinding.titlebar.getBackImageView().setOnClickListener(v -> finish());
iniAdapter();
GridLayoutManager linearLayoutManager = new GridLayoutManager(TopUpActivity.this,3);
viewBinding.recyclerInstallment.setLayoutManager(linearLayoutManager);
installmentAdapter = new CommonAdapter<ChongZhiQuDaoBean>(TopUpActivity.this, R.layout.item_bill_installment, installmentBeans) {
@Override
public void convert(ViewHolder holder, ChongZhiQuDaoBean s, int index) {
TextView titleTv = holder.getView(R.id.title_tv);
// TextView desTv = holder.getView(R.id.des_tv);
titleTv.setText(s.getChannel());
// desTv.setText(getString(R.string.str_installment_tips, s.getAmount()));
LinearLayout big_bg = holder.getView(R.id.big_bg);
// if (s.getPeriodCount() == installmentNum) {
// titleTv.setTextColor(Color.parseColor("#FF9C32"));
// desTv.setTextColor(Color.parseColor("#FF9C32"));
// big_bg.setBackgroundResource(R.drawable.logout_btn_main2);
// } else {
// titleTv.setTextColor(getColor(R.color.color_333333));
// desTv.setTextColor(getColor(R.color.color_333333));
// big_bg.setBackgroundResource(R.drawable.input_bg_t);
// }
//
big_bg.setOnClickListener(v -> {
// installmentNum = s.getPeriodCount();
notifyDataSetChanged();
// viewBinding.tvCashvalue.setText("NT$:" + (defaultIndex + s.getAmount()));
setSelector(true);
sumbit(s);
});
}
};
viewBinding.recyclerInstallment.setAdapter(installmentAdapter);
viewBinding.editQueryEt.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -274,6 +163,7 @@ public class TopUpActivity extends BaseActivity {
} else {
defaultIndex = Integer.parseInt(viewBinding.editQueryEt.getText().toString().trim());
}
commonAdapter.notifyDataSetChanged();
showBottomType();
}
@@ -283,6 +173,22 @@ public class TopUpActivity extends BaseActivity {
// commonAdapter.notifyDataSetChanged();
}
});
viewBinding.usdtAddrTv.setOnClickListener(v -> {
DataUtils.copy(viewBinding.usdtAddrTv.getText().toString().trim(), TopUpActivity.this);
ToastX.showShortToast(R.string.fuzhichenggong_txt);
});
viewBinding.sumbitBt.setOnClickListener(v ->{
if(defaultIndex==0){
ToastX.showShortToast("请先选择充值金额");
return;
}
// launchTRC20Wallet(TopUpActivity.this,"TSkB56Bib6iihk6zsUDfwgyXBqvkDvFzBz",defaultIndex+"");
Intent intent = new Intent(TopUpActivity.this,SumbitUsdtActivity.class);
intent.putExtra("number",defaultIndex);
startActivity(intent);
} );
// AnimUtil.setAnimViews(viewBinding.topupTv);
// viewBinding.topupTv.setOnClickListener(v -> {
@@ -318,11 +224,27 @@ public class TopUpActivity extends BaseActivity {
}
public static void launchTRC20Wallet(Context context, String walletAddress, String amount) {
// 假设目标钱包的URI scheme是 trc20wallet://
String deepLink = "trc20wallet://transfer?address=" + walletAddress + "&amount=" + amount;
try {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(deepLink));
context.startActivity(intent);
} catch (Exception e) {
// 钱包未安装或者URI scheme不正确，弹出提示
Toast.makeText(context, "请先安装TRC20钱包应用", Toast.LENGTH_SHORT).show();
// 可以考虑跳转到应用商店下载
// Intent marketIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=YOUR_WALLET_PACKAGE_NAME"));
// context.startActivity(marketIntent);
}
}
private void showBottomType() {
// setFenqiView(false);
// if (defaultIndex >= 1000) {
// setFenqiView(true);
getFee();
// getFee();
// }
}
@@ -400,16 +322,20 @@ public class TopUpActivity extends BaseActivity {
public void convert(ViewHolder holder, SeqBean s, int index) {
holder.setText(R.id.title_tv, String.format("%d", s.getGoldAmount()));
// holder.setText(R.id.des_tv, String.format("NT$ %d", s.getNtAmount()));
LinearLayout big_bg = holder.getView(R.id.big_bg);
RelativeLayout big_bg = holder.getView(R.id.big_bg);
if (s.getGoldAmount() == defaultIndex) {
big_bg.setBackgroundResource(R.drawable.logout_btn_main2);
big_bg.setBackgroundResource(R.drawable.logout_btn_main2_new);
holder.getView(R.id.gou_iv).setVisibility(View.VISIBLE);
} else {
big_bg.setBackgroundResource(R.drawable.input_bg_t);
holder.getView(R.id.gou_iv).setVisibility(View.GONE);
}
big_bg.setOnClickListener(v -> {
// viewBinding.editQueryEt.setText("");
defaultIndex = s.getGoldAmount();
viewBinding.editQueryEt.setText(defaultIndex+"");
// viewBinding.editQueryEt.clearFocus();
notifyDataSetChanged();
showBottomType();

38
app/src/main/java/com/hbl/lewan/wallet/TopUpReusltActivity.java → app/src/main/java/com/hbl/yuliao/wallet/TopUpReusltActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.net.Uri;
@@ -15,24 +15,24 @@ import androidx.recyclerview.widget.GridLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.ActivityTopupBinding;
import com.hbl.lewan.databinding.ActivityTopupResultBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.SendOrderBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.ActivityTopupBinding;
import com.hbl.yuliao.databinding.ActivityTopupResultBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.SendOrderBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

62
app/src/main/java/com/hbl/lewan/wallet/WalletFragment.java → app/src/main/java/com/hbl/yuliao/wallet/WalletFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.os.Bundle;
@@ -16,36 +16,36 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.contact.UserInfoActivity;
import com.hbl.lewan.databinding.FragmentVoomBinding;
import com.hbl.lewan.databinding.FragmentWalletBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.game.JsBridgeActivity;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.main.mine.setting.SettingNewActivity;
import com.hbl.lewan.model.AuthorizeBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.GameBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.StaffServiceIdBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.CircleFragment;
import com.hbl.lewan.voom.MessageActivity;
import com.hbl.lewan.voom.PushActivity;
import com.hbl.lewan.voom.comm.CircleFragment1;
import com.hbl.lewan.voom.comm.CircleFragment2;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.contact.UserInfoActivity;
import com.hbl.yuliao.databinding.FragmentVoomBinding;
import com.hbl.yuliao.databinding.FragmentWalletBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.game.JsBridgeActivity;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.main.mine.setting.SettingNewActivity;
import com.hbl.yuliao.model.AuthorizeBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.GameBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.StaffServiceIdBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.CircleFragment;
import com.hbl.yuliao.voom.MessageActivity;
import com.hbl.yuliao.voom.PushActivity;
import com.hbl.yuliao.voom.comm.CircleFragment1;
import com.hbl.yuliao.voom.comm.CircleFragment2;
import com.google.android.material.tabs.TabLayoutMediator;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;

34
app/src/main/java/com/hbl/lewan/wallet/WalletFragmentBf.java → app/src/main/java/com/hbl/yuliao/wallet/WalletFragmentBf.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.os.Bundle;
@@ -13,22 +13,22 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentWalletBfBinding;
import com.hbl.lewan.databinding.FragmentWalletBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.main.mine.setting.SettingNewActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.FragmentWalletBfBinding;
import com.hbl.yuliao.databinding.FragmentWalletBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.main.mine.setting.SettingNewActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

36
app/src/main/java/com/hbl/lewan/wallet/WalletInfoActivity.java → app/src/main/java/com/hbl/yuliao/wallet/WalletInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.graphics.drawable.Drawable;
@@ -9,23 +9,23 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityWalletInfoBinding;
import com.hbl.lewan.databinding.ActivityWalletInfoNewBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.main.mine.MineFragment;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.CollectionAndPaymentActivity;
import com.hbl.lewan.pay.LipinDuiHuanActivity;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityWalletInfoBinding;
import com.hbl.yuliao.databinding.ActivityWalletInfoNewBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.main.mine.MineFragment;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.CollectionAndPaymentActivity;
import com.hbl.yuliao.pay.LipinDuiHuanActivity;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

50
app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java → app/src/main/java/com/hbl/yuliao/wallet/WalletInfoFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import static android.widget.RelativeLayout.END_OF;
import static android.widget.RelativeLayout.START_OF;
@@ -26,31 +26,31 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.custom.CustomDatePickerNew1;
import com.hbl.lewan.databinding.FragmentWalletInfoBinding;
import com.hbl.lewan.dialog.SelectTypeDialog;
import com.hbl.lewan.model.BillBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.RosterElementEntity;
import com.hbl.lewan.model.StatisticsBean;
import com.hbl.lewan.model.TaskBean;
import com.hbl.lewan.model.TypeBean;
import com.hbl.lewan.model.WithdrawCashBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.voom.MessageActivity;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.custom.CustomDatePickerNew1;
import com.hbl.yuliao.databinding.FragmentWalletInfoBinding;
import com.hbl.yuliao.dialog.SelectTypeDialog;
import com.hbl.yuliao.model.BillBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.RosterElementEntity;
import com.hbl.yuliao.model.StatisticsBean;
import com.hbl.yuliao.model.TaskBean;
import com.hbl.yuliao.model.TypeBean;
import com.hbl.yuliao.model.WithdrawCashBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.voom.MessageActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;

42
app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment1.java → app/src/main/java/com/hbl/yuliao/wallet/WalletInfoFragment1.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.os.Bundle;
import android.text.TextUtils;
@@ -13,26 +13,26 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentWalletInfo1Binding;
import com.hbl.lewan.databinding.FragmentWalletInfoBinding;
import com.hbl.lewan.dialog.SelectTypeDialog;
import com.hbl.lewan.model.BillBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.StatisticsBean;
import com.hbl.lewan.model.TaskBean;
import com.hbl.lewan.model.TypeBean;
import com.hbl.lewan.model.WithdrawCashBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentWalletInfo1Binding;
import com.hbl.yuliao.databinding.FragmentWalletInfoBinding;
import com.hbl.yuliao.dialog.SelectTypeDialog;
import com.hbl.yuliao.model.BillBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.StatisticsBean;
import com.hbl.yuliao.model.TaskBean;
import com.hbl.yuliao.model.TypeBean;
import com.hbl.yuliao.model.WithdrawCashBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;

32
app/src/main/java/com/hbl/lewan/wallet/WalletInfoNewActivity.java → app/src/main/java/com/hbl/yuliao/wallet/WalletInfoNewActivity.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.graphics.drawable.Drawable;
@@ -9,21 +9,21 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityWalletInfoNew1Binding;
import com.hbl.lewan.databinding.ActivityWalletInfoNewBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.pay.LipinDuiHuanActivity;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityWalletInfoNew1Binding;
import com.hbl.yuliao.databinding.ActivityWalletInfoNewBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.pay.LipinDuiHuanActivity;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

56
app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedActivity.java → app/src/main/java/com/hbl/yuliao/wallet/WalletInfoRedActivity.java
View File

@@ -1,7 +1,8 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.content.Intent;
import android.os.Bundle;
import android.text.Html;
import android.text.TextUtils;
import android.view.View;
@@ -9,24 +10,24 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.viewpager2.widget.ViewPager2;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommunityAdapter;
import com.hbl.lewan.custom.CustomDatePickerNew;
import com.hbl.lewan.custom.CustomDatePickerNew1;
import com.hbl.lewan.databinding.ActivityWalletInfoNew1Binding;
import com.hbl.lewan.databinding.ActivityWalletInfoRedBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
import com.hbl.lewan.model.BillBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommunityAdapter;
import com.hbl.yuliao.custom.CustomDatePickerNew;
import com.hbl.yuliao.custom.CustomDatePickerNew1;
import com.hbl.yuliao.databinding.ActivityWalletInfoNew1Binding;
import com.hbl.yuliao.databinding.ActivityWalletInfoRedBinding;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.main.mine.ChangeAccoutActionActivity;
import com.hbl.yuliao.model.BillBean;
import com.hbl.yuliao.model.BindBean;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.AvatarColor;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
@@ -86,13 +87,18 @@ public class WalletInfoRedActivity extends BaseActivity {
}
public void setReceive(Integer redPkgCount,Integer redPkgAmount){
viewBinding.shoubaoCountTv.setText(""+(redPkgCount==null?0:redPkgCount));
// viewBinding.shoubaoCountTv.setText(""+(redPkgCount==null?0:redPkgCount));
viewBinding.shoubaoCountTv.setText(Html.fromHtml("累计收到<font color = '#FF4E54'> "+(redPkgCount==null?0:redPkgCount)+" </font>个红包"));
viewBinding.shoubaoAmoutTv.setText(""+(redPkgAmount==null?0:AppUtils.getQian(redPkgAmount)));
}
public void setSend(Integer redPkgCount,Integer redPkgAmount){
viewBinding.fabaoCountTv.setText(""+(redPkgCount==null?0:redPkgCount));
// viewBinding.fabaoCountTv.setText(""+(redPkgCount==null?0:redPkgCount));
viewBinding.fabaoCountTv.setText(Html.fromHtml("累计发出<font color = '#FF4E54'> "+(redPkgCount==null?0:redPkgCount)+" </font>个红包"));
viewBinding.fabaoAmoutTv.setText(""+(redPkgAmount==null?0:AppUtils.getQian(redPkgAmount)));
}
private void initViewPager() {
@@ -189,15 +195,15 @@ public class WalletInfoRedActivity extends BaseActivity {
private void changeType(int i) {
switch (i) {
case 0:
viewBinding.linelastTv.setTextColor(getResources().getColor(R.color.black));
viewBinding.linecollectionTv.setTextColor(getResources().getColor(R.color.color_7f7b81));
viewBinding.linelastTv.setTextColor(getResources().getColor(R.color.color_2c2c2c));
viewBinding.linecollectionTv.setTextColor(getResources().getColor(R.color.color_2c2c2c));
viewBinding.linelastV.setVisibility(View.VISIBLE);
viewBinding.linecollectionV.setVisibility(View.INVISIBLE);
break;
case 1:
viewBinding.linecollectionTv.setTextColor(getResources().getColor(R.color.black));
viewBinding.linelastTv.setTextColor(getResources().getColor(R.color.color_7f7b81));
viewBinding.linecollectionTv.setTextColor(getResources().getColor(R.color.color_2c2c2c));
viewBinding.linelastTv.setTextColor(getResources().getColor(R.color.color_2c2c2c));
viewBinding.linelastV.setVisibility(View.INVISIBLE);
viewBinding.linecollectionV.setVisibility(View.VISIBLE);

48
app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java → app/src/main/java/com/hbl/yuliao/wallet/WalletInfoRedFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
@@ -20,29 +20,29 @@ import androidx.annotation.Nullable;
import androidx.core.text.HtmlCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.databinding.FragmentWalletInfoBinding;
import com.hbl.lewan.databinding.FragmentWalletInfoNewBinding;
import com.hbl.lewan.dialog.SelectTypeDialog;
import com.hbl.lewan.model.BillBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.RedBean;
import com.hbl.lewan.model.RedLogBean;
import com.hbl.lewan.model.StatisticsBean;
import com.hbl.lewan.model.TaskBean;
import com.hbl.lewan.model.TypeBean;
import com.hbl.lewan.model.WithdrawCashBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.databinding.FragmentWalletInfoBinding;
import com.hbl.yuliao.databinding.FragmentWalletInfoNewBinding;
import com.hbl.yuliao.dialog.SelectTypeDialog;
import com.hbl.yuliao.model.BillBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.RedBean;
import com.hbl.yuliao.model.RedLogBean;
import com.hbl.yuliao.model.StatisticsBean;
import com.hbl.yuliao.model.TaskBean;
import com.hbl.yuliao.model.TypeBean;
import com.hbl.yuliao.model.WithdrawCashBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;

14
app/src/main/java/com/hbl/lewan/wallet/WalletInfoTongBiActivity.java → app/src/main/java/com/hbl/yuliao/wallet/WalletInfoTongBiActivity.java
View File

@@ -1,16 +1,16 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityWalletInfoTbBinding;
import com.hbl.lewan.model.WalletBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityWalletInfoTbBinding;
import com.hbl.yuliao.model.WalletBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

50
app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java → app/src/main/java/com/hbl/yuliao/wallet/WalletInfologFragment.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wallet;
package com.hbl.yuliao.wallet;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
@@ -19,30 +19,30 @@ import androidx.annotation.Nullable;
import androidx.core.text.HtmlCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.custom.CustomDatePickerNew1;
import com.hbl.lewan.databinding.FragmentWalletInfoBinding;
import com.hbl.lewan.databinding.FragmentWalletInfoLogBinding;
import com.hbl.lewan.dialog.SelectTypeDialog;
import com.hbl.lewan.model.BillBean;
import com.hbl.lewan.model.ChongZhiLogBean;
import com.hbl.lewan.model.ListBeanResult;
import com.hbl.lewan.model.StatisticsBean;
import com.hbl.lewan.model.TaskBean;
import com.hbl.lewan.model.TiXianLogBean;
import com.hbl.lewan.model.TypeBean;
import com.hbl.lewan.model.WithdrawCashBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AppUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.custom.CustomDatePickerNew1;
import com.hbl.yuliao.databinding.FragmentWalletInfoBinding;
import com.hbl.yuliao.databinding.FragmentWalletInfoLogBinding;
import com.hbl.yuliao.dialog.SelectTypeDialog;
import com.hbl.yuliao.model.BillBean;
import com.hbl.yuliao.model.ChongZhiLogBean;
import com.hbl.yuliao.model.ListBeanResult;
import com.hbl.yuliao.model.StatisticsBean;
import com.hbl.yuliao.model.TaskBean;
import com.hbl.yuliao.model.TiXianLogBean;
import com.hbl.yuliao.model.TypeBean;
import com.hbl.yuliao.model.WithdrawCashBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AppUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;

10
app/src/main/java/com/hbl/lewan/welcome/ServerActivity.java → app/src/main/java/com/hbl/yuliao/welcome/ServerActivity.java
View File

@@ -2,17 +2,17 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.welcome;
package com.hbl.yuliao.welcome;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.view.LayoutInflater;
import androidx.annotation.Nullable;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ServerConfigActivityBinding;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ServerConfigActivityBinding;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.CommonConfirmDialog;

52
app/src/main/java/com/hbl/lewan/welcome/WelcomeActivity.java → app/src/main/java/com/hbl/yuliao/welcome/WelcomeActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.hbl.lewan.welcome;
package com.hbl.yuliao.welcome;
import static com.blankj.utilcode.util.SnackbarUtils.dismiss;
@@ -31,31 +31,31 @@ import androidx.annotation.Nullable;
import androidx.core.view.WindowCompat;
import com.bumptech.glide.Glide;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.login.ChongZhiActivity;
import com.hbl.lewan.login.LoginActivity;
import com.hbl.lewan.login.PhoneLoginActivity;
import com.hbl.lewan.login.RegisterActivity;
import com.hbl.lewan.main.mine.UserHeadEditActivity;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.NotifyCountBean;
import com.hbl.lewan.network.Api;
import com.hbl.lewan.network.ApiService;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
import com.hbl.lewan.utils.AnimUtil;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.PaySettingActivity;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.dialog.ActionConfirmDialog;
import com.hbl.yuliao.login.ChongZhiActivity;
import com.hbl.yuliao.login.LoginActivity;
import com.hbl.yuliao.login.PhoneLoginActivity;
import com.hbl.yuliao.login.RegisterActivity;
import com.hbl.yuliao.main.mine.UserHeadEditActivity;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.NotifyCountBean;
import com.hbl.yuliao.network.Api;
import com.hbl.yuliao.network.ApiService;
import com.hbl.yuliao.network.BaseObserver;
import com.hbl.yuliao.network.Result;
import com.hbl.yuliao.utils.AnimUtil;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.wallet.PaySettingActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityWelcomeBinding;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.utils.Constant;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.yuliao.IMApplication;
import com.hbl.yuliao.R;
import com.hbl.yuliao.databinding.ActivityWelcomeBinding;
import com.hbl.yuliao.main.MainActivity;
import com.hbl.yuliao.utils.Constant;
import com.hbl.yuliao.utils.DataUtils;
import com.netease.nimlib.sdk.mixpush.MixPushService;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -103,7 +103,9 @@ public class WelcomeActivity extends BaseActivity {
IMApplication.setColdStart(true);
activityWelcomeBinding = ActivityWelcomeBinding.inflate(getLayoutInflater());
setContentView(activityWelcomeBinding.getRoot());
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
// getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
Uri uri = getIntent().getData();
getScheme(uri);

2
app/src/main/java/com/hbl/lewan/widget/BezierCircleHeader.java → app/src/main/java/com/hbl/yuliao/widget/BezierCircleHeader.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.widget;
package com.hbl.yuliao.widget;
import android.animation.ValueAnimator;

4
app/src/main/java/com/hbl/lewan/widget/CircleImageView.java → app/src/main/java/com/hbl/yuliao/widget/CircleImageView.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.widget;
package com.hbl.yuliao.widget;
import android.annotation.SuppressLint;
import android.content.Context;
@@ -17,7 +17,7 @@ import android.view.MotionEvent;
import androidx.appcompat.widget.AppCompatImageView;
import com.hbl.lewan.R;
import com.hbl.yuliao.R;
public class CircleImageView extends AppCompatImageView {

2
app/src/main/java/com/hbl/lewan/widget/GridItemDecoration.java → app/src/main/java/com/hbl/yuliao/widget/GridItemDecoration.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.widget;
package com.hbl.yuliao.widget;
import android.graphics.Rect;
import android.view.View;

2
app/src/main/java/com/hbl/lewan/widget/StatusLayout.java → app/src/main/java/com/hbl/yuliao/widget/StatusLayout.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.widget;
package com.hbl.yuliao.widget;
import android.content.Context;
import android.util.AttributeSet;

6
app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java → app/src/main/java/com/hbl/yuliao/wxapi/WXEntryActivity.java
View File

@@ -1,12 +1,12 @@
//package com.hbl.lewan.wxapi;
//package com.hbl.yuliao.wxapi;
//
//import android.app.Activity;
//import android.content.Intent;
//import android.os.Bundle;
//import android.util.Log;
//
//import com.hbl.lewan.IMUIKitConfig;
//import com.hbl.lewan.wxapi.bean.WeiXin;
//import com.hbl.yuliao.IMUIKitConfig;
//import com.hbl.yuliao.wxapi.bean.WeiXin;
//import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
//import com.tencent.mm.opensdk.constants.ConstantsAPI;
//import com.tencent.mm.opensdk.modelbase.BaseReq;

6
app/src/main/java/com/hbl/lewan/wxapi/WXPayEntryActivity.java → app/src/main/java/com/hbl/yuliao/wxapi/WXPayEntryActivity.java
View File

@@ -1,12 +1,12 @@
//package com.hbl.lewan.wxapi;
//package com.hbl.yuliao.wxapi;
//
//import android.app.Activity;
//import android.content.Intent;
//import android.os.Bundle;
//import android.util.Log;
//
//import com.hbl.lewan.IMUIKitConfig;
//import com.hbl.lewan.wxapi.bean.WeiXin;
//import com.hbl.yuliao.IMUIKitConfig;
//import com.hbl.yuliao.wxapi.bean.WeiXin;
//import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
//import com.tencent.mm.opensdk.constants.ConstantsAPI;
//import com.tencent.mm.opensdk.modelbase.BaseReq;

2
app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXin.java → app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXin.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wxapi.bean;
package com.hbl.yuliao.wxapi.bean;
/**
* @create time 2017-09-14

2
app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinInfo.java → app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXinInfo.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wxapi.bean;
package com.hbl.yuliao.wxapi.bean;
/**
* @create time 2017-09-14

2
app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinToken.java → app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXinToken.java
View File

@@ -1,4 +1,4 @@
package com.hbl.lewan.wxapi.bean;
package com.hbl.yuliao.wxapi.bean;
/**
* Created by xx on 16/6/25.

24
app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java
View File

@@ -21,18 +21,18 @@ import androidx.annotation.RequiresApi;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.ToolKits;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.king.zxing.util.CodeUtils;
import com.netease.nimlib.sdk.NIMClient;

84
app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java
View File

@@ -1,6 +1,7 @@
package com.huawei.hms.hmsscankit;
import android.Manifest;
import android.annotation.SuppressLint;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build;
@@ -11,8 +12,10 @@ import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -23,19 +26,22 @@ import androidx.annotation.RequiresApi;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.adapter.CommonAdapter;
import com.hbl.lewan.adapter.ViewHolder;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.UserShareBean;
import com.hbl.lewan.utils.AdaptScreenUtils;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.hbl.lewan.utils.ToolKits;
import com.bumptech.glide.Glide;
import com.hbl.yuliao.IMUIKitConfig;
import com.hbl.yuliao.R;
import com.hbl.yuliao.adapter.CommonAdapter;
import com.hbl.yuliao.adapter.ViewHolder;
import com.hbl.yuliao.main.index.add.AddFriendsActivity;
import com.hbl.yuliao.model.LoginBean;
import com.hbl.yuliao.model.UserShareBean;
import com.hbl.yuliao.utils.AdaptScreenUtils;
import com.hbl.yuliao.utils.DataUtils;
import com.hbl.yuliao.utils.GsonUtils;
import com.hbl.yuliao.utils.LogUtils;
import com.hbl.yuliao.utils.ShareDateUtils;
import com.hbl.yuliao.utils.ToolKits;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.hbl.yuliao.widget.CircleImageView;
import com.king.zxing.util.CodeUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
@@ -61,7 +67,8 @@ import java.util.List;
public class MyScanKitActivity extends ScanKitActivity {
private ShareDateUtils shareDateUtils;
LoginBean loginBean;
FrameLayout qrRy;
LinearLayout qrRyt;
@Override
protected void onCreate(Bundle bundle) {
super.onCreate(bundle);
@@ -70,6 +77,8 @@ public class MyScanKitActivity extends ScanKitActivity {
shareDateUtils = new ShareDateUtils();
shareDateUtils.getAllSessionList();
showView();
qrRyt = findViewById(R.id.qr_ryt);
qrRy = findViewById(R.id.qr_ry);
}
private void showView() {
@@ -106,14 +115,16 @@ public class MyScanKitActivity extends ScanKitActivity {
private TextView copyTv;
private TextView shareTv;
private TextView saveTv;
private TextView shuaxinTv;
// private TextView shuaxinTv;
private CircleImageView userIv;
private TextView userTv;
@RequiresApi(api = Build.VERSION_CODES.M)
private void showQrcodeView() {
BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
// BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(this, R.style.BottomSheetDialog);
View bottomView = LayoutInflater.from(MyScanKitActivity.this).inflate(R.layout.bottom_sheet_qrcode_layout, null);
userIv = (CircleImageView) bottomView.findViewById(R.id.user_iv);
userTv = (TextView) bottomView.findViewById(R.id.user_tv);
coloseIv = (ImageView) bottomView.findViewById(R.id.colose_iv);
qrcodeLy = (LinearLayout) bottomView.findViewById(R.id.qrcode_ly);
qrcodeIv = (ImageView) bottomView.findViewById(R.id.qrcode_iv);
@@ -122,8 +133,13 @@ public class MyScanKitActivity extends ScanKitActivity {
copyTv = (TextView) bottomView.findViewById(R.id.copy_tv);
shareTv = (TextView) bottomView.findViewById(R.id.share_tv);
saveTv = (TextView) bottomView.findViewById(R.id.save_tv);
shuaxinTv = (TextView) bottomView.findViewById(R.id.shuaxin_tv);
// shuaxinTv = (TextView) bottomView.findViewById(R.id.shuaxin_tv);
LoginBean loginBean = DataUtils.getLocUserInfo();
userTv.setText(loginBean.getNickname()+"");
Glide.with(MyScanKitActivity.this).load(loginBean.getUserAvatarFileName()).into(userIv);
Bitmap bitmap = CodeUtils.createQRCode(String.format(IMUIKitConfig.SHARE_INVCODE1, IMKitClient.account()), DataUtils.dip2px(this, 175.0f), null);
if(loginBean!=null){
bitmap = CodeUtils.createQRCode(String.format(IMUIKitConfig.SHARE_ADD_USER,loginBean.getUser().getInviteCode(), IMKitClient.account()), DataUtils.dip2px(this, 175.0f), null);
@@ -132,17 +148,18 @@ public class MyScanKitActivity extends ScanKitActivity {
qrcodeIv.setImageBitmap(bitmap);
}
shuaxinTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ToastX.showShortToast(R.string.shuaxinchenggong_txt);
}
});
// shuaxinTv.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// ToastX.showShortToast(R.string.shuaxinchenggong_txt);
// }
// });
coloseIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
bottomSheetDialog.dismiss();
qrRy.removeAllViews();
qrRyt.setVisibility(View.GONE);
}
});
@@ -205,15 +222,22 @@ public class MyScanKitActivity extends ScanKitActivity {
}
});
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
bottomSheetDialog.setOnDismissListener(dialog -> getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white)));
AdaptScreenUtils.setWhiteNavigationBar(bottomSheetDialog);
qrRy.removeAllViews();
qrRy.addView(bottomView);
qrRyt.setVisibility(View.VISIBLE);
}
@Override
public void onBackPressed() {
if(qrRyt.getVisibility()==View.VISIBLE){
qrRy.removeAllViews();
qrRyt.setVisibility(View.GONE);
}else {
super.onBackPressed();
}
}
private void requestCameraPermission(String permission) {
Permission.requirePermissions(IMKitClient.getApplicationContext(), new String[]{permission})

959
app/src/main/java/io/agora/onetoone/Pure1v1LivingActivity.kt Normal file
View File

@@ -0,0 +1,959 @@
//package io.agora.onetoone
//
//import android.content.Context
//import android.content.Intent
//import android.os.Bundle
//import android.util.Log
//import android.view.LayoutInflater
//import android.view.View
//import android.widget.Toast
//import androidx.appcompat.app.AlertDialog
//import androidx.appcompat.app.AppCompatActivity
//import androidx.core.view.ViewCompat
//import androidx.core.view.WindowCompat
//import androidx.core.view.WindowInsetsCompat
//import androidx.core.view.isVisible
//import com.bumptech.glide.Glide
//import com.hbl.yuliao.main.MainActivity
//import com.netease.nim.highavailable.LogUtils
//import com.netease.yunxin.kit.corekit.im.model.UserInfo
//import com.netease.yunxin.kit.corekit.im.provider.FetchCallback
//import com.netease.yunxin.kit.corekit.im.repo.CommonRepo.getUserInfo
//import es.dmoral.toasty.Toasty
//import io.agora.onetoone.databinding.ActivityPure1v1Living1Binding
//import io.agora.onetoone.http.HttpManager
//import io.agora.onetoone.model.EnterRoomInfoModel
//import io.agora.onetoone.signalClient.*
//import io.agora.onetoone.utils.Ov1Logger
//import io.agora.onetoone.utils.PermissionHelp
//import io.agora.onetoone.utils.SPUtil
//import io.agora.rtc2.*
//import io.agora.rtc2.video.CameraCapturerConfiguration
//import io.agora.rtc2.video.VideoEncoderConfiguration
//
//class Pure1v1LivingActivity : AppCompatActivity(), ICallApiListener {
//
// companion object {
//
// const val KEY_ENTER_ROOM_MODEL = "KEY_ENTER_ROOM_MODEL"
//
// fun launch(
// context: Context,
// model: EnterRoomInfoModel,
// isVideo: Boolean,
// isOut: Boolean,
// toUserId: String
// ) {
// val intent = Intent(context, Pure1v1LivingActivity::class.java)
// val bundle = Bundle()
// bundle.putSerializable(KEY_ENTER_ROOM_MODEL, model)
// bundle.putBoolean("isVideo", isVideo)
// bundle.putBoolean("isOut", isOut)
// bundle.putString("toUserId", toUserId)
//
// intent.putExtras(bundle)
// context.startActivity(intent)
// }
//
// }
//
// private val kTargetUserId = "targetUserId"
//
// private val enterModel by lazy {
// val bundle = intent.extras
// bundle!!.getSerializable(KEY_ENTER_ROOM_MODEL) as EnterRoomInfoModel
// }
// private val isVideo by lazy {
// val bundle = intent.extras
// bundle!!.getBoolean("isVideo")
// }
//
// private val isOut by lazy {
// val bundle = intent.extras
// bundle!!.getBoolean("isOut")
// }
//
// private val toUserId by lazy {
// val bundle = intent.extras
// bundle!!.getString("toUserId") as String
// }
//
// var videoEncoderConfig: VideoEncoderConfiguration? = null
// public var connectedUserId: Int? = null
// private var connectedChannel: String? = null
//
// private val TAG = "SHENGWANG"
//
// private val mViewBinding by lazy {
// ActivityPure1v1Living1Binding.inflate(
// LayoutInflater.from(
// this
// )
// )
// }
//
// private lateinit var rtcEngine: RtcEngineEx
// public var rtmManager: CallRtmManager? = null
// private var emClient: CallEasemobSignalClient? = null
// private lateinit var prepareConfig: PrepareConfig
// private lateinit var api: CallApiImpl
//
// private var mCallState = CallStateType.Idle
//
// private var callDialog: AlertDialog? = null
// private var callTypeDialog: AlertDialog? = null
//
// override fun onCreate(savedInstanceState: Bundle?) {
// super.onCreate(savedInstanceState)
// setContentView(mViewBinding.root)
//// if(MainActivity.api == null) {
//// api = CallApiImpl(this)
//// }else{
// api = MainActivity.api;
//// }
// var isEncoderConfig = false
// val encoderConfig = VideoEncoderConfiguration()
// enterModel.dimensionsWidth.toIntOrNull()?.let {
// isEncoderConfig = true
// encoderConfig.dimensions.width = it
// }
// enterModel.dimensionsHeight.toIntOrNull()?.let {
// isEncoderConfig = true
// encoderConfig.dimensions.height = it
// }
// enterModel.frameRate.toIntOrNull()?.let {
// isEncoderConfig = true
// encoderConfig.frameRate = it
// }
// enterModel.bitrate.toIntOrNull()?.let {
// isEncoderConfig = true
// encoderConfig.bitrate = it
// }
// if (isEncoderConfig) {
// this.videoEncoderConfig = encoderConfig
// }
// if(MainActivity.prepareConfig == null) {
// prepareConfig = PrepareConfig()
// prepareConfig.rtcToken = enterModel.rtcToken
// prepareConfig.firstFrameWaittingDisabled = enterModel.firstFrameWaittingDisabled
// }else{
// prepareConfig = MainActivity.prepareConfig;
// prepareConfig.rtcToken = enterModel.rtcToken
// prepareConfig.firstFrameWaittingDisabled = enterModel.firstFrameWaittingDisabled
// }
// if(MainActivity.rtcEngine!=null){
// rtcEngine = MainActivity.rtcEngine;
// }else {
// rtcEngine = _createRtcEngine()
// }
// setupView()
// updateCallState(CallStateType.Idle, null)
//
// // Initialize call api
// // 初始化 call api
// initMessageManager { }
//
// PermissionHelp(this).checkCameraAndMicPerms(
// {
// },
// {
// Toasty.normal(
// this@Pure1v1LivingActivity,
// getString(R.string.toast_no_permission),
// Toast.LENGTH_SHORT
// ).show()
// },
// false
// )
// }
//
// fun initMessageManager(completion: ((Boolean) -> Unit)) {
// if (enterModel.isRtm) {
// // Use RtmManager to manage RTM
// // 使用RtmManager管理RTM
//// if(MainActivity.rtmManager==null) {
////
//// rtmManager = createRtmManager(BuildConfig.AG_APP_ID, enterModel.currentUid.toInt())
//// // RTM login
//// // rtm login
//// rtmManager?.login(enterModel.rtmToken) {
//// if (it == null) {
//// // Initialize call api after successful login
//// // login 成功后初始化 call api
//// initCallApi(completion)
//// } else {
//// completion.invoke(false)
//// }
//// }
//// // Listen to rtm manager events
//// // 监听 rtm manager 事件
////
//// }else{
// rtmManager = MainActivity.rtmManager;
// initCallApiNew(completion);
//// }
//
// if (isOut) {
// LogUtils.i("SHENGWANG", "注册获取token isOut")
// mViewBinding.calllWaitRy.isVisible = true
//
// callAction();
// } else {
// LogUtils.i("SHENGWANG", "注册获取token ！isOut")
//// api.onMessageReceive(MainActivity.messages)
//
// connectedUserId = MainActivity.fromUserId
// connectedChannel = MainActivity.fromRoomId
// toActions();
// }
//
////
//// rtmManager?.addListener(object : ICallRtmManagerListener {
//// override fun onConnected() {
//// mViewBinding.root.post {
//// Toasty.normal(
//// this@Pure1v1LivingActivity,
//// getString(R.string.toast_rtm_connected),
//// Toast.LENGTH_SHORT
//// ).show()
////
//// if (isOut) {
//// LogUtils.i("SHENGWANG", "注册获取token isOut")
//// mViewBinding.calllWaitRy.isVisible = true
////
//// callAction();
//// } else {
//// LogUtils.i("SHENGWANG", "注册获取token ！isOut")
//// api.onMessageReceive(MainActivity.messages)
//// }
//// }
////
//// }
//
//// override fun onDisconnected() {
//// mViewBinding.root.post {
//// Toasty.normal(
//// this@Pure1v1LivingActivity,
//// getString(R.string.toast_rtm_disconnected),
//// Toast.LENGTH_SHORT
//// ).show()
//// }
//// }
////
//// override fun onTokenPrivilegeWillExpire(channelName: String) {
//// // Renew token
//// // 重新获取token
//// tokenPrivilegeWillExpire()
//// }
//// })
//
// } else {
// emClient = createEasemobSignalClient(
// this,
// BuildConfig.IM_APP_KEY,
// enterModel.currentUid.toInt()
// )
// emClient?.login {
// if (it) {
// // Initialize call api after successful login
// // login 成功后初始化 call api
// initCallApi(completion)
// } else {
// completion.invoke(false)
// }
// }
// }
// }
//
// private fun initCallApi(completion: ((Boolean) -> Unit)) {
// val config = CallConfig(
// appId = BuildConfig.AG_APP_ID,
// userId = enterModel.currentUid.toInt(),
// rtcEngine = rtcEngine,
// signalClient = if (enterModel.isRtm) createRtmSignalClient(rtmManager!!.getRtmClient()) else emClient!!
// )
// api.initialize(config)
//
// prepareConfig.roomId = enterModel.currentUid
// prepareConfig.localView = mViewBinding.vRight
// prepareConfig.remoteView = mViewBinding.vLeft
//
// api.addListener(this)
// api.prepareForCall(prepareConfig) { error ->
// completion.invoke(error == null)
// }
// }
//
// private fun initCallApiNew(completion: ((Boolean) -> Unit)) {
//// prepareConfig = MainActivity.prepareConfig
// prepareConfig.roomId = enterModel.currentUid
// prepareConfig.localView = mViewBinding.vRight
// prepareConfig.remoteView = mViewBinding.vLeft
//
// api.addListener(this)
// api.prepareForCall(prepareConfig) { error ->
// completion.invoke(error == null)
// }
// }
//
// @Deprecated("Deprecated in Java")
// override fun onBackPressed() {
// closeAction()
// }
//
// private fun updateCallState(state: CallStateType, stateReason: CallStateReason?) {
// mCallState = state
// when (mCallState) {
// CallStateType.Calling -> {
// if (stateReason == CallStateReason.LocalVideoCall || stateReason == CallStateReason.RemoteVideoCall) {
// mViewBinding.vRight.isVisible = true
// mViewBinding.vLeft.isVisible = true
// mViewBinding.btnVideo.isVisible = true
// } else if (stateReason == CallStateReason.LocalAudioCall || stateReason == CallStateReason.RemoteAudioCall) {
// mViewBinding.vRight.isVisible = false
// mViewBinding.vLeft.isVisible = false
// mViewBinding.btnVideo.isVisible = false
// }
// mViewBinding.vRight.alpha = 1f
//
// mViewBinding.btnCall.isVisible = false
// mViewBinding.btnHangUp.isVisible = false
// mViewBinding.btnVideo.setText(R.string.pure_1v1_video_off)
// mViewBinding.btnAudio.setText(R.string.pure_1v1_audio_off)
// }
//
// CallStateType.Connected -> {
// mViewBinding.vLeft.alpha = 1f
// mViewBinding.btnHangUp.isVisible = true
// mViewBinding.btnAudio.isVisible = true
// mViewBinding.btnVideo.isVisible = true
// }
//
// CallStateType.Prepared,
// CallStateType.Idle,
// CallStateType.Failed -> {
// mViewBinding.vLeft.alpha = 0f
// mViewBinding.vRight.alpha = 0f
// mViewBinding.btnCall.isVisible = false
// mViewBinding.btnHangUp.isVisible = false
// mViewBinding.btnAudio.isVisible = false
// mViewBinding.btnVideo.isVisible = false
// }
//
// else -> {}
// }
// }
//
// // Check signal channel connection status
// // 检查信令通道链接状态
// private fun checkConnectionAndNotify(): Boolean {
// if (enterModel.isRtm) {
// val manager = rtmManager ?: return false
// if (!manager.isConnected) {
// Toasty.normal(this, getString(R.string.toast_rtm_not_logged_in), Toast.LENGTH_SHORT)
// .show()
// return false
// }
// return true
// } else {
// val client = emClient ?: return false
// if (!client.isConnected) {
// Toasty.normal(
// this,
// getString(R.string.toast_easemob_not_logged_in),
// Toast.LENGTH_SHORT
// ).show()
// }
// return client.isConnected
// }
// }
//
// private fun _createRtcEngine(): RtcEngineEx {
// var rtcEngine: RtcEngineEx? = null
// val config = RtcEngineConfig()
// config.mContext = this
// config.mAppId = BuildConfig.AG_APP_ID
// config.mEventHandler = object : IRtcEngineEventHandler() {
// override fun onError(err: Int) {
// super.onError(err)
// Log.e(TAG, "IRtcEngineEventHandler onError:$err")
// }
// }
// config.mChannelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING
// config.mAudioScenario = Constants.AUDIO_SCENARIO_CHORUS
// try {
// rtcEngine = RtcEngine.create(config) as RtcEngineEx
// } catch (e: Exception) {
// e.printStackTrace()
// Log.e(TAG, "RtcEngine.create() called error: $e")
// }
// return rtcEngine ?: throw RuntimeException("RtcEngine create failed!")
// }
//
// private fun setupView() {
// mViewBinding.tvCurrentId.text =
// getString(R.string.label_current_user_id, enterModel.currentUid)
// mViewBinding.etTargetUid.setText(SPUtil.getString(kTargetUserId, ""))
// mViewBinding.btnQuitChannel.setOnClickListener {
// closeAction()
// }
// mViewBinding.statisticLayout.tvEncodeDimensions.isVisible = enterModel.isBrodCaster
// mViewBinding.statisticLayout.tvEncodeFrameRate.isVisible = enterModel.isBrodCaster
// mViewBinding.statisticLayout.tvEncodeBitrate.isVisible = enterModel.isBrodCaster
// mViewBinding.statisticLayout.tvStatistic.setOnClickListener {
// val isTlStatistic = mViewBinding.statisticLayout.tlStatistic.isVisible
// mViewBinding.statisticLayout.tlStatistic.isVisible = !isTlStatistic
// }
// mViewBinding.btnCall.visibility = View.GONE
// mViewBinding.btnHangUp.visibility = View.GONE
//
// var btnCallThrottling = false
// mViewBinding.btnCall.setOnClickListener {
// if (!btnCallThrottling) {
// mViewBinding.etTargetUid.clearFocus()
// callAction()
// btnCallThrottling = true
// it.postDelayed({ btnCallThrottling = false }, 1000L)
// }
// }
// var btnHangUpThrottling = false
// mViewBinding.btnHangUp.setOnClickListener {
// if (!btnHangUpThrottling) {
// mViewBinding.etTargetUid.clearFocus()
// hangupAction()
// btnHangUpThrottling = true
// it.postDelayed({ btnHangUpThrottling = false }, 1000L)
// }
// }
// mViewBinding.btnAudio.setOnClickListener {
// audioAction()
// }
// mViewBinding.btnVideo.setOnClickListener {
// videoAction()
// }
// ViewCompat.setOnApplyWindowInsetsListener(mViewBinding.root) { _, insets ->
// val systemInset = insets.getInsets(WindowInsetsCompat.Type.systemBars())
// Log.d(
// TAG,
// "systemInset l:${systemInset.left},t:${systemInset.top},r:${systemInset.right},b:${systemInset.bottom}"
// )
// mViewBinding.root.setPaddingRelative(
// systemInset.left + mViewBinding.root.paddingLeft,
// 0,
// systemInset.right + mViewBinding.root.paddingRight,
// 0
// )
// WindowInsetsCompat.CONSUMED
// }
// WindowCompat.setDecorFitsSystemWindows(window, false)
// }
//
// private fun closeAction() {
// api.deinitialize {
// api.removeListener(this)
// rtcEngine.stopPreview()
// rtcEngine.leaveChannel()
// RtcEngine.destroy()
// rtmManager?.logout()
// rtmManager = null
// emClient?.clean()
// emClient = null
// finish()
// }
// }
//
// fun getUserInfo() {
// getUserInfo(toUserId, object : FetchCallback<UserInfo> {
// override fun onSuccess(param: UserInfo?) {
// mViewBinding.etTargetUid.setText(param?.getUserInfoName())
// Glide.with(this@Pure1v1LivingActivity).load(param?.avatar).into(mViewBinding.userIv)
// }
//
// override fun onFailed(code: Int) {
//
// }
//
// override fun onException(exception: Throwable?) {
//
// }
// })
//
// }
//
//
// fun getUserInfo1() {
// getUserInfo(""+connectedUserId, object : FetchCallback<UserInfo> {
// override fun onSuccess(param: UserInfo?) {
// mViewBinding.etTargetUid2.setText(param?.getUserInfoName())
// Glide.with(this@Pure1v1LivingActivity).load(param?.avatar).into(mViewBinding.userIv1)
// }
//
// override fun onFailed(code: Int) {
//
// }
//
// override fun onException(exception: Throwable?) {
//
// }
// })
//
// }
//
// private fun callAction() {
// // Check signal channel connection status
// // 检查信令通道链接状态
// LogUtils.i("SHENGWANG", "注册获取token callAction")
//
// if (!checkConnectionAndNotify()) return
// LogUtils.i("SHENGWANG", "注册获取token callAction111")
//
// if (this.mCallState != CallStateType.Prepared) {
// initCallApi { _ ->
// }
// Toasty.normal(this, getString(R.string.toast_call_api_initializing), Toast.LENGTH_SHORT)
// .show()
// return
// }
//// val roomId = (mViewBinding.etTargetUid.text ?: "").toString()
// val roomId = toUserId
// val targetUserId = roomId.toIntOrNull()
// if (roomId.isEmpty() || targetUserId == null) {
// Toasty.normal(this, getString(R.string.toast_no_target_user), Toast.LENGTH_SHORT).show()
// return
// }
// SPUtil.putString(kTargetUserId, roomId)
// LogUtils.i("SHENGWANG", "注册获取token callAction11133333333333")
//
// if (isVideo) {
// LogUtils.i("SHENGWANG", "注册获取token callAction111444444444")
//
// api.call(targetUserId) { error ->
// // Call fails, hang up immediately
// // call 失败立刻挂断
// if (error != null && mCallState == CallStateType.Calling) {
// api.cancelCall { }
// }
// }
// } else {
// LogUtils.i("SHENGWANG", "注册获取token callAction11155555555555")
//
// api.call(
// targetUserId,
// CallType.Audio,
// mapOf("key1" to "value1", "key2" to "value2")
// ) { error ->
// // Call fails, hang up immediately
// // call 失败立刻挂断
// if (error != null && mCallState == CallStateType.Calling) {
// api.cancelCall { }
// }
// }
// }
// getUserInfo();
//
// }
//
// private fun hangupAction() {
// // Check signal channel connection status
// // 检查信令通道链接状态
// if (!checkConnectionAndNotify()) return
// api.hangup(connectedUserId ?: 0, "hangup by user") {
// }
// }
//
// private var isAudioMuted = false
// private fun audioAction() {
// val channelName = connectedChannel ?: return
// val uid = enterModel.currentUid
// val connection = RtcConnection(channelName, uid.toInt())
// isAudioMuted = !isAudioMuted
// val ret: Int
// if (isAudioMuted) {
// ret = rtcEngine.muteLocalAudioStreamEx(true, connection)
// mViewBinding.btnAudio.setText(R.string.pure_1v1_audio_on)
// } else {
// ret = rtcEngine.muteLocalAudioStreamEx(false, connection)
// mViewBinding.btnAudio.setText(R.string.pure_1v1_audio_off)
// }
// Log.d(TAG, "isAudioMute: $isAudioMuted ret: $ret")
// }
//
// private var isVideoMuted = false
// private fun videoAction() {
// val channelName = connectedChannel ?: return
// val uid = enterModel.currentUid
// val connection = RtcConnection(channelName, uid.toInt())
// isVideoMuted = !isVideoMuted
// val ret: Int
// if (isVideoMuted) {
// rtcEngine.stopPreview()
// ret = rtcEngine.muteLocalVideoStreamEx(true, connection)
// mViewBinding.btnVideo.setText(R.string.pure_1v1_video_on)
// } else {
// rtcEngine.startPreview()
// ret = rtcEngine.muteLocalVideoStreamEx(false, connection)
// mViewBinding.btnVideo.setText(R.string.pure_1v1_video_off)
// }
// Log.d(TAG, "isVideoMuted: $isVideoMuted ret: $ret")
// }
//
// override fun onDestroy() {
// api.removeListener(this)
// super.onDestroy()
// }
//
// override fun onCallStateChanged(
// state: CallStateType,
// stateReason: CallStateReason,
// eventReason: String,
// eventInfo: Map<String, Any>
// ) {
// Log.d(
// TAG,
// "注册获取tokenonCallStateChanged state: ${state.value}, stateReason: ${stateReason.value}, eventReason: $eventReason, eventInfo: $eventInfo"
// )
// runOnUiThread {
// val publisher = eventInfo.getOrDefault(CallApiImpl.kPublisher, enterModel.currentUid)
// if (publisher != enterModel.currentUid) {
// return@runOnUiThread
// }
// updateCallState(state, stateReason)
//
// when (state) {
// CallStateType.Calling -> {
// val fromUserId = eventInfo[CallApiImpl.kFromUserId] as? Int ?: 0
// val fromRoomId = eventInfo[CallApiImpl.kFromRoomId] as? String ?: ""
// val toUserId = eventInfo[CallApiImpl.kRemoteUserId] as? Int ?: 0
// if (connectedUserId != null && connectedUserId != fromUserId) {
// api.reject(fromUserId, "already calling") {
// }
// return@runOnUiThread
// }
// // Only handle if target user is self
// // 触发状态的用户是自己才处理
// if (enterModel.currentUid.toIntOrNull() == toUserId) {
// connectedUserId = fromUserId
// connectedChannel = fromRoomId
// toActions();
//
//
//// callDialog = AlertDialog.Builder(this)
//// .setTitle(getString(R.string.alert_title))
//// .setMessage(getString(R.string.alert_incoming_call, fromUserId))
//// .setPositiveButton(getString(R.string.alert_accept)) { p0, p1 ->
//// // Check signal channel connection status
//// // 检查信令通道链接状态
//// if (!checkConnectionAndNotify()) return@setPositiveButton
//// LogUtils.i("SHENGWANG","SHENGWANGapi.accept")
//// api.accept(fromUserId) { err ->
//// mViewBinding.calllWaitInRy.isVisible = false
//// if (err != null) {
//// // If accept message fails, reject and return to initial state
//// // 如果接受消息出错，则发起拒绝，回到初始状态
//// LogUtils.i("SHENGWANG","SHENGWANGapi.accept error:"+err.msg)
////
//// api.reject(fromUserId, err.msg) {
////
//// }
//// }
//// }
//// }.setNegativeButton(getString(R.string.alert_reject)) { p0, p1 ->
//// // Check signal channel connection status
//// // 检查信令通道链接状态
//// if (!checkConnectionAndNotify()) return@setNegativeButton
//// LogUtils.i("SHENGWANG","SHENGWANGapi.reject")
//// mViewBinding.calllWaitInRy.isVisible = false
//// api.reject(fromUserId, "reject by user") { err ->
//// }
//// }.create()
//// callDialog?.setCancelable(false)
//// callDialog?.show()
// } else if (enterModel.currentUid.toIntOrNull() == fromUserId) {
// connectedUserId = toUserId
// connectedChannel = fromRoomId
//// callDialog = AlertDialog.Builder(this)
//// .setTitle(getString(R.string.alert_title))
//// .setMessage(getString(R.string.alert_calling_user, toUserId))
//// .setNegativeButton(getString(R.string.alert_cancel)) { p0, p1 ->
//// // Check signal channel connection status
//// // 检查信令通道链接状态
//// if (!checkConnectionAndNotify()) return@setNegativeButton
//// api.cancelCall { err ->
//// }
//// }.create()
//// callDialog?.setCancelable(false)
//// callDialog?.show()
// }
// }
//
// CallStateType.Connected -> {
// Toasty.normal(
// this,
// getString(
// R.string.toast_call_started,
// eventInfo.getOrDefault(CallApiImpl.kCostTimeMap, "")
// ),
// Toast.LENGTH_LONG
// ).show()
//
// callDialog?.dismiss()
// callDialog = null
// if(isVideo) {
// mViewBinding.videoRy.isVisible = true
// }
// videoEncoderConfig?.let { config ->
// rtcEngine.setVideoEncoderConfiguration(config)
// val cameraConfig =
// CameraCapturerConfiguration(CameraCapturerConfiguration.CAMERA_DIRECTION.CAMERA_FRONT)
// cameraConfig.captureFormat.width = config.dimensions.width
// cameraConfig.captureFormat.height = config.dimensions.height
// cameraConfig.captureFormat.fps = config.frameRate
// rtcEngine.setCameraCapturerConfiguration(cameraConfig)
// }
// }
//
// CallStateType.Prepared -> {
// when (stateReason) {
// CallStateReason.LocalHangup, CallStateReason.RemoteHangup -> {
// mViewBinding.videoRy.isVisible = false
// Toasty.normal(
// this,
// getString(R.string.toast_call_ended),
// Toast.LENGTH_SHORT
// ).show()
// finish()
// }
//
// CallStateReason.LocalRejected,
// CallStateReason.RemoteRejected -> {
//
// Toasty.normal(
// this,
// getString(R.string.toast_call_rejected),
// Toast.LENGTH_SHORT
// ).show()
// finish()
// }
//
// CallStateReason.CallingTimeout -> {
// Toasty.normal(
// this,
// getString(R.string.toast_no_answer),
// Toast.LENGTH_SHORT
// ).show()
// finish()
// }
//
// CallStateReason.RemoteCallBusy -> {
// Toasty.normal(
// this,
// getString(R.string.toast_user_busy),
// Toast.LENGTH_SHORT
// ).show()
// finish()
// }
//
// else -> {}
// }
// callDialog?.dismiss()
// callDialog = null
// connectedUserId = null
// connectedChannel = null
// isVideoMuted = false
// isAudioMuted = false
// }
//
// CallStateType.Failed -> {
// Toasty.normal(this, eventReason, Toast.LENGTH_LONG).show()
// callDialog?.dismiss()
// callDialog = null
// connectedUserId = null
// connectedChannel = null
// isVideoMuted = false
// isAudioMuted = false
// closeAction()
// }
//
// else -> {}
// }
// }
// }
//
// fun toActions(){
// getUserInfo1()
// mViewBinding.calllWaitInRy.isVisible = true
//
// mViewBinding.btnJieTong.setOnClickListener {
// if (checkConnectionAndNotify()) {
// LogUtils.i("SHENGWANG", "注册获取tokenapi.accept")
// api.accept(connectedUserId!!) { err ->
// if(isVideo) {
// mViewBinding.calllWaitInRy.isVisible = false
//// mViewBinding.videoRy.isVisible = true
// }
// if (err != null) {
// // If accept message fails, reject and return to initial state
// // 如果接受消息出错，则发起拒绝，回到初始状态
// LogUtils.i(
// "SHENGWANG",
// "注册获取tokenapi.accept error:" + err.msg
// )
//
// api.reject(connectedUserId!!, err.msg) {
//
// }
// }
// }
// }
// }
// mViewBinding.btnGuaduan.setOnClickListener {
// if (checkConnectionAndNotify()) {
// LogUtils.i("SHENGWANG", "注册获取tokenapi.reject")
// mViewBinding.calllWaitInRy.isVisible = false
// api.reject(connectedUserId!!, "reject by user") { err ->
// }
// }
// }
// }
//
// override fun onCallEventChanged(event: CallEvent, eventReason: String?) {
// Log.d(TAG, "注册获取token onCallEventChanged: $event, eventReason: $eventReason")
// when (event) {
// CallEvent.RemoteLeft -> {
// // Demo monitors remote user leaving to end abnormal calls. In real business scenarios, it is recommended to use server-side monitoring of RTC user offline for kicking users, and client-side monitoring of kicks to end abnormal calls
// // Demo通过监听远端用户离开进行结束异常通话，真实业务场景推荐使用服务端监听RTC用户离线来进行踢人，客户端通过监听踢人来结束异常通话
// hangupAction()
// }
//
// CallEvent.JoinRTCStart -> {
// rtcEngine.addHandlerEx(
// object : IRtcEngineEventHandler() {
// override fun onJoinChannelSuccess(
// channel: String?,
// uid: Int,
// elapsed: Int
// ) {
// super.onJoinChannelSuccess(channel, uid, elapsed)
// Log.d(TAG, "注册获取token onJoinChannelSuccess, channel:$channel, uid:$channel")
// }
//
// override fun onRemoteAudioStateChanged(
// uid: Int,
// state: Int,
// reason: Int,
// elapsed: Int
// ) {
// super.onRemoteAudioStateChanged(uid, state, reason, elapsed)
// Log.d(
// TAG,
// "注册获取token onRemoteAudioStateChanged, uid:$uid, state:$state, reason:$reason"
// )
// }
// },
// RtcConnection(
// enterModel.currentUid,
// enterModel.currentUid.toInt()
// ) // demo 为了方便将本端uid的字符串作为了频道名
// )
// }
//
// else -> {}
// }
// }
//
// override fun onCallError(
// errorEvent: CallErrorEvent,
// errorType: CallErrorCodeType,
// errorCode: Int,
// message: String?
// ) {
// Log.d(TAG, "注册获取token onCallError: $errorEvent")
// }
//
// override fun onCallConnected(
// roomId: String,
// callUserId: Int,
// currentUserId: Int,
// timestamp: Long
// ) {
// super.onCallConnected(roomId, callUserId, currentUserId, timestamp)
// Log.d(
// TAG,
// "注册获取token onCallConnected, roomId: $roomId, callUserId: $callUserId, currentUserId: $currentUserId, timestamp: $timestamp"
// )
// runOnUiThread {
// mViewBinding.tvText.text =
// getString(R.string.call_status_start, roomId, callUserId, currentUserId, timestamp)
// }
// }
//
// override fun onCallDisconnected(
// roomId: String,
// hangupUserId: Int,
// currentUserId: Int,
// timestamp: Long,
// duration: Long
// ) {
// super.onCallDisconnected(roomId, hangupUserId, currentUserId, timestamp, duration)
// Log.d(
// TAG,
// "注册获取token onCallDisconnected, roomId: $roomId, hangupUserId: $hangupUserId, currentUserId: $currentUserId, timestamp: $timestamp, duration:$duration"
// )
// runOnUiThread {
// mViewBinding.tvText.text = getString(
// R.string.call_status_end,
// roomId,
// hangupUserId,
// currentUserId,
// timestamp,
// duration
// )
// }
// }
//
// override fun canJoinRtcOnCalling(eventInfo: Map<String, Any>): Boolean {
// return true
// }
//
// override fun tokenPrivilegeWillExpire() {
// var rtcTokenTemp = ""
// var rtmTokenTemp = ""
// val runnable = Runnable {
// if (rtcTokenTemp.isNotEmpty() && rtmTokenTemp.isNotEmpty()) {
// api.renewToken(rtcTokenTemp)
// if (enterModel.isBrodCaster) {
// rtcEngine.renewToken(enterModel.showRoomToken)
// }
// }
// }
// HttpManager.token007("", enterModel.currentUid) { token ->
// runOnUiThread {
// if (token != null) {
// rtcTokenTemp = token
// rtmTokenTemp = token
// runnable.run()
// }
// }
// }
// // Update broadcaster channel token for audience
// // 观众更新主播频道token
// if (!enterModel.isBrodCaster) {
// HttpManager.token007(enterModel.showRoomId, enterModel.currentUid) { rtcToken ->
// runOnUiThread {
// if (rtcToken != null) {
// enterModel.showRoomToken = rtcToken
// rtcEngine.renewToken(enterModel.showRoomToken)
// }
// }
// }
// }
// }
//
// override fun callDebugInfo(message: String, logLevel: CallLogLevel) {
// when (logLevel) {
// CallLogLevel.Normal -> Ov1Logger.d(TAG, message)
// CallLogLevel.Warning -> Ov1Logger.w(TAG, message)
// CallLogLevel.Error -> Ov1Logger.e(TAG, message)
// }
// }
//}

2
app/src/main/res/drawable/bank_bg1.xml
View File

@@ -7,5 +7,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dimen_10_dp" />
<solid android:color="#E67D7D" />
<solid android:color="#F73746" />
</shape>

2
app/src/main/res/drawable/bank_bg2.xml
View File

@@ -7,5 +7,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dimen_10_dp" />
<solid android:color="#395190" />
<solid android:color="#315CC0" />
</shape>

2
app/src/main/res/drawable/bank_bg3.xml
View File

@@ -7,5 +7,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dimen_10_dp" />
<solid android:color="#459A82" />
<solid android:color="#09877B" />
</shape>

2
app/src/main/res/drawable/button_true_bg1.xml
View File

@@ -9,7 +9,7 @@
android:type="linear"
/>
<stroke android:width="0dp" android:color="@color/color_themeblue" />
<corners android:radius="25dp"/>
<corners android:radius="30dp"/>
</shape>
</item>

4
app/src/main/res/drawable/cornor_f4f4f4_6dp.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_6" />
<corners android:radius="@dimen/dp_10" />
<solid android:color="#FFF8F8" />
<solid android:color="#F2F2F2" />
</shape>

2
app/src/main/res/drawable/cornor_stroke_thempink_12dp.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_20" />
<corners android:radius="@dimen/dp_30" />
<stroke
android:width="@dimen/dp_1"

6
app/src/main/res/drawable/cornor_stroke_thempink_gray.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_10" />
<solid android:color="@color/color_eefof7" />
</shape>

2
app/src/main/res/drawable/cornor_thempink_12dp.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_20" />
<corners android:radius="@dimen/dp_30" />
<solid android:color="@color/color_themepink" />

2
app/src/main/res/drawable/ic_frame_mine_right_arrow.xml
View File

@@ -14,5 +14,5 @@
android:fillColor="#00000000"/>
<path
android:pathData="M5.1032,3.5123C4.8629,3.272 4.8629,2.8823 5.1032,2.642C5.3435,2.4017 5.7332,2.4017 5.9735,2.642L5.1032,3.5123ZM10.4614,8.0002L10.8966,7.5651C11.1369,7.8054 11.1369,8.1951 10.8966,8.4354L10.4614,8.0002ZM6.2812,13.0508C6.0409,13.2911 5.6512,13.2911 5.4109,13.0508C5.1706,12.8104 5.1706,12.4208 5.4109,12.1805L6.2812,13.0508ZM5.9735,2.642L10.8966,7.5651L10.0263,8.4354L5.1032,3.5123L5.9735,2.642ZM10.8966,8.4354L6.2812,13.0508L5.4109,12.1805L10.0263,7.5651L10.8966,8.4354Z"
android:fillColor="#999999"/>
android:fillColor="#17254E"/>
</vector>

18
app/src/main/res/drawable/ic_launche_foreground.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="288"
android:viewportHeight="191.53125">
<group android:scaleX="0.46"
android:scaleY="0.30591798"
android:translateX="77.76"
android:translateY="66.4692">
<group android:translateY="156.72656">
<path android:pathData="M41.765625,-100.6875L35.15625,-94.296875Q28.625,-103.578125,15.40625,-111.875L21.734375,-117.78125Q35.578125,-108.921875,41.765625,-100.6875ZM127.90625,-20.046875Q127.90625,-14.34375,124.90625,-10.890625Q121.921875,-7.453125,116.796875,-7.453125L107.296875,-7.453125L104.140625,-16.25L114.890625,-16.25Q118.96875,-16.25,118.96875,-20.75L118.96875,-46.96875L92.75,-46.96875L92.75,-34.25L101.953125,-35.296875Q99.640625,-38.953125,98.515625,-40.4375L106.109375,-43.171875Q111.9375,-33.96875,115.3125,-24.1875L107.578125,-21.171875Q106.59375,-24.328125,104.984375,-28.0625L69.828125,-22.640625L66.234375,-31.21875L83.671875,-33.125L83.671875,-46.96875L59.625,-46.96875L59.625,-8.796875L50.5625,-8.796875L50.5625,-55.40625L83.671875,-55.40625L83.671875,-65.671875L54.703125,-65.671875L54.703125,-111.734375L121.71875,-111.734375L121.71875,-65.671875L92.75,-65.671875L92.75,-55.40625L127.90625,-55.40625L127.90625,-20.046875ZM112.78125,-93.03125L112.78125,-103.21875L92.75,-103.21875L92.75,-93.03125L112.78125,-93.03125ZM83.671875,-93.03125L83.671875,-103.21875L63.78125,-103.21875L63.78125,-93.03125L83.671875,-93.03125ZM112.78125,-74.1875L112.78125,-84.375L92.75,-84.375L92.75,-74.1875L112.78125,-74.1875ZM83.671875,-74.1875L83.671875,-84.375L63.78125,-84.375L63.78125,-74.1875L83.671875,-74.1875ZM38.46875,-70.390625L31.71875,-63.921875Q24.40625,-73.625,11.953125,-81.5L18.28125,-87.40625Q30.234375,-80.515625,38.46875,-70.390625ZM136.82812,-1.40625L133.67188,7.171875L62.9375,7.171875Q42.46875,7.171875,30.515625,-4.4375Q22.21875,3.03125,13.578125,8.9375L7.171875,2.1875Q18.640625,-4.078125,26.09375,-11.53125L26.09375,-41.484375L9.921875,-41.484375L9.921875,-50.421875L35.015625,-50.421875L35.015625,-10.546875Q45.5625,-1.40625,61.671875,-1.40625L136.82812,-1.40625Z"
android:fillColor="#FFFFFF"/>
<path android:pathData="M238.4375,-112.015625Q228.23438,-102.875,213.6875,-98.375L213.6875,-42.609375L226.0625,-46.0625L226.0625,-93.171875L234.70312,-93.171875L234.70312,-45.640625Q234.70312,-26.71875,228.26562,-14.34375Q221.84375,-1.96875,206.375,9.078125L200.04688,1.90625Q223.53125,-13.640625,225.21875,-36.421875L202.92188,-30.375L198.98438,-38.75L205.03125,-40.296875L205.03125,-104.5625Q223.73438,-108.921875,232.25,-117.640625L238.4375,-112.015625ZM273.73438,-27.078125Q273.73438,-23.84375,271.48438,-21.484375Q269.23438,-19.125,265.85938,-19.125L259.45312,-19.125L255.875,-27.78125L262.20312,-27.78125Q263.32812,-27.78125,264.20312,-28.765625Q265.07812,-29.75,265.07812,-30.796875L265.07812,-102.796875L252.14062,-102.796875L252.14062,9.078125L243.35938,9.078125L243.35938,-111.734375L273.73438,-111.734375L273.73438,-27.078125ZM202.01562,-102.515625L194.70312,-102.65625L194.70312,9.21875L185.90625,9.21875L185.90625,-18.5625L155.67188,-10.34375L151.17188,-18.84375L162.28125,-21.734375L162.28125,-102.515625L153.35938,-102.515625L153.35938,-111.734375L202.01562,-111.734375L202.01562,-102.515625ZM185.76562,-84.234375L185.90625,-102.65625L170.9375,-102.65625L170.9375,-84.234375L185.76562,-84.234375ZM185.90625,-55.40625L185.90625,-75.453125L170.9375,-75.453125L170.9375,-55.40625L185.90625,-55.40625ZM185.90625,-28.203125L185.90625,-46.6875L170.9375,-46.6875L170.9375,-24.046875L185.90625,-28.203125Z"
android:fillColor="#FFFFFF"/>
</group>
</group>
</vector>

38
app/src/main/res/drawable/index_user_bg33.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white">
<item android:id="@android:id/mask">
<shape>
<solid android:color="@color/transparent" />
<corners
android:bottomLeftRadius="24dp"
android:bottomRightRadius="24dp"
android:topLeftRadius="24dp"
android:topRightRadius="24dp" />
</shape>
</item>
<!-- 默认显⽰效果-->
<item>
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="#F2AA00"
android:startColor="#F2AA00"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="24dp"
android:bottomRightRadius="24dp"
android:topLeftRadius="24dp"
android:topRightRadius="24dp" />
<item name="android:shadowColor"
tools:ignore="MissingPrefix">#4d363636</item>
<item name="android:shadowDx"
tools:ignore="MissingPrefix">0</item>
<item name="android:shadowDy"
tools:ignore="MissingPrefix">2</item>
</shape>
</item>
</ripple>

25
app/src/main/res/drawable/logout_btn_main2_new.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/white">
<item android:id="@android:id/mask">
<shape>
<solid android:color="@color/transparent" />
<corners android:radius="6dp" />
</shape>
</item>
<!-- 默认显⽰效果-->
<item>
<shape android:shape="rectangle">
<gradient
android:angle="180"
android:startColor="@color/transparent"
android:endColor="@color/transparent"
android:type="linear"
android:useLevel="true" />
<stroke android:width="2dp" android:color="#498AFA"/>
<corners
android:radius="6dp" />
</shape>
</item>
</ripple>

19
app/src/main/res/drawable/nan_bg_t.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:radius="@dimen/dimen_10_dp" />
<size
android:width="@dimen/dimen_32_dp"
android:height="@dimen/dimen_32_dp" />
<solid android:color="#498AFA" />
</shape>

19
app/src/main/res/drawable/nv_bg_t.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:radius="@dimen/dimen_10_dp" />
<size
android:width="@dimen/dimen_32_dp"
android:height="@dimen/dimen_32_dp" />
<solid android:color="#FF6774" />
</shape>

4
app/src/main/res/drawable/password_button_bg_s.xml
View File

@@ -12,8 +12,8 @@
<shape android:shape="rectangle">
<gradient android:type="linear"
android:useLevel="true"
android:startColor="@color/color_6b3689"
android:endColor="@color/color_6b3689"
android:startColor="@color/color_498afa"
android:endColor="@color/color_498afa"
android:angle="45" />
<corners android:topLeftRadius="0dp"
android:topRightRadius="0dp"

16
app/src/main/res/drawable/rectangle_white_reduce_bg_top.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:topLeftRadius="@dimen/dimen_15_dp"
android:topRightRadius="@dimen/dimen_15_dp"/>
<solid android:color="@color/color_white" />
</shape>

2
app/src/main/res/drawable/shape_dialog_bg2.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:topRightRadius="12dp"
android:topLeftRadius="12dp"/>
<solid android:color="#F2F2F2" />
<solid android:color="#FFFFFF" />
</shape>

8
app/src/main/res/drawable/shengri_item_bg.xml
View File

@@ -3,13 +3,13 @@
<item>
<shape android:shape="rectangle">
<gradient android:startColor="#FAF3DB"
android:endColor="#FAF3DB"
android:centerColor="#FAF3DB"
<gradient android:startColor="#EEF0F7"
android:endColor="#EEF0F7"
android:centerColor="#EEF0F7"
android:type="linear"
/>
<stroke android:width="0dp" android:color="#F8F8F8" />
<corners android:radius="5dp"/>
<corners android:radius="0dp"/>
</shape>
</item>

6
app/src/main/res/drawable/statistic_bg.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#CC151325" />
<corners android:radius="16dp" />
</shape>

2
app/src/main/res/drawable/switch_thumb_on.xml
View File

@@ -12,6 +12,6 @@
android:height="@dimen/dimen_24_dp" />
<solid android:color="@color/color_white" />
<stroke android:width="2dp" android:color="@color/color_09bb07"/>
<stroke android:width="2dp" android:color="#498AFA"/>
</shape>

18
app/src/main/res/drawable/tab_background.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 选中状态 -->
<item android:state_selected="true">
<shape android:shape="rectangle">
<gradient android:startColor="#FFFFFF"
android:endColor="#FFFFFF"
android:centerColor="#FFFFFF"
android:type="linear"
/>
<stroke android:width="2dp" android:color="#EEF0F7" />
<corners android:radius="23dp"/>
</shape>
</item>
<!-- 默认状态 -->
<item android:drawable="@android:color/transparent" />
</selector>

25
app/src/main/res/drawable/usdt_qr_bg_new.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/white">
<item android:id="@android:id/mask">
<shape>
<solid android:color="@color/transparent" />
<corners android:radius="10dp" />
</shape>
</item>
<!-- 默认显⽰效果-->
<item>
<shape android:shape="rectangle">
<gradient
android:angle="180"
android:startColor="@color/transparent"
android:endColor="@color/transparent"
android:type="linear"
android:useLevel="true" />
<stroke android:width="1dp" android:color="#3EA685"/>
<corners
android:radius="10dp" />
</shape>
</item>
</ripple>

25
app/src/main/res/drawable/user_true.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#B1B1B1">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#889CBC" />
<corners android:radius="@dimen/dp_10" />
</shape>
</item>
<!-- 默认显⽰效果-->
<item>
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="#FFFFFF"
android:startColor="#EEF0F7"
android:type="linear"
android:centerColor="#FFFFFF"
android:useLevel="true" />
</shape>
</item>
</ripple>

25
app/src/main/res/drawable/user_true1.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#B1B1B1">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#889CBC" />
<corners android:radius="@dimen/dp_10" />
</shape>
</item>
<!-- 默认显⽰效果-->
<item>
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="#EEF0F7"
android:startColor="#FFFFFF"
android:type="linear"
android:centerColor="#EEF0F7"
android:useLevel="true" />
</shape>
</item>
</ripple>

19
app/src/main/res/drawable/xinbie_f.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:radius="@dimen/dimen_10_dp" />
<size
android:width="@dimen/dimen_32_dp"
android:height="@dimen/dimen_32_dp" />
<solid android:color="#F5F4F7" />
</shape>

107
app/src/main/res/layout/activity_add_bank.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:id="@+id/big_bg"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -16,7 +16,7 @@
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:titleText="添加银行卡"
app:titleTextColor="@android:color/black" />
app:titleTextColor="@color/color_2c2c2c" />
<View
android:layout_width="match_parent"
@@ -25,7 +25,7 @@
android:visibility="visible" />
<TextView
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_height="42dp"
android:background="#FFE5E5"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_15"
@@ -33,110 +33,105 @@
android:lines="1"
android:ellipsize="end"
android:text="请填写您本人的银行卡信息"
android:textColor="#ffff2b2b"
android:textSize="14sp"
android:textColor="#FF4646"
android:textSize="16sp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/dp_15"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="姓名"
android:textColor="#ff383838"
android:textSize="14sp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
/>
<EditText
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_height="58dp"
android:gravity="center_vertical"
android:background="@color/transparent"
android:background="@drawable/cornor_stroke_thempink_gray"
android:paddingStart="@dimen/dp_10"
android:hint ="请输入您的真实姓名"
android:textColorHint="#ff999999"
android:textSize="18sp"
android:textColorHint="#BCBCBC"
android:textSize="16sp"
android:id="@+id/name_et"
android:layout_marginTop="10dp"
android:textColor="@color/black"
android:layout_marginTop="15dp"
android:textColor="@color/color_2c2c2c"
/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#ededed"
android:visibility="visible" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="银行卡号"
android:layout_marginTop="@dimen/dp_20"
android:textColor="#ff383838"
android:textSize="14sp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
/>
<EditText
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginTop="10dp"
android:id="@+id/number_et"
android:layout_height="58dp"
android:gravity="center_vertical"
android:background="@color/transparent"
android:background="@drawable/cornor_stroke_thempink_gray"
android:paddingStart="@dimen/dp_10"
android:layout_marginTop="15dp"
android:id="@+id/number_et"
android:hint ="请输入您本人的银行卡号"
android:textColorHint="#ff999999"
android:textColorHint="#BCBCBC"
android:inputType="number"
android:textSize="18sp"
android:textColor="@color/black"
android:textColor="@color/color_2c2c2c"
/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#ededed"
android:visibility="visible" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所属银行"
android:layout_marginTop="@dimen/dp_20"
android:textColor="#ff383838"
android:textSize="14sp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
/>
<EditText
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginTop="10dp"
android:id="@+id/bank_et"
android:layout_height="58dp"
android:gravity="center_vertical"
android:background="@color/transparent"
android:background="@drawable/cornor_stroke_thempink_gray"
android:paddingStart="@dimen/dp_10"
android:layout_marginTop="15dp"
android:id="@+id/bank_et"
android:hint ="请输入所属银行"
android:textColorHint="#ff999999"
android:textColorHint="#BCBCBC"
android:textSize="18sp"
android:textColor="@color/black"
android:textColor="@color/color_2c2c2c"
/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#ededed"
android:visibility="visible" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:id="@+id/tips_tv"
android:visibility="invisible"
android:visibility="gone"
android:text="实名认证无法自行修改，如需修改请联系客服人员"
android:textColor="#ffff2b2b"
android:textSize="14sp"
/>
<Button
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="@dimen/dp_30"
android:text="提交"
android:id="@+id/sumbit_bt"
android:background="@drawable/button_true_bg1"
android:textColor="#fff6f8fd"
android:textSize="16sp"
/>
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:text="提交"
android:id="@+id/sumbit_bt"
android:background="@drawable/button_true_bg1"
android:textColor="#fff6f8fd"
android:textSize="16sp"
/>
</androidx.appcompat.widget.LinearLayoutCompat>

78
app/src/main/res/layout/activity_addfriends.xml
View File

@@ -17,16 +17,34 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:background="@color/white"
app:titleText="@string/add_friend"
app:titleTextColor="@android:color/black" />
<View android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintTop_toBottomOf="@+id/titleBarView"
android:background="#E8E8E8"/>
<LinearLayout
android:id="@+id/layout_addfriend_top"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_15"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/titleBarView">
<TextView
android:id="@+id/tv_addfriends_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/ic_addfriend_search"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/addfriend_search_text"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/saoyisao_tv"
@@ -34,7 +52,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/ic_addfriend_saoyisao"
android:drawablePadding="@dimen/dp_5"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/saoyisao_txt"
android:textColor="@color/color_333333"
@@ -46,23 +64,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/ic_addfriend_qrcode"
android:drawablePadding="@dimen/dp_5"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/addfriend_qrcode_text"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_addfriends_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/ic_addfriend_search"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/addfriend_search_text"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14" />
</LinearLayout>
@@ -70,7 +78,9 @@
android:id="@+id/line_addfriendtop"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="@color/fun_page_bg_color"
android:background="#EEF0F4"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@+id/layout_addfriend_top" />
<LinearLayout
@@ -134,6 +144,16 @@
app:layout_constraintTop_toTopOf="@+id/iv_addfriend_tongxl" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/tongxunlu_cly1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="#EEF0F4"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_78"
android:layout_marginEnd="@dimen/dp_15" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -185,6 +205,15 @@
app:layout_constraintTop_toTopOf="@+id/iv_addfriend_applylist" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="#EEF0F4"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_78"
android:layout_marginEnd="@dimen/dp_15" />
</LinearLayout>
@@ -227,11 +256,17 @@
android:textColor="@color/color_7f7b81"
android:textSize="@dimen/sp_14"
android:layout_marginLeft="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="@+id/iv_addfriend_addgroup"
app:layout_constraintLeft_toRightOf="@+id/iv_addfriend_addgroup"
/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="#EEF0F4"
app:layout_constraintTop_toBottomOf="@+id/iv_addfriend_addgroup"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15" />
<TextView
android:id="@+id/tv_addfriends_knows"
android:layout_width="wrap_content"
@@ -265,4 +300,11 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_addfriends_knows" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/qr_ry"
android:background="#EEF0F7"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/activity_authorize.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="@dimen/dp_1"
android:background="@color/color_f7f7f7" />
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"

34
app/src/main/res/layout/activity_bank_list.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/big_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -33,7 +33,7 @@
android:id="@+id/nodata_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:layout_marginTop="67dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
@@ -46,20 +46,28 @@
android:layout_height="wrap_content"
android:text="还没有绑定银行卡，快去添加吧"
android:layout_marginTop="20dp"
android:textColor="#ff383838"
android:textSize="14sp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
/>
</LinearLayout>
<Button
<LinearLayout
android:id="@+id/add_bank_bt"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_30"
android:background="@drawable/button_true_bg1"
android:text="+ 添加新银行卡"
android:textColor="#fff6f8fd"
android:textSize="16sp" />
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_15"
android:gravity="center"
android:background="@drawable/button_true_bg1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加"
android:drawablePadding="@dimen/dp_13"
android:drawableLeft="@mipmap/add_bank_iii"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>

163
app/src/main/res/layout/activity_base_chatsetting.xml
View File

@@ -9,16 +9,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
android:background="@drawable/user_true1">
<TextView
android:id="@+id/tvTitle"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_height="?actionBarSize"
android:ellipsize="middle"
android:gravity="center"
android:paddingStart="@dimen/dp_45"
android:paddingEnd="@dimen/dp_45"
android:background="@color/white"
android:singleLine="true"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_20"
@@ -27,11 +28,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="SpUsage" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="#EEF0F7"
app:layout_constraintTop_toBottomOf="@id/tvTitle" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivBack"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_48"
android:layout_height="?actionBarSize"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:paddingStart="@dimen/dimen_15_dp"
@@ -42,9 +48,11 @@
android:id="@+id/llteamsetting_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:background="@color/white"
android:layout_marginTop="1dp"
android:paddingTop="@dimen/dp_20"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/tvTitle">
app:layout_constraintTop_toBottomOf="@id/tvTitle">
<TextView
android:id="@+id/tvnotify"
@@ -113,23 +121,29 @@
app:drawableTopCompat="@mipmap/ic_setting_pingbi_close" />
</LinearLayout>
<View
android:id="@+id/lineteamsetting11"
android:layout_width="match_parent"
android:layout_height="20dp"
android:background="#FFFFFF"
app:layout_constraintTop_toBottomOf="@id/llteamsetting_top" />
<View
android:id="@+id/lineteamsetting"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:layout_marginTop="@dimen/dp_20"
android:background="@color/color_ededed"
app:layout_constraintTop_toBottomOf="@+id/llteamsetting_top" />
android:background="#EEF0F7"
app:layout_constraintTop_toBottomOf="@id/lineteamsetting11" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ctlayout_photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_20"
android:paddingEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/lineteamsetting">
@@ -187,9 +201,15 @@
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ctlayout_photo"/>
app:layout_constraintTop_toBottomOf="@id/ctlayout_photo"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="#EEF0F7"
app:layout_constraintTop_toBottomOf="@id/v" />
<LinearLayout
android:id="@+id/qyjy_ly"
android:paddingStart="@dimen/dp_15"
@@ -197,7 +217,9 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_height="@dimen/dp_52"
android:layout_marginTop="1dp"
android:background="@color/white"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -219,7 +241,6 @@
app:layout_constraintTop_toBottomOf="@+id/llteamsetting_photo" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/qyjy_switch"
android:layout_width="wrap_content"
@@ -236,9 +257,11 @@
<FrameLayout
android:id="@+id/flteamurl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_height="@dimen/dp_52"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
android:layout_marginTop="1dp"
android:paddingEnd="@dimen/dp_15"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/qyjy_ly">
@@ -263,11 +286,16 @@
android:layout_gravity="center_vertical|right"
app:srcCompat="@mipmap/ic_setting_enter" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="#EEF0F7"
app:layout_constraintTop_toBottomOf="@id/flteamurl" />
<FrameLayout
android:id="@+id/flteaminfo"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_marginTop="@dimen/dp_1"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:visibility="gone"
@@ -300,10 +328,13 @@
<FrameLayout
android:id="@+id/rlteam_announcement"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_height="@dimen/dp_52"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:visibility="gone"
android:layout_marginTop="1dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/flteaminfo">
@@ -318,7 +349,7 @@
android:text="@string/teamsetting_other_announcement"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
app:drawableStartCompat="@drawable/ic_chat_titleannouncement" />
app:drawableStartCompat="@drawable/ic_chat_titleannouncement1" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
@@ -330,9 +361,11 @@
<FrameLayout
android:id="@+id/rlteam_clearhistory"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_height="@dimen/dp_52"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:background="@color/white"
android:layout_marginTop="1dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rlteam_announcement">
@@ -355,15 +388,22 @@
android:layout_gravity="end|center_vertical"
app:srcCompat="@mipmap/ic_setting_enter" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="#EEF0F7"
app:layout_constraintTop_toBottomOf="@id/rlteam_clearhistory" />
<FrameLayout
android:id="@+id/flhbkz"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_height="@dimen/dp_52"
android:background="@color/white"
android:visibility="gone"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:layout_marginTop="1dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rlteam_clearhistory">
@@ -391,10 +431,12 @@
<FrameLayout
android:id="@+id/fljinyan"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_height="@dimen/dp_52"
android:background="@color/white"
android:visibility="gone"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:paddingStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_1"
android:paddingEnd="@dimen/dp_15"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/flhbkz">
@@ -421,9 +463,11 @@
<FrameLayout
android:id="@+id/rlteam_jubao"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_height="@dimen/dp_52"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fljinyan">
@@ -431,7 +475,7 @@
<TextView
android:id="@+id/tvteamsetting_jubao"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
@@ -440,6 +484,36 @@
android:textSize="@dimen/sp_16"
app:drawableStartCompat="@mipmap/ic_setting_set2" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end|center_vertical"
app:srcCompat="@mipmap/ic_setting_enter" />
</FrameLayout>
<FrameLayout
android:id="@+id/zhuanshuhongbao_fl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:layout_marginTop="1dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rlteam_jubao">
<TextView
android:id="@+id/zhuanshuhongbao_set"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="未领取专属红包展示区"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
app:drawableStartCompat="@mipmap/hongbao" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -450,13 +524,15 @@
<FrameLayout
android:id="@+id/rlteam_set"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_height="@dimen/dp_52"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_1"
android:background="@color/white"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rlteam_jubao">
app:layout_constraintTop_toBottomOf="@id/zhuanshuhongbao_fl">
<TextView
android:id="@+id/tvteamsetting_set"
@@ -478,4 +554,11 @@
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/qr_ry"
android:background="#EEF0F7"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/activity_bind_usdt.xml
View File

@@ -94,7 +94,7 @@
android:textSize="14sp"
/>
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_110"
android:layout_height="@dimen/dp_110"
android:layout_gravity="center_horizontal"
@@ -151,7 +151,7 @@
android:background="@drawable/index_user_bg"
android:orientation="vertical">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/image_iv1"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"

41
app/src/main/res/layout/activity_bind_wechat_alipay.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:id="@+id/big_bg"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -39,8 +39,9 @@
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/dp_15"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@@ -52,9 +53,10 @@
<EditText
android:layout_width="match_parent"
android:layout_height="44dp"
android:gravity="center_vertical"
android:background="@color/transparent"
android:layout_height="58dp"
android:background="@drawable/cornor_stroke_thempink_gray"
android:paddingStart="@dimen/dp_10"
android:hint ="请输入您的真实姓名"
android:textColorHint="#ff999999"
android:textSize="18sp"
@@ -78,11 +80,12 @@
/>
<EditText
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_height="58dp"
android:background="@drawable/cornor_stroke_thempink_gray"
android:paddingStart="@dimen/dp_10"
android:layout_marginTop="10dp"
android:id="@+id/number_et"
android:gravity="center_vertical"
android:background="@color/transparent"
android:hint ="请输入您本人使用的微信账号"
android:textColorHint="#ff999999"
android:textSize="18sp"
@@ -104,7 +107,7 @@
android:textSize="14sp"
/>
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_110"
android:layout_height="@dimen/dp_110"
android:layout_gravity="center_horizontal"
@@ -123,15 +126,19 @@
android:textColor="#999999"
android:textSize="14sp"
/>
<Button
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="@dimen/dp_30"
android:text="确定"
android:id="@+id/sumbit_bt"
android:background="@drawable/button_true_bg1"
android:textColor="#fff6f8fd"
android:textSize="16sp"
/>
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
android:layout_marginTop="@dimen/dp_30"
android:text="确定"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:id="@+id/sumbit_bt"
android:background="@drawable/button_true_bg1"
android:textColor="#fff6f8fd"
android:textSize="16sp"
/>
</androidx.appcompat.widget.LinearLayoutCompat>

2
app/src/main/res/layout/activity_buy_account.xml
View File

@@ -180,7 +180,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.hbl.lewan.widget.StatusLayout
<com.hbl.yuliao.widget.StatusLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar

4
app/src/main/res/layout/activity_change_accout_action.xml
View File

@@ -208,7 +208,7 @@
<!-- android:src="@drawable/yanjing_hide" />-->
</LinearLayout>
<com.hbl.lewan.custom.PasswordEditText
<com.hbl.yuliao.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -221,7 +221,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.hbl.lewan.custom.PasswordEditText>
</com.hbl.yuliao.custom.PasswordEditText>
<View
android:id="@+id/line_step2_v"

63
app/src/main/res/layout/activity_change_paypassword.xml
View File

@@ -5,37 +5,30 @@
android:id="@+id/big_ry"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/user_true1"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
<com.hbl.lewan.widget.StatusLayout
android:id="@+id/st_step2"
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/about_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@color/white"
tools:ignore="MissingConstraints" />
</com.hbl.lewan.widget.StatusLayout>
<ImageView
android:id="@+id/back_step2_bt"
android:layout_width="50dp"
android:layout_height="50dp"
android:scaleType="centerInside"
android:layout_below="@id/st_step2"
android:src="@mipmap/back_img"
android:visibility="visible" />
<LinearLayout
android:id="@+id/middle_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="118dp"
android:layout_marginTop="1dp"
android:layout_below="@id/about_title_bar"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:id="@+id/step2_ly"
android:layout_marginTop="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -45,24 +38,24 @@
android:id="@+id/title_step2_tv"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginLeft="30dp"
android:gravity="center"
android:text="@string/qszzfmm_txt"
android:textColor="#ff303336"
android:textColor="@color/color_2c2c2c"
android:textStyle="bold"
android:layout_gravity="center_horizontal"
android:textSize="24sp" />
<TextView
android:id="@+id/tips1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tips1"
android:layout_marginLeft="30dp"
android:text="@string/qsrlwcszmm_txt"
android:layout_marginTop="10dp"
android:textColor="#ff7e7b84"
android:textSize="14sp"
/>
android:text="@string/qsrlwcszmm_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<com.hbl.lewan.custom.PasswordEditText
<com.hbl.yuliao.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -75,9 +68,9 @@
app:passwordSize="26"
app:showPassword="false">
</com.hbl.lewan.custom.PasswordEditText>
</com.hbl.yuliao.custom.PasswordEditText>
<com.hbl.lewan.custom.PasswordEditText
<com.hbl.yuliao.custom.PasswordEditText
android:id="@+id/password_edit_text_code1"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -90,7 +83,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.hbl.lewan.custom.PasswordEditText>
</com.hbl.yuliao.custom.PasswordEditText>
</LinearLayout>
@@ -99,19 +92,19 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:src="@mipmap/success_img"
android:layout_marginTop="@dimen/dp_40"
android:scaleType="fitXY"
android:src="@mipmap/success_img"
android:visibility="gone" />
<TextView
android:id="@+id/succ_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:id="@+id/succ_tv"
android:visibility="gone"
android:textColor="#ff333333"
android:textSize="18sp"
/>
android:visibility="gone" />
</LinearLayout>
@@ -120,10 +113,10 @@
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_below="@id/middle_ly"
android:layout_marginLeft="30dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
android:layout_marginRight="30dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="30dp"
android:layout_marginRight="15dp"
android:background="@drawable/index_user_bg4"
android:gravity="center"
android:text="@string/next_txt"

189
app/src/main/res/layout/activity_change_phone.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/big_ry"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -14,23 +14,19 @@
android:id="@+id/setting_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_fcfcfc"
android:background="@color/white"
app:titleText="@string/gengaibangdingshoujihao_txt"
tools:ignore="MissingConstraints" />
<View
android:id="@+id/contact_list_activity_titleBar"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@id/setting_title_bar"
android:background="@color/color_f7f7f7" />
<LinearLayout
android:id="@+id/middle_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/contact_list_activity_titleBar"
android:layout_marginTop="30dp"
android:background="@color/white"
android:layout_marginTop="1dp"
android:layout_below="@id/setting_title_bar"
android:paddingTop="20dp"
android:paddingBottom="@dimen/dp_30"
android:orientation="vertical">
<LinearLayout
@@ -45,8 +41,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/yibangshoujihao_txt"
android:textColor="#ff333333"
android:textSize="18sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="24sp" />
<TextView
@@ -55,8 +51,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="153****8326"
android:textColor="#ff7e7b84"
android:textSize="24sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="36sp" />
</LinearLayout>
<LinearLayout
@@ -64,7 +60,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
@@ -72,47 +67,57 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:gravity="center_horizontal"
android:text="@string/qsryzm_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
android:id="@+id/send_sms_tips_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_15"
android:text="@string/djfsyzm_txt"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
app:bgInputed="@drawable/bg_inputed"
app:bgInputing="@drawable/bg_inputing"
app:count="4"
app:passwordSize="26"
app:showPassword="true">
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/get_code_txt"
android:textColor="@color/color_6b3689"
android:textSize="14sp" />
android:layout_marginTop="@dimen/dp_30"
android:layout_marginStart="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<EditText
android:id="@+id/password_edit_text_code"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="请输入短信验证码"
android:layout_weight="1"
android:inputType="number"
android:paddingLeft="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_code_txt"
android:layout_marginEnd="@dimen/dp_10"
android:id="@+id/send_sms_tv"
android:textColor="#6D94FF"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
@@ -120,8 +125,8 @@
android:id="@+id/step3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:orientation="vertical"
android:visibility="gone">
@@ -129,8 +134,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/srndsjh_txt1"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:gravity="center_horizontal"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
@@ -139,19 +145,21 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/xiugai_tips_txt"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_14" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_90"
android:layout_marginTop="@dimen/dp_30"
android:paddingStart="10dp"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<TextView
android:id="@+id/area_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_58"
android:gravity="center_vertical"
android:text="+86"
android:textColor="@color/color_333333"
@@ -160,7 +168,7 @@
<EditText
android:id="@+id/phone_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="@string/qsrsjh_txt"
android:inputType="phone"
@@ -170,10 +178,10 @@
android:textSize="@dimen/sp_18" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_1"-->
<!-- android:background="@color/color_d8d8d8" />-->
</LinearLayout>
<LinearLayout
@@ -190,8 +198,9 @@
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:text="@string/qsryzm_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:gravity="center_horizontal"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
@@ -202,33 +211,43 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_30"
android:text="@string/djfsyzm_txt"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code1"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
app:bgInputed="@drawable/bg_inputed"
app:bgInputing="@drawable/bg_inputing"
app:count="4"
app:passwordSize="26"
app:showPassword="true">
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv1"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/get_code_txt"
android:textColor="@color/color_6d80ff"
android:textSize="14sp" />
android:layout_marginTop="@dimen/dp_30"
android:layout_marginStart="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<EditText
android:id="@+id/password_edit_text_code1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="请输入短信验证码"
android:layout_weight="1"
android:inputType="number"
android:paddingLeft="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_code_txt"
android:layout_marginEnd="@dimen/dp_10"
android:id="@+id/send_sms_tv1"
android:textColor="#6D94FF"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
@@ -238,11 +257,11 @@
<TextView
android:id="@+id/sumbit_bt"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_height="@dimen/dp_52"
android:layout_below="@id/middle_ly"
android:layout_marginLeft="30dp"
android:layout_marginTop="60dp"
android:layout_marginRight="30dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="30dp"
android:layout_marginRight="15dp"
android:background="@drawable/fun_themeblue_btn_bg"
android:gravity="center"
android:text="@string/genghuanshoujihao_txt"

162
app/src/main/res/layout/activity_chongzhi.xml
View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:orientation="vertical"
tools:context=".welcome.WelcomeActivity">
@@ -13,7 +13,7 @@
android:id="@+id/about_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_fcfcfc"
android:background="@color/white"
app:titleText="@string/szmm_txt"
tools:ignore="MissingConstraints" />
@@ -21,14 +21,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/dp_30">
android:layout_marginTop="@dimen/dp_1">
<LinearLayout
android:id="@+id/step2_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:background="@color/white"
android:orientation="vertical"
android:visibility="gone">
@@ -36,26 +35,41 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/szmm_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:gravity="center"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/setpwd_hint_txt"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置密码"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_15"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<EditText
android:id="@+id/password_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_90"
android:background="@color/transparent"
android:layout_height="@dimen/dp_58"
android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint="@string/srmm_hint_txt"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:paddingStart="@dimen/dp_10"
android:maxLength="32"
android:inputType="textPassword"
@@ -63,30 +77,34 @@
android:textColorHint="@color/color_bcbcbc"
android:textSize="@dimen/sp_18" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="确认密码"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<EditText
android:id="@+id/password_et1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_35"
android:layout_height="@dimen/dp_58"
android:layout_marginTop="@dimen/dp_15"
android:maxLength="32"
android:background="@color/transparent"
android:layout_marginBottom="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:paddingStart="@dimen/dp_10"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint="@string/qzcsrmm_txt"
android:inputType="textPassword"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_bcbcbc"
android:textSize="@dimen/sp_18" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
</LinearLayout>
@@ -95,65 +113,85 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="@dimen/dp_1"
android:paddingTop="@dimen/dp_15"
android:background="@color/white"
android:visibility="visible">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:text="@string/qsryzm_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:gravity="center_horizontal"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_15"
android:id="@+id/send_sms_tips_tv"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
app:bgInputed="@drawable/bg_inputed"
app:bgInputing="@drawable/bg_inputing"
app:count="4"
app:passwordSize="26"
app:showPassword="true">
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/get_code_txt"
android:textColor="@color/color_6d94ff"
android:textSize="14sp" />
android:layout_marginTop="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<EditText
android:id="@+id/password_edit_text_code"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="请输入短信验证码"
android:layout_weight="1"
android:inputType="number"
android:paddingLeft="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_code_txt"
android:layout_marginEnd="@dimen/dp_10"
android:id="@+id/send_sms_tv"
android:textColor="#6D94FF"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
<ImageView
<TextView
android:id="@+id/next_iv"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_60"
android:src="@mipmap/step_next_img" />
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
android:layout_below="@id/middle_ly"
android:layout_marginLeft="15dp"
android:layout_marginTop="30dp"
android:layout_marginRight="15dp"
android:background="@drawable/fun_themeblue_btn_bg"
android:gravity="center"
android:text="@string/next_txt"
android:textColor="#ffffffff"
android:textSize="16sp" />
<TextView
android:id="@+id/change_sms_code_tv"
android:layout_width="wrap_content"

114
app/src/main/res/layout/activity_chongzhi_pay.xml
View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:orientation="vertical"
tools:context=".welcome.WelcomeActivity">
@@ -13,14 +13,16 @@
android:id="@+id/about_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_fcfcfc"
android:background="@color/white"
app:titleText="@string/sfrz_txt"
tools:ignore="MissingConstraints" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="1dp"
android:background="@color/white"
android:paddingTop="@dimen/dp_30">
<LinearLayout
@@ -35,9 +37,10 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:gravity="center"
android:text="@string/qsryzm_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
@@ -47,70 +50,63 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_30"
android:id="@+id/send_sms_tips_tv"
android:text="@string/djfsyzm_txt"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
app:bgInputed="@drawable/bg_inputed"
app:bgInputing="@drawable/bg_inputing"
app:count="4"
app:passwordSize="26"
app:showPassword="true">
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/get_code_txt"
android:textColor="@color/color_themeblue"
android:textSize="14sp" />
android:layout_marginTop="@dimen/dp_30"
android:layout_marginStart="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<EditText
android:id="@+id/password_edit_text_code"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="请输入短信验证码"
android:layout_weight="1"
android:inputType="number"
android:paddingLeft="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_code_txt"
android:layout_marginEnd="@dimen/dp_10"
android:id="@+id/send_sms_tv"
android:textColor="#6D94FF"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/next_iv"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_60"
android:src="@mipmap/step_next_img" />
<TextView
android:id="@+id/change_sms_code_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_30"
android:text="@string/qhwyzmdl_txt"
android:textColor="@color/color_6b3689"
android:textSize="14sp"
android:visibility="gone" />
<TextView
android:id="@+id/change_pass_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_30"
android:text="@string/qhwmmdl_txt"
android:textColor="@color/color_6b3689"
android:textSize="14sp"
android:visibility="gone" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/next_iv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/cornor_thempink_12dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_30"
android:textSize="@dimen/sp_16"
android:gravity="center"
android:text="下一步"
android:textColor="@color/white"
android:src="@mipmap/step_next_img" />
</LinearLayout>

70
app/src/main/res/layout/activity_close_account.xml
View File

@@ -45,47 +45,61 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:text="@string/qsryzm_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
android:id="@+id/send_sms_tips_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_30"
android:textColor="@color/color_7f7b81"
android:textSize="14sp" />
android:layout_marginRight="@dimen/dp_15"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
app:bgInputed="@drawable/bg_inputed"
app:bgInputing="@drawable/bg_inputing"
app:count="4"
app:passwordSize="26"
app:showPassword="true">
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/get_code_txt"
android:textColor="@color/color_6d94ff"
android:textSize="14sp" />
android:layout_marginTop="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<EditText
android:id="@+id/password_edit_text_code"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="请输入短信验证码"
android:layout_weight="1"
android:inputType="number"
android:paddingLeft="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_code_txt"
android:layout_marginEnd="@dimen/dp_10"
android:id="@+id/send_sms_tv"
android:textColor="#6D94FF"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>

202
app/src/main/res/layout/activity_edit_nickname.xml
View File

@@ -7,124 +7,178 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/clyRoot"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/clyRoot"
android:background="@color/white"
android:background="#EEF0F7"
tools:context=".main.mine.EditUserInfoActivity">
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="?actionBarSize"
android:gravity="center"
android:text="@string/user_info_nickname"
android:textColor="@color/color_333333"
android:textSize="16dp"
android:textStyle="bold"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tvTitles"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="SpUsage" />
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/ivBack"
android:layout_width="26dp"
android:layout_height="?actionBarSize"
android:layout_marginStart="20dp"
android:src="@drawable/ic_arrow_left"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="?actionBarSize"
android:gravity="center"
android:text="@string/user_info_nickname"
android:textColor="@color/color_333333"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="SpUsage" />
<ImageView
android:id="@+id/ivBack"
android:layout_width="26dp"
android:layout_height="?actionBarSize"
android:layout_marginStart="15dp"
android:src="@drawable/ic_arrow_left"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
app:layout_constraintTop_toBottomOf="@id/tvTitle"
android:background="@color/color_f7f7f7" />
android:layout_height="@dimen/dp_10"
android:background="#EEF0F7"
app:layout_constraintTop_toBottomOf="@id/tvTitles" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:id="@+id/title_ly"
android:layout_width="match_parent"
android:layout_height="52dp"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@id/tvTitle">
app:layout_constraintTop_toBottomOf="@id/tvTitles">
<TextView
android:id="@+id/title_left_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/title_left_name"
android:text="@string/mingzi_txt"
android:textColor="#ff666666"
android:textSize="12sp"
/>
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<TextView
android:id="@+id/number_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0/20"
android:id="@+id/number_tv"
android:textColor="#ff999999"
android:textSize="12sp"
/>
android:textSize="14sp" />
</LinearLayout>
<EditText
android:id="@+id/etNickname"
<RelativeLayout
android:id="@+id/etNicknames"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/dp_54"
android:layout_marginTop="22dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@color/transparent"
android:gravity="center_vertical"
android:hint="@string/qsrmz_hint_txt"
android:textColor="@color/color_333333"
android:paddingEnd="35dp"
android:maxLength="15"
android:textColorHint="@color/color_999999"
android:textSize="16sp"
app:layout_constraintTop_toBottomOf="@id/title_ly"
tools:ignore="SpUsage" />
android:background="@color/white"
app:layout_constraintTop_toBottomOf="@id/title_ly">
<ImageView
android:id="@+id/ivClear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
android:src="@drawable/ic_clear"
app:layout_constraintBottom_toBottomOf="@id/etNickname"
app:layout_constraintEnd_toEndOf="@id/etNickname"
app:layout_constraintTop_toTopOf="@id/etNickname" />
<RelativeLayout
android:id="@+id/etNicknames_1"
android:layout_width="match_parent"
android:layout_height="73dp"
android:background="@color/white">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@id/etNickname"
android:background="@color/color_f7f7f7" />
<EditText
android:id="@+id/etNickname"
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/cornor_stroke_thempink_gray"
android:gravity="center_vertical"
android:hint="@string/qsrmz_hint_txt"
android:maxLength="20"
android:minHeight="@dimen/dp_54"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="35dp"
android:textColor="@color/color_2c2c2c"
android:textColorHint="@color/color_999999"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="parent"
tools:ignore="SpUsage" />
<ImageView
android:id="@+id/ivClear"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_58"
android:layout_alignParentRight="true"
android:layout_marginEnd="@dimen/dp_25"
android:src="@drawable/ic_clear"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/etNickname"
app:layout_constraintEnd_toEndOf="@id/etNickname"
app:layout_constraintTop_toTopOf="@id/etNickname" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/etNicknames_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:visibility="gone">
<EditText
android:id="@+id/etNickname1"
android:layout_width="match_parent"
android:layout_height="174dp"
android:padding="@dimen/dp_10"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="20dp"
android:gravity="top"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint="@string/qsrmz_hint_txt1"
android:maxLength="15"
android:minHeight="@dimen/dp_54"
android:paddingEnd="35dp"
android:textColor="@color/color_2c2c2c"
android:textColorHint="@color/color_999999"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="parent"
tools:ignore="SpUsage" />
</RelativeLayout>
</RelativeLayout>
<TextView
android:id="@+id/tvDone"
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_height="52dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/fun_themeblue_btn_bg"
android:layout_marginTop="@dimen/dp_40"
android:gravity="center"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:text="@string/save"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
android:paddingStart="22dp"
android:paddingEnd="22dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/etNickname"
app:layout_constraintTop_toBottomOf="@id/etNicknames"
tools:ignore="SpUsage" />

8
app/src/main/res/layout/activity_get_code_setting.xml
View File

@@ -9,12 +9,12 @@
android:orientation="vertical">
<com.hbl.lewan.widget.StatusLayout
<com.hbl.yuliao.widget.StatusLayout
android:id="@+id/st_step2"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</com.hbl.lewan.widget.StatusLayout>
</com.hbl.yuliao.widget.StatusLayout>
<ImageView
@@ -62,7 +62,7 @@
android:textSize="14sp"
/>
<com.hbl.lewan.custom.PasswordEditText
<com.hbl.yuliao.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -75,7 +75,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.hbl.lewan.custom.PasswordEditText>
</com.hbl.yuliao.custom.PasswordEditText>
</LinearLayout>

2
app/src/main/res/layout/activity_help.xml
View File

@@ -49,7 +49,7 @@
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

846
app/src/main/res/layout/activity_loc_user_info.xml
View File

@@ -1,463 +1,477 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="#EEF0F7"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/setting_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:titleText="@string/grzl_txt"
tools:ignore="MissingConstraints" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f7f7f7" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
tools:context=".main.mine.MineInfoActivity">
<androidx.cardview.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_15"
app:cardBackgroundColor="@color/color_f4f4f4"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="0dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/forbg_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_marginStart="@dimen/dp_5"-->
<!-- android:layout_marginTop="@dimen/dp_5"-->
<!-- android:layout_marginEnd="@dimen/dp_5"-->
<!-- android:layout_marginBottom="@dimen/dp_5"-->
<!-- android:src="@mipmap/add_head_forbg_img" />-->
<RelativeLayout
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_centerInParent="true">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/cavAvatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/default_head_img"
app:es_shape_type="round" />
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_margin="@dimen/dp_5"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:src="@mipmap/add_head_forbg_img"/>-->
</RelativeLayout>
</RelativeLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_15"
android:scrollbars="none"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_view">
android:scrollbars="none">
<LinearLayout
android:id="@+id/llUserInfo"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/rectangle_white_reduce_bg"
android:orientation="vertical"
tools:ignore="SpUsage">
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mingzi_txt"
android:textColor="@color/color_666666"
android:textSize="12sp" />
<FrameLayout
android:id="@+id/flName"
<ImageView
android:id="@+id/forbg_iv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
android:layout_height="275dp"
android:scaleType="centerCrop" />
<View android:layout_width="match_parent"
android:layout_height="15dp"
android:background="@drawable/rectangle_white_reduce_bg_top"
android:layout_alignBottom="@id/forbg_iv"/>
<TextView
android:id="@+id/tvName"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
tools:text="11111111111" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="@string/gexingqianming_txt"
android:textColor="@color/color_666666"
android:textSize="12sp" />
<FrameLayout
android:id="@+id/flSign"
<LinearLayout
android:id="@+id/llUserInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/dp_54"
android:background="@drawable/rectangle_white_reduce_bg"
app:layout_constraintTop_toBottomOf="@+id/llUserInfo">
android:layout_below="@id/forbg_iv"
android:background="@color/white"
android:orientation="vertical"
tools:ignore="SpUsage">
<TextView
android:id="@+id/tvSign"
<FrameLayout
android:id="@+id/flName"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/dp_15"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvName"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="30dp"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_20"
tools:text="11111111111" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@mipmap/user_blue_edit" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/flSign"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="center_vertical"
android:hint="@string/zanwugexinqianming_txt"
android:background="@drawable/rectangle_white_reduce_bg"
android:minHeight="@dimen/dp_54"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14" />
android:paddingStart="15dp"
android:paddingEnd="15dp"
app:layout_constraintTop_toBottomOf="@+id/llUserInfo">
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="62dp"
android:gravity="center_vertical"
android:text="@string/gexingqianming_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<TextView
android:id="@+id/tvSign"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_70"
android:ellipsize="end"
android:gravity="center_vertical|right"
android:hint="@string/zanwugexinqianming_txt"
android:minHeight="62dp"
android:drawableRight="@drawable/ic_frame_mine_right_arrow"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="@string/dianhuahaoma_txt"
android:textColor="@color/color_666666"
android:textSize="12sp" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="#EEF0F7" />
<FrameLayout
android:id="@+id/flSexual"
android:layout_width="match_parent"
android:layout_height="62dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:visibility="visible">
<FrameLayout
android:id="@+id/flPhone"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<TextView
android:id="@+id/tvSexualTip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/user_info_sexual"
android:textColor="@color/color_2c2c2c"
android:textSize="16dp" />
<TextView
android:id="@+id/tvPhone"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tvSexual"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="16dp"
android:gravity="end|center_vertical"
android:singleLine="true"
android:textColor="@color/color_2c2c2c"
android:textSize="12dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/flBirthday"
android:layout_width="match_parent"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:layout_height="62dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/lailiaozhanghao_txt"
android:textColor="@color/color_666666"
android:textSize="12sp" />
<TextView
android:id="@+id/tvBirthdayTip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/user_info_birthday"
android:textColor="@color/color_2c2c2c"
android:textSize="16dp"
tools:ignore="SpUsage" />
<FrameLayout
android:id="@+id/flAccount"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<TextView
android:id="@+id/tvBirthday"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end|center_vertical"
android:layout_marginStart="@dimen/dp_50"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="end|center_vertical"
android:singleLine="true"
android:textColor="@color/color_2c2c2c"
android:textSize="12dp"
tools:text="11111111111" />
<TextView
android:id="@+id/tvAccountTip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/lailiaozhanghao_txt"
android:textColor="@color/color_333333"
android:textSize="16dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="#EEF0F7" />
<FrameLayout
android:id="@+id/qrcode_fy"
android:layout_width="match_parent"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:layout_height="62dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24"
android:text="@string/fuzhi_txt"
android:id="@+id/ivAccountCopy"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:gravity="center_vertical"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/button_false_bg1"
android:layout_gravity="end|center_vertical"
android:textColor="#ff333333"
android:textSize="10sp"
/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow"
android:visibility="visible" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginStart="16dp"-->
<!-- android:layout_marginEnd="20dp"-->
<!-- android:background="@color/color_f5f8fc" />-->
<FrameLayout
android:id="@+id/flSexual"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:visibility="visible">
<TextView
android:id="@+id/tvSexualTip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/user_info_sexual"
android:textColor="@color/color_333333"
android:textSize="16dp" />
<TextView
android:id="@+id/tvSexual"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="16dp"
android:gravity="end|center_vertical"
android:singleLine="true"
android:textColor="@color/color_a6adb6"
android:textSize="12dp" />
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/flid_add_fy"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="@dimen/dp_54">
<TextView
android:id="@+id/tvid_addTip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/yxtrtgidss_txt"
android:textColor="@color/color_333333"
android:textSize="16dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/flid_add_sc"
android:layout_width="wrap_content"
android:layout_height="@dimen/dimen_24_dp"
android:layout_gravity="end|center_vertical"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:checked="true"
android:thumb="@drawable/switch_thumb_selector"
app:track="@drawable/switch_track_selector" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:visibility="gone"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/qrcode_fy"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<TextView
android:id="@+id/qrcode_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/wdewm_txt"
android:textColor="@color/color_333333"
android:textSize="16dp" />
<TextView
android:id="@+id/qrcode_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginEnd="28dp"
android:drawableRight="@mipmap/pay_qrcode_img"
android:text="@string/wdewm_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/flBirthday"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="#EEF0F7" />
<FrameLayout
android:id="@+id/flPhone"
android:layout_width="match_parent"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:layout_height="62dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="62dp"
android:gravity="center_vertical"
android:text="@string/dianhuahaoma_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<TextView
android:id="@+id/tvPhone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="20dp"
android:layout_marginStart="@dimen/dp_70"
android:gravity="center_vertical|right"
android:singleLine="true"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tvBirthdayTip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/user_info_birthday"
android:textColor="@color/color_333333"
android:textSize="16dp"
tools:ignore="SpUsage" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<TextView
android:id="@+id/tvBirthday"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end|center_vertical"
android:layout_marginStart="@dimen/dp_50"
tools:text="11111111111"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="end|center_vertical"
android:singleLine="true"
android:textColor="@color/color_999999"
android:textSize="12dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginStart="16dp"-->
<!-- android:layout_marginEnd="20dp"-->
<!-- android:background="@color/color_f5f8fc" />-->
<FrameLayout
android:id="@+id/edithead_fy"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<TextView
android:id="@+id/edithead_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/szgrzltxyfm_txt"
android:textColor="@color/color_333333"
android:textSize="16dp"
tools:ignore="SpUsage" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<FrameLayout
android:id="@+id/flEmail"
android:layout_width="match_parent"
android:layout_height="46dp"
android:visibility="gone">
<FrameLayout
android:id="@+id/flAccount"
android:layout_width="match_parent"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:layout_height="62dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="62dp"
android:gravity="center_vertical"
android:text="@string/lailiaozhanghao_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<TextView
android:id="@+id/tvAccountTip"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="70dp"
android:layout_marginStart="@dimen/dp_70"
android:gravity="center_vertical|right"
android:singleLine="true"
android:text="1111"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tvEmailTip"
android:layout_width="wrap_content"
<TextView
android:id="@+id/ivAccountCopy"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24"
android:layout_gravity="end|center_vertical"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/button_false_bg1"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:text="@string/fuzhi_txt"
android:textColor="#ff333333"
android:textSize="10sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow"
android:visibility="visible" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginStart="16dp"-->
<!-- android:layout_marginEnd="20dp"-->
<!-- android:background="@color/color_f5f8fc" />-->
<FrameLayout
android:id="@+id/flid_add_fy"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:visibility="gone">
<TextView
android:id="@+id/tvid_addTip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/yxtrtgidss_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/flid_add_sc"
android:layout_width="wrap_content"
android:layout_height="@dimen/dimen_24_dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_gravity="end|center_vertical"
android:checked="true"
android:thumb="@drawable/switch_thumb_selector"
app:track="@drawable/switch_track_selector" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4"
android:visibility="gone" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:visibility="gone"
android:background="@color/color_f4f4f4" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginStart="16dp"-->
<!-- android:layout_marginEnd="20dp"-->
<!-- android:background="@color/color_f5f8fc" />-->
<FrameLayout
android:id="@+id/edithead_fy"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="@dimen/dp_54">
<TextView
android:id="@+id/edithead_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/szgrzltxyfm_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16dp"
tools:ignore="SpUsage" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<FrameLayout
android:id="@+id/flEmail"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_marginStart="@dimen/dp_16"
android:gravity="center"
android:text="@string/user_info_email"
android:textColor="@color/color_333333"
android:textSize="16dp" />
android:visibility="gone">
<TextView
android:id="@+id/tvEmail"
android:layout_width="wrap_content"
android:layout_height="46dp"
android:layout_gravity="end|center_vertical"
android:layout_marginStart="@dimen/dp_50"
android:layout_marginEnd="64dp"
android:gravity="end|center_vertical"
android:singleLine="true"
android:textColor="@color/color_a6adb6"
android:textSize="12dp" />
<TextView
android:id="@+id/tvEmailTip"
android:layout_width="wrap_content"
android:layout_height="46dp"
android:layout_marginStart="@dimen/dp_16"
android:gravity="center"
android:text="@string/user_info_email"
android:textColor="@color/color_2c2c2c"
android:textSize="16dp" />
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="36dp"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"/>
</LinearLayout>
<TextView
android:id="@+id/tvEmail"
android:layout_width="wrap_content"
android:layout_height="46dp"
android:layout_gravity="end|center_vertical"
android:layout_marginStart="@dimen/dp_50"
android:layout_marginEnd="64dp"
android:gravity="end|center_vertical"
android:singleLine="true"
android:textColor="@color/color_a6adb6"
android:textSize="12dp" />
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="36dp"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
</LinearLayout>
<androidx.cardview.widget.CardView
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:layout_marginTop="220dp"
app:cardCornerRadius="@dimen/dp_40"
app:cardBackgroundColor="@color/white"
android:layout_centerHorizontal="true">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/cavAvatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="1dp"
android:src="@mipmap/default_head_img"
app:es_shape_type="round" />
</androidx.cardview.widget.CardView>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_80"
android:layout_below="@id/llUserInfo"/>
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
<com.hbl.yuliao.widget.StatusLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/setting_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:ignore="MissingConstraints" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/qr_ry"
android:background="#EEF0F7"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
</RelativeLayout>

24
app/src/main/res/layout/activity_main.xml
View File

@@ -9,6 +9,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/root_v"
android:fitsSystemWindows="false"
android:foreground="?android:attr/selectableItemBackground"
>
@@ -28,13 +29,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:clipChildren="false"
android:id="@+id/bottom_group_t"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:elevation="3dp"
tools:ignore="MissingConstraints">
<LinearLayout
@@ -42,7 +41,6 @@
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="#FFFFFF"
android:clipChildren="false"
android:orientation="horizontal">
<RelativeLayout
@@ -94,7 +92,7 @@
android:drawablePadding="3dp"
android:gravity="center"
android:text="@string/chat_txt"
android:textColor="@color/color_898989"
android:textColor="@color/color_babeca"
android:textSize="12sp" />
<TextView
@@ -120,7 +118,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:onClick="tabClick"
android:visibility="gone">
android:visibility="visible">
<TextView
android:id="@+id/live"
@@ -131,7 +129,7 @@
android:drawablePadding="3dp"
android:gravity="center"
android:text="@string/voom_txt"
android:textColor="@color/color_898989"
android:textColor="@color/color_babeca"
android:textSize="12sp" />
</RelativeLayout>
@@ -153,7 +151,7 @@
android:drawablePadding="3dp"
android:gravity="center"
android:text="@string/mini_txt"
android:textColor="@color/color_898989"
android:textColor="@color/color_babeca"
android:textSize="12sp" />
</RelativeLayout>
@@ -164,4 +162,16 @@
android:layout_width="match_parent"
android:layout_height="0dp" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/qr_ry"
android:background="#EEF0F7"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/activity_message.xml
View File

@@ -128,7 +128,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/activity_message_act.xml
View File

@@ -29,7 +29,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_fffbfb">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

49
app/src/main/res/layout/activity_mine_setting_notify.xml
View File

@@ -10,35 +10,34 @@
android:id="@+id/cl_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_f7f7f7"
android:background="@drawable/user_true1"
tools:ignore="MissingDefaultResource">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/setting_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_f7f7f7"
android:background="@color/white"
app:titleText="@string/setting_notify"
tools:ignore="MissingConstraints" />
<RelativeLayout
android:id="@+id/notify_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:layout_margin="@dimen/dp_15"
android:layout_marginTop="@dimen/dimen_4_dp"
android:background="@drawable/item_button_bg_w"
android:layout_height="@dimen/dp_62"
android:layout_marginTop="@dimen/dimen_10_dp"
android:background="@color/white"
app:layout_constraintTop_toBottomOf="@id/setting_title_bar">
<TextView
android:id="@+id/notify_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_54"
android:layout_height="@dimen/dp_62"
android:layout_marginStart="@dimen/dp_16"
android:gravity="center"
android:text="@string/setting_notify_info"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14" />
android:textSize="@dimen/sp_16" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/notify_sc"
@@ -141,11 +140,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dimen_20_dp"
android:text="@string/setting_notify_other"
android:textColor="@color/color_666666"
android:textSize="@dimen/text_size_12"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/text_size_14"
app:layout_constraintTop_toBottomOf="@id/notify_mode_ll"
tools:ignore="MissingConstraints" />
@@ -153,26 +152,24 @@
android:id="@+id/push_mode_ll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/item_button_bg_w"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/white"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/setting_push_mode_tv">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
android:layout_height="@dimen/dp_62">
<TextView
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_54"
android:layout_height="@dimen/dp_62"
android:layout_marginStart="@dimen/dp_16"
android:gravity="center"
android:text="@string/setting_notify_push_detail"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14" />
android:textSize="@dimen/sp_16" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/notify_show_info_sc"
@@ -192,11 +189,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dimen_20_dp"
android:text="@string/setting_notify_push_ring"
android:textColor="@color/color_666666"
android:textSize="@dimen/text_size_12"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/text_size_14"
app:layout_constraintTop_toBottomOf="@id/push_mode_ll"
tools:ignore="MissingConstraints" />
@@ -204,10 +201,8 @@
android:id="@+id/push_mode_ring"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/item_button_bg_w"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/white"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/setting_push_ring_tv">
@@ -215,12 +210,12 @@
android:id="@+id/messagering_tv"
style="@style/settings_item_bg_group_full_20191"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_60"
android:layout_height="@dimen/dp_62"
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/setting_notify_push_message"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_16"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
<View

178
app/src/main/res/layout/activity_mywallet.xml
View File

@@ -4,47 +4,36 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F6F5F7"
android:background="@drawable/user_true1"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/contact_list_activity_titleBar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="@color/white"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:titleText="我的钱包"
app:titleTextColor="@android:color/black" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/big_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="match_parent"
android:layout_height="211dp"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:src="@mipmap/qianbao_top_bg"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/contact_list_activity_titleBar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:titleText="我的钱包"
app:titleTextColor="@android:color/black" />
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="180dp"
android:layout_height="189dp"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="?actionBarSize"
android:layout_marginTop="10dp"
android:layout_marginEnd="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_12"
android:background="@mipmap/qianbao_top_float_bg"
android:layout_marginBottom="@dimen/dp_10"
android:orientation="vertical"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="0dp"
app:cardMaxElevation="0dp"
app:layout_constraintDimensionRatio="346:180"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -55,36 +44,63 @@
android:layout_height="match_parent"
android:background="@mipmap/qianbao_top_float_bg"
android:orientation="vertical">
<LinearLayout
android:id="@+id/smrz_bt"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="实名认证 |"
android:layout_marginStart="15dp"
android:layout_marginRight="@dimen/dp_15"
android:gravity="center_vertical"
android:textColor="#ffffffff"
android:textSize="16sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text=" 实名认证可保障您的资金安全"
android:layout_marginRight="@dimen/dp_15"
android:gravity="center_vertical"
android:drawableRight="@drawable/ic_frame_mine_right_arrow"
android:drawableTint="@color/white"
android:textColor="#ffffffff"
android:textSize="14sp" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="我的零钱"
android:textColor="#ffffffff"
android:text="钱包余额"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<TextView
android:id="@+id/jinbi_yue_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_15"
android:textColor="#fffcf0a1"
android:textColor="#FF4646"
android:textSize="30sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dp_20"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_15"
android:gravity="center_horizontal|bottom"
android:orientation="horizontal">
<TextView
android:id="@+id/cz_bt"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_height="42dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_10"
android:layout_weight="1"
@@ -97,7 +113,7 @@
<TextView
android:id="@+id/tx_bt"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_height="42dp"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_20"
android:layout_weight="1"
@@ -116,9 +132,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_10"
android:orientation="vertical"
android:scrollbars="none">
@@ -130,14 +144,14 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/index_user_bg"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:id="@+id/safe_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
@@ -152,8 +166,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="红包记录"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/hongbao"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
@@ -168,7 +182,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -180,8 +194,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="零钱明细"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/mingxi"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
@@ -195,7 +209,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -207,8 +221,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="充值记录"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/czjl_img"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
@@ -222,7 +236,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -234,8 +248,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="提现记录"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/txjl_img"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
@@ -250,7 +264,7 @@
<LinearLayout
android:id="@+id/gmfh_ly"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone">
@@ -263,10 +277,10 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="购买副号"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/goumaifuhao"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
app:drawableRightCompat="@mipmap/ic_frame_mine_right_arrow" />
</LinearLayout>
<View
@@ -278,37 +292,10 @@
android:background="#D8D8D8"
android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="visible">
<Button
android:id="@+id/smrz_bt"
style="@style/settings_item_bg_group_full_20191"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="实名认证"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
app:drawableLeftCompat="@mipmap/shimingrenzheng"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="#D8D8D8" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="visible">
@@ -321,8 +308,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="我的银行卡"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/yinhangqiahao"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
@@ -336,7 +323,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="visible">
@@ -349,8 +336,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="我的微信"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/weixin"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
@@ -364,7 +351,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="visible">
@@ -377,8 +364,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="我的支付宝"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/zhifubao"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
@@ -392,7 +379,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="visible">
@@ -405,16 +392,17 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="我的USDT钱包"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/usdt"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<View
android:layout_width="match_parent"
android:layout_height="40dp"/>
android:layout_height="40dp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</ScrollView>
</androidx.appcompat.widget.LinearLayoutCompat>

32
app/src/main/res/layout/activity_pay_setting.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -13,7 +13,7 @@
android:id="@+id/contact_list_activity_titleBar"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="@color/color_fcfcfc"
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:titleText="@string/pay_setting_txt"
app:titleTextColor="@android:color/black" />
@@ -26,7 +26,9 @@
android:layout_width="match_parent"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:layout_height="@dimen/dp_54">
android:layout_marginTop="@dimen/dp_10"
android:layout_height="@dimen/dp_64"
android:background="@color/white">
<TextView
android:layout_width="wrap_content"
@@ -52,18 +54,14 @@
android:layout_gravity="end|center_vertical"
/>
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:layout_width="match_parent"
android:id="@+id/zhiwen_fy"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:layout_height="@dimen/dp_54">
android:layout_marginTop="@dimen/dp_10"
android:layout_height="@dimen/dp_64"
android:background="@color/white">
<TextView
android:layout_width="wrap_content"
@@ -89,22 +87,18 @@
android:layout_gravity="end|center_vertical"
/>
</FrameLayout>
<View
android:layout_width="match_parent"
android:id="@+id/zhiwen_line"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_height="@dimen/dp_64"
android:background="@color/white"
>
<TextView
android:id="@+id/set_pass_bt"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:layout_height="match_parent"
android:paddingLeft="@dimen/dp_15"
android:textColor="@color/color_333333"
android:gravity="center_vertical"

170
app/src/main/res/layout/activity_phone_login.xml
View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_fffafa"
android:background="@drawable/user_true1"
android:orientation="vertical"
tools:context=".welcome.WelcomeActivity">
@@ -13,22 +13,23 @@
android:id="@+id/about_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_fffbfb"
android:background="@color/white"
app:titleText="@string/login_txt"
tools:ignore="MissingConstraints" />
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#E8E8E8"/>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/dp_30">
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/step1_ly"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:background="@color/white"
android:padding="@dimen/dp_15"
android:visibility="visible"
android:orientation="vertical">
@@ -36,7 +37,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/srndsjh_txt"
android:textColor="@color/color_383838"
android:gravity="center_horizontal"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_26" />
<TextView
@@ -44,49 +46,47 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_14" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_90"
android:layout_marginTop="@dimen/dp_30"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<TextView
android:id="@+id/area_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_58"
android:gravity="center_vertical"
android:text="+86"
android:textColor="@color/color_333333"
android:paddingStart="10dp"
android:textColor="@color/color_2c2c2c"
android:textSize="18sp" />
<EditText
android:id="@+id/phone_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="@string/qsrsjh_txt"
android:inputType="phone"
android:paddingLeft="@dimen/dp_20"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_bcbcbc"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_18" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/step2_ly"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:background="@color/white"
android:visibility="gone"
android:orientation="vertical">
@@ -94,30 +94,27 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/srmm_txt"
android:textColor="@color/color_333333"
android:layout_marginTop="15dp"
android:gravity="center_horizontal"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_26"
android:textStyle="bold" />
<EditText
android:id="@+id/password_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_90"
android:background="@color/transparent"
android:layout_height="@dimen/dp_58"
android:layout_marginStart="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_30"
android:paddingStart="@dimen/dp_10"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint="@string/srmm_hint_txt"
android:inputType="textPassword"
android:textColor="@color/color_333333"
android:textColor="@color/color_2c2c2c"
android:textColorHint="@color/color_bcbcbc"
android:textSize="@dimen/sp_18" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -125,7 +122,9 @@
android:layout_marginTop="20dp"
android:id="@+id/wangji_tv"
android:text="@string/wangjimima_txt"
android:textColor="#ffe44f3e"
android:layout_marginBottom="15dp"
android:layout_marginEnd="15dp"
android:textColor="#FF4646"
android:textSize="14sp"
/>
</LinearLayout>
@@ -135,15 +134,18 @@
android:layout_height="wrap_content"
android:id="@+id/step3_ly"
android:visibility="gone"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/qsryzm_txt"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:textColor="@color/color_333333"
android:gravity="center_horizontal"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginTop="15dp"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_26"
android:textStyle="bold" />
@@ -151,46 +153,78 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:id="@+id/sms_code_tips_tv"
android:textColor="#ff7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp"
/>
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
app:bgInputed="@drawable/bg_inputed"
app:bgInputing="@drawable/bg_inputing"
app:count="4"
app:passwordSize="26"
app:showPassword="true">
<!-- <com.hbl.yuliao.custom.PasswordEditText-->
<!-- android:id="@+id/password_edit_text_code"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="60dp"-->
<!-- android:layout_centerHorizontal="true"-->
<!-- android:layout_marginTop="60dp"-->
<!-- app:bgInputed="@drawable/bg_inputed"-->
<!-- app:bgInputing="@drawable/bg_inputing"-->
<!-- app:count="4"-->
<!-- app:passwordSize="26"-->
<!-- app:showPassword="true">-->
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:layout_width="wrap_content"
<!-- </com.hbl.yuliao.custom.PasswordEditText>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/get_code_txt"
android:id="@+id/send_sms_tv"
android:textColor="#6D94FF"
android:textSize="14sp"
/>
android:layout_marginTop="@dimen/dp_30"
android:layout_marginStart="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<EditText
android:id="@+id/password_edit_text_code"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="请输入短信验证码"
android:layout_weight="1"
android:inputType="number"
android:paddingLeft="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_code_txt"
android:layout_marginEnd="@dimen/dp_10"
android:id="@+id/send_sms_tv"
android:textColor="#6D94FF"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
<ImageView
<TextView
android:id="@+id/next_iv"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/cornor_thempink_12dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_30"
android:textSize="@dimen/sp_16"
android:gravity="center"
android:text="下一步"
android:textColor="@color/white"
android:src="@mipmap/step_next_img" />
<TextView
@@ -201,7 +235,7 @@
android:layout_marginTop="@dimen/dp_30"
android:layout_gravity="center_horizontal"
android:text="@string/qhwyzmdl_txt"
android:textColor="#F2507C"
android:textColor="#498AFA"
android:textSize="14sp"
/>
<TextView
@@ -212,7 +246,7 @@
android:layout_marginTop="@dimen/dp_30"
android:layout_gravity="center_horizontal"
android:text="@string/qhwmmdl_txt"
android:textColor="#F2507C"
android:textColor="#498AFA"
android:textSize="14sp"
/>

9
app/src/main/res/layout/activity_receive_red_packet.xml
View File

@@ -30,13 +30,13 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.hbl.lewan.widget.StatusLayout
<com.hbl.yuliao.widget.StatusLayout
android:id="@+id/st"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible">
</com.hbl.lewan.widget.StatusLayout>
</com.hbl.yuliao.widget.StatusLayout>
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/contact_list_activity_titleBar"
@@ -106,6 +106,7 @@
android:id="@+id/bileixin_iv"
android:layout_width="32dp"
android:layout_height="@dimen/dp_32"
android:visibility="gone"
android:layout_marginRight="@dimen/dp_10"
android:src="@mipmap/wallet_jinbi_img" />
@@ -114,7 +115,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0.00"
android:textColor="#CF924F"
android:textColor="#FF4E54"
android:textSize="36sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -126,7 +127,7 @@
android:layout_marginTop="14dp"
android:drawablePadding="5dp"
android:text="@string/to_wallet_send_redpack_txt"
android:textColor="#CF924F"
android:textColor="#FF4E54"
android:textSize="12sp"
android:visibility="visible" />

258
app/src/main/res/layout/activity_register.xml
View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="#EEF0F7"
android:orientation="vertical"
tools:context=".welcome.WelcomeActivity">
@@ -20,76 +20,78 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/dp_30">
android:orientation="vertical">
<LinearLayout
android:id="@+id/step1_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:background="@color/white"
android:padding="@dimen/dp_15"
android:orientation="vertical"
android:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableRight="@mipmap/reg_wecome_img"
android:drawablePadding="@dimen/dp_13"
android:gravity="center_horizontal"
android:text="@string/hyzc_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
android:id="@+id/mobile_tips_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="@dimen/dp_20"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_14" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_90"
android:layout_marginTop="@dimen/dp_30"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<TextView
android:id="@+id/area_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_58"
android:gravity="center_vertical"
android:text="+86"
android:textColor="@color/color_333333"
android:paddingStart="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textSize="18sp" />
<EditText
android:id="@+id/phone_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="@string/qsrsjh_txt"
android:inputType="phone"
android:paddingLeft="@dimen/dp_20"
android:textColor="@color/color_333333"
android:textColor="@color/color_2c2c2c"
android:textColorHint="@color/color_bcbcbc"
android:textSize="@dimen/sp_18" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_1"-->
<!-- android:background="@color/color_d8d8d8" />-->
</LinearLayout>
<LinearLayout
android:id="@+id/step2_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:background="@color/white"
android:padding="@dimen/dp_15"
android:orientation="vertical"
android:visibility="gone">
@@ -97,8 +99,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/szmm_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:gravity="center_horizontal"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
@@ -106,47 +109,63 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/setpwd_hint_txt"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置密码"
android:layout_marginTop="30dp"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<EditText
android:id="@+id/password_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_90"
android:background="@color/transparent"
android:layout_height="@dimen/dp_58"
android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint="@string/srmm_hint_txt"
android:paddingStart="10dp"
android:maxLength="32"
android:inputType="textPassword"
android:textColor="@color/color_333333"
android:textColor="@color/color_2c2c2c"
android:textColorHint="@color/color_bcbcbc"
android:textSize="@dimen/sp_18" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_1"-->
<!-- android:background="@color/color_d8d8d8" />-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="确认密码"
android:layout_marginTop="15dp"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<EditText
android:id="@+id/password_et1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_35"
android:background="@color/transparent"
android:paddingStart="@dimen/dp_10"
android:layout_height="@dimen/dp_58"
android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint="@string/qzcsrmm_txt"
android:maxLength="32"
android:inputType="textPassword"
android:textColor="@color/color_333333"
android:textColor="@color/color_2c2c2c"
android:textColorHint="@color/color_bcbcbc"
android:textSize="@dimen/sp_18" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_1"-->
<!-- android:background="@color/color_d8d8d8" />-->
</LinearLayout>
@@ -155,53 +174,61 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white"
android:padding="@dimen/dp_15"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:gravity="center_horizontal"
android:text="@string/qsryzm_txt"
android:textColor="@color/color_333333"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_26"
android:textStyle="bold" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_30"
android:id="@+id/send_sms_tips_tv"
android:text="@string/djfsyzm_txt"
android:textColor="@color/color_7f7b81"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp" />
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="60dp"
app:bgInputed="@drawable/bg_inputed"
app:bgInputing="@drawable/bg_inputing"
app:count="4"
app:passwordSize="26"
app:showPassword="false">
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/get_code_txt"
android:textColor="@color/color_6b3689"
android:textSize="14sp" />
android:layout_marginTop="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal">
<EditText
android:id="@+id/password_edit_text_code"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_58"
android:background="@color/transparent"
android:hint="请输入短信验证码"
android:layout_weight="1"
android:inputType="number"
android:paddingLeft="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_18" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_code_txt"
android:layout_marginEnd="@dimen/dp_10"
android:id="@+id/send_sms_tv"
android:textColor="#6D94FF"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
@@ -209,8 +236,8 @@
android:id="@+id/step4_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:background="@color/white"
android:padding="@dimen/dp_15"
android:orientation="vertical"
android:visibility="gone">
@@ -218,8 +245,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/gzjsdygsfb_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_26"
android:gravity="center_horizontal"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<RelativeLayout
@@ -228,7 +256,7 @@
android:layout_height="@dimen/dp_88"
android:layout_marginTop="@dimen/dp_40"
android:layout_gravity="center_horizontal">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/head_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -246,47 +274,61 @@
android:gravity="center"
/>
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置昵称"
android:layout_marginTop="30dp"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<EditText
android:id="@+id/nickname_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_55"
android:background="@color/transparent"
android:layout_height="@dimen/dp_58"
android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint="@string/srndnc_txt"
android:maxLength="15"
android:textColor="@color/color_333333"
android:maxLength="20"
android:paddingStart="@dimen/dp_10"
android:textColor="@color/color_2c2c2c"
android:textColorHint="@color/color_bcbcbc"
android:textSize="@dimen/sp_18" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="性别"
android:layout_marginTop="30dp"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_60"
android:layout_height="54dp"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:id="@+id/nan_ly"
android:layout_marginRight="@dimen/dp_10"
android:background="@drawable/nan_bg_t"
android:orientation="horizontal"
android:layout_weight="1">
<ImageView
android:id="@+id/nan_iv"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/nan_img_t"/>
<TextView
android:id="@+id/nan_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/sexual_male"
android:textColor="@color/color_333333"
android:layout_marginStart="10dp"
android:textColor="@color/white"
android:textSize="18sp"
/>
</LinearLayout>
@@ -294,20 +336,23 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:id="@+id/nv_ly"
android:layout_marginStart="10dp"
android:background="@drawable/xinbie_f"
android:orientation="horizontal"
android:layout_weight="1">
<ImageView
android:id="@+id/nv_iv"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@mipmap/nv_img_f"/>
<TextView
android:id="@+id/nv_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="10dp"
android:text="@string/sexual_female"
android:textColor="@color/color_333333"
android:textColor="@color/color_2c2c2c"
android:textSize="18sp"
/>
</LinearLayout>
@@ -318,12 +363,19 @@
</LinearLayout>
<ImageView
<TextView
android:id="@+id/next_iv"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/cornor_thempink_12dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_30"
android:textSize="@dimen/sp_16"
android:gravity="center"
android:text="下一步"
android:textColor="@color/white"
android:src="@mipmap/step_next_img" />
<TextView

6
app/src/main/res/layout/activity_register_bf.xml
View File

@@ -180,7 +180,7 @@
android:textSize="14sp" />
<com.hbl.lewan.custom.PasswordEditText
<com.hbl.yuliao.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -192,7 +192,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.hbl.lewan.custom.PasswordEditText>
</com.hbl.yuliao.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
@@ -230,7 +230,7 @@
android:layout_height="@dimen/dp_88"
android:layout_marginTop="@dimen/dp_40"
android:layout_gravity="center_horizontal">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/head_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"

4
app/src/main/res/layout/activity_ring_set.xml
View File

@@ -10,14 +10,14 @@
android:id="@+id/cl_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_f7f7f7"
android:background="@drawable/user_true1"
tools:ignore="MissingDefaultResource">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/setting_ring_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_f7f7f7"
android:background="@color/white"
tools:ignore="MissingConstraints" />

45
app/src/main/res/layout/activity_security.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -23,24 +23,18 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/base_info_txt"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_15"
android:textColor="@color/color_666666"
android:textSize="@dimen/sp_12"
/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
>
<Button
android:id="@+id/accout_bt"
style="@style/settings_item_bg_group_top_2019"
style="@style/settings_item_bg_group_top_2019_new"
android:text="@string/lailiaozhanghao_txt" />
<TextView
@@ -49,7 +43,7 @@
android:text="@string/weishezhi_txt"
android:drawablePadding="10dp"
android:drawableRight="@drawable/ic_frame_mine_right_arrow"
android:textColor="@color/color_666666" />
android:textColor="@color/color_2c2c2c" />
</FrameLayout>
@@ -59,11 +53,13 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:visibility="gone">
<Button
android:id="@+id/bind_wechat_bt"
style="@style/settings_item_bg_group_top_2019"
style="@style/settings_item_bg_group_top_2019_new"
android:text="@string/wechat_txt" />
<TextView
@@ -81,11 +77,13 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
>
<Button
android:id="@+id/bind_phone_bt"
style="@style/settings_item_bg_group_top_2019"
style="@style/settings_item_bg_group_top_2019_new"
android:text="@string/phone_number_txt" />
<TextView
@@ -103,11 +101,13 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
>
<Button
android:id="@+id/zhmm_bt"
style="@style/settings_item_bg_group_top_2019"
style="@style/settings_item_bg_group_top_2019_new"
android:text="@string/accout_password_txt3" />
<TextView
@@ -116,17 +116,18 @@
android:drawablePadding="10dp"
android:drawableRight="@drawable/ic_frame_mine_right_arrow"
android:text="@string/quxiugai_txt"
android:textColor="@color/color_666666" />
android:textColor="@color/color_2c2c2c" />
</FrameLayout>
<FrameLayout
android:visibility="gone"
android:visibility="visible"
android:layout_marginTop="@dimen/dp_10"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/close_account"
style="@style/settings_item_bg_group_top_2019"
style="@style/settings_item_bg_group_top_2019_new"
android:text="@string/close_account_txt" />
<TextView

523
app/src/main/res/layout/activity_send_red_packet.xml
View File

@@ -14,138 +14,135 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/st"
android:background="@color/white"
app:titleText="@string/fahongbao_txt"
android:background="@color/color_fcfcfc"
tools:ignore="MissingConstraints" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="#F6F5F7"/>
android:background="#F6F5F7" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F2F2F2"
android:orientation="vertical">
<TextView
android:id="@+id/tips_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_20"
android:drawableRight="@mipmap/ic_indexfm_down"
android:drawableTint="#6D94FF"
android:layout_marginLeft="@dimen/dp_30"
android:text="@string/psjhb_txt"
android:drawablePadding="@dimen/dp_5"
android:textColor="#6D94FF"
android:textSize="@dimen/sp_14" />
<LinearLayout
android:id="@+id/top_select_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_30"
android:paddingRight="@dimen/dp_30"
android:visibility="gone">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/jinbi_ly"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
android:layout_marginRight="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/logout_btn_main1"
<TextView
android:id="@+id/tips_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:drawableRight="@mipmap/ic_indexfm_down"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:orientation="vertical">
android:text="@string/psjhb_txt"
android:textColor="#498AFA"
android:textSize="@dimen/sp_14"
android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:orientation="horizontal">
<ImageView
android:id="@+id/jinbi_iv"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:scaleType="fitXY"
android:src="@mipmap/wallet_jinbi_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:text="@string/species_txt"
android:textColor="#e5333333"
android:textSize="14sp" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ytinbi_ly"
<LinearLayout
android:id="@+id/top_select_ly"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/logout_btn_c1"
android:gravity="center"
android:orientation="vertical">
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_30"
android:paddingRight="@dimen/dp_30"
android:visibility="gone">
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/jinbi_ly"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:orientation="horizontal">
android:layout_height="@dimen/dp_44"
android:layout_marginRight="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/logout_btn_main1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/yinbi_iv"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:scaleType="fitXY"
android:src="@mipmap/wallet_yinbi_img" />
<TextView
android:id="@+id/yinbi_tv"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:text="@string/silver_coins_txt"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10">
android:textColor="#e5333333"
android:textSize="14sp" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>
<ImageView
android:id="@+id/jinbi_iv"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:scaleType="fitXY"
android:src="@mipmap/wallet_jinbi_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:text="@string/species_txt"
android:textColor="#e5333333"
android:textSize="14sp" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ytinbi_ly"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/logout_btn_c1"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10">
<ImageView
android:id="@+id/yinbi_iv"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:scaleType="fitXY"
android:src="@mipmap/wallet_yinbi_img" />
<TextView
android:id="@+id/yinbi_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:text="@string/silver_coins_txt"
android:textColor="#e5333333"
android:textSize="14sp" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/zhuanshu_ly"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="53dp"
android:paddingEnd="@dimen/dp_15"
android:layout_marginTop="20dp"
android:layout_height="58dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/input_bg_t"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingEnd="@dimen/dp_15"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
@@ -153,21 +150,24 @@
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:text="发给谁"
android:textColor="@color/black"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/user_ly"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:orientation="horizontal"
android:visibility="gone">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/av_indexfra_head"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:src="@mipmap/default_head_img"
app:es_shape_type="round" />
<TextView
android:id="@+id/user_name_tv"
android:layout_width="wrap_content"
@@ -175,84 +175,90 @@
android:layout_marginStart="@dimen/dp_5"
android:text="Jeffrey"
android:textColor="#ff383838"
android:textSize="16sp"
/>
android:textSize="16sp" />
</LinearLayout>
<ImageView
android:id="@+id/zhuanshu_next_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/index_next_img"
android:id="@+id/zhuanshu_next_iv"
android:layout_marginStart="15dp"
/>
android:src="@mipmap/index_next_img" />
</androidx.appcompat.widget.LinearLayoutCompat>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:id="@+id/zhuanshu_v"
android:visibility="gone"
android:background="#EEF0F4"/>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="53dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/input_bg_t"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/cornor_stroke_thempink_gray"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/jint_left_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:drawablePadding="@dimen/dp_5"
android:text="红包金额"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<!-- android:drawableLeft="@mipmap/wallet_jinbi_img"-->
<EditText
android:id="@+id/number_hint_et"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@color/transparent"
android:drawablePadding="@dimen/dp_5"
android:gravity="right|center_vertical"
android:hint="0.00"
android:inputType="numberDecimal"
android:minWidth="120dp"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="元"
android:textColor="@color/color_666666"
android:textSize="16sp"
android:visibility="visible" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/jint_left_tv"
android:layout_width="wrap_content"
android:id="@+id/jinbi_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:text="红包金额"
android:drawablePadding="@dimen/dp_5"
android:drawableLeft="@mipmap/wallet_jinbi_img"
android:textColor="@color/black"
android:textSize="16sp" />
<EditText
android:id="@+id/number_hint_et"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp"
android:drawablePadding="@dimen/dp_5"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="right|center_vertical"
android:hint="0.00"
android:inputType="numberDecimal"
android:minWidth="120dp"
android:textColor="@color/black"
android:textColorHint="#939CC0"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="元"
android:textColor="@color/color_666666"
android:textSize="16sp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginRight="@dimen/dp_30"
android:gravity="right"
android:text="@string/silver_coins_txt"
android:textColor="@color/color_999999"
android:textSize="14sp"
android:visibility="visible" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/jinbi_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:visibility="visible"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_15"
android:text="@string/silver_coins_txt"
android:layout_marginTop="@dimen/dp_4"
android:textColor="@color/color_999999"
android:textSize="14sp" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/group_red_ly"
@@ -266,9 +272,9 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="53dp"
android:layout_height="58dp"
android:layout_marginTop="20dp"
android:background="@drawable/input_bg_t"
android:background="@drawable/cornor_stroke_thempink_gray"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -279,7 +285,7 @@
android:layout_weight="1"
android:drawableLeft="@mipmap/honebao_left_img"
android:text="@string/hbgs_txt"
android:textColor="@color/black"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
@@ -295,8 +301,8 @@
android:hint="@string/qtxgs_txt"
android:inputType="number"
android:minWidth="120dp"
android:textColor="@color/black"
android:textColorHint="#939CC0"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="14sp" />
<TextView
@@ -304,7 +310,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="@string/ge_txt"
android:textColor="@color/black"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -322,95 +328,94 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="53dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/input_bg_t"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/cornor_stroke_thempink_gray"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:text="备注"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<EditText
android:id="@+id/memo_et"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="center_vertical|right"
android:hint="@string/remarks_hit_txt"
android:minWidth="120dp"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/number_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0.00"
android:textColor="@color/color_2c2c2c"
android:textSize="36sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/danwei_txt"
android:textColor="@color/common_list_light_red_for_text"
android:textSize="22sp"
android:visibility="gone" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/tv_login"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="center_horizontal"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="20dp"
android:layout_marginEnd="@dimen/dp_30"
android:background="@drawable/logout_btn_z_88"
android:clickable="true"
android:gravity="center"
android:text="@string/send_in_lipinjifen_txt1"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="60dp"
android:layout_marginLeft="15dp"
android:text="备注"
android:textColor="@color/black"
android:textSize="16sp" />
<EditText
android:id="@+id/memo_et"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="center_vertical|right"
android:layout_marginLeft="@dimen/dp_10"
android:hint="@string/remarks_hit_txt"
android:minWidth="120dp"
android:textColor="@color/black"
android:textColorHint="#939CC0"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/number_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0.00"
android:textColor="@color/black"
android:textSize="36sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="@string/danwei_txt"
android:textColor="@color/common_list_light_red_for_text"
android:textSize="22sp"
android:visibility="gone" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/tv_login"
android:layout_width="match_parent"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:layout_height="48dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:background="@drawable/logout_btn_z_88"
android:clickable="true"
android:gravity="center"
android:text="@string/send_in_lipinjifen_txt1"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="60dp"
android:text="@string/no_get_to_back_txt"
android:textColor="@color/color_adb5bd"
android:textSize="12sp" />
android:text="@string/no_get_to_back_txt"
android:textColor="@color/color_adb5bd"
android:textSize="12sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>

245
app/src/main/res/layout/activity_set_accout_id.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -16,143 +16,170 @@
app:titleText="@string/lailiaozhanghao_txt"
tools:ignore="MissingConstraints" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f7f7f7" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="30dp"
android:id="@+id/step_1_ly"
android:visibility="visible"
android:paddingRight="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_30"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/qszacc_txt"
android:textColor="#ff333333"
android:textSize="24sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="@string/qszacc1_txt"
android:textColor="#ff7e7b84"
android:textSize="14sp"
/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_1"
android:orientation="vertical"
<RelativeLayout
android:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:background="@color/transparent"
android:layout_marginTop="@dimen/dp_30"
android:layout_height="@dimen/dp_52">
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:paddingLeft="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
<EditText
android:id="@+id/edit_text"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
android:background="@color/transparent"
android:gravity="center_vertical"
android:hint="@string/qszacc_hint_txt"
android:digits="ABCDEFGabcdefgHIJKLMNhijklmnOPQRSTopqrstUVWXYZuvwxyz0123456789_"
android:maxLength="15"
android:singleLine="true"
android:text=""
android:textColor="@color/color_333333"
android:textColorHighlight="#D2CBDF"
android:textColorHint="#D2CBDF"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/qszacc_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="24sp" />
</RelativeLayout>
<View android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:id="@+id/show_error_tv"
android:text="QTALK ID已存在"
android:visibility="invisible"
android:textColor="#ffff3d3d"
android:textSize="14sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0/15"
android:id="@+id/number_tv"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_10"
android:textColor="#ffb8b5be"
android:textSize="12sp"
/>
</RelativeLayout>
android:text="@string/qszacc1_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="13sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_58"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray">
<EditText
android:id="@+id/edit_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:digits="ABCDEFGabcdefgHIJKLMNhijklmnOPQRSTopqrstUVWXYZuvwxyz0123456789_"
android:gravity="center_vertical"
android:hint="@string/qszacc_hint_txt"
android:maxLength="15"
android:paddingStart="10dp"
android:singleLine="true"
android:text=""
android:textColor="@color/color_2c2c2c"
android:textColorHighlight="#D2CBDF"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/number_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_10"
android:text="0/15"
android:textColor="#BCBCBC"
android:textSize="16sp" />
</RelativeLayout>
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content">-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/dp_10"-->
<!-- android:id="@+id/show_error_tv"-->
<!-- android:text="QTALK ID已存在"-->
<!-- android:visibility="invisible"-->
<!-- android:textColor="#ffff3d3d"-->
<!-- android:textSize="14sp"-->
<!-- />-->
<!-- </RelativeLayout>-->
</LinearLayout>
<TextView
android:id="@+id/tops_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:paddingStart="@dimen/dp_15"
android:text="@string/meiyuegaiyici_txt"
android:textColor="#FF4646"
android:textSize="16sp" />
<TextView
android:id="@+id/sumbit_bt"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginTop="10dp"
android:layout_height="@dimen/dp_52"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="30dp"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/cornor_thempink_12dp"
android:backgroundTint="@color/color_themeblue_alpha70"
android:background="@drawable/index_user_bg4"
android:gravity="center"
android:text="@string/sure_txt"
android:textColor="#ffffffff"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:id="@+id/tops_tv"
android:layout_gravity="center_horizontal"
android:text="@string/meiyuegaiyici_txt"
android:textColor="#ffb8b5be"
android:textSize="12sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="30dp"
android:id="@+id/step_2_ly"
android:visibility="gone"
android:paddingRight="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_118"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_1"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/zsvbxg_txt"
android:textColor="#ff333333"
android:textSize="24sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:id="@+id/tips_3_tv"
android:lineSpacingExtra="@dimen/dp_5"
android:text="@string/zsbnxg1_txt"
android:textColor="#ff7e7b84"
android:textSize="14sp"
/>
android:background="@color/white"
android:orientation="vertical"
android:paddingLeft="15dp"
android:paddingRight="@dimen/dp_15"
android:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/zsvbxg_txt"
android:layout_marginTop="15dp"
android:textStyle="bold"
android:layout_gravity="center_horizontal"
android:textColor="@color/color_2c2c2c"
android:textSize="24sp" />
<TextView
android:id="@+id/tips_3_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:lineSpacingExtra="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_81"
android:text="@string/zsbnxg1_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
</LinearLayout>
<TextView
android:id="@+id/sumbit_bt1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginTop="120dp"
android:background="@drawable/logout_btn2"
android:layout_height="@dimen/dp_52"
android:layout_marginTop="30dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:text="@string/general_got_it"
android:textColor="#ffffffff"

40
app/src/main/res/layout/activity_settingresource.xml
View File

@@ -17,34 +17,38 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:titleTextColor="@color/color_333333" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tablayout_setres"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_40_dp"
android:background="@color/transparent"
app:layout_constraintTop_toBottomOf="@+id/backtitle_bar"
app:tabBackground="@color/transparent"
app:tabIndicator="@drawable/tab_line3"
app:tabIndicatorColor="@color/color_6b3689"
app:tabRippleColor="@null"
app:tabSelectedTextColor="@color/color_333333"
app:tabTextAppearance="@style/MyBgTablayoutstyle"
app:tabTextColor="@color/color_7f7b81" />
<View
android:id="@+id/line_setres"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:background="@color/color_ededed"
app:layout_constraintTop_toBottomOf="@+id/tablayout_setres" />
android:background="#EEF0F7"
app:layout_constraintTop_toBottomOf="@+id/backtitle_bar" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tablayout_setres"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/fun_selected_user_bg11"
app:layout_constraintTop_toBottomOf="@+id/line_setres"
app:tabBackground="@drawable/tab_background"
app:tabIndicator="@color/transparent"
app:tabIndicatorColor="@color/transparent"
app:tabIndicatorHeight="0dp"
app:tabRippleColor="@null"
app:tabSelectedTextColor="@color/color_333333"
app:tabTextAppearance="@style/MyBgTablayoutstyle"
app:tabTextColor="#7F2c2c2c" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewpager_fm_setres"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line_setres" />
app:layout_constraintTop_toBottomOf="@+id/tablayout_setres" />
</androidx.constraintlayout.widget.ConstraintLayout>

96
app/src/main/res/layout/activity_shiming.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:id="@+id/big_bg"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -38,78 +38,80 @@
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:padding="@dimen/dp_15"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="姓名"
android:textColor="#ff383838"
android:textSize="14sp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
/>
<EditText
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_height="58dp"
android:gravity="center_vertical"
android:background="@color/transparent"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint ="请输入您的真实姓名"
android:textColorHint="#ff999999"
android:textSize="18sp"
android:paddingStart="@dimen/dp_10"
android:textColorHint="#BCBCBC"
android:textSize="16sp"
android:id="@+id/name_et"
android:layout_marginTop="10dp"
android:textColor="@color/black"
android:layout_marginTop="15dp"
android:textColor="@color/color_2c2c2c"
/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#ededed"
android:visibility="visible" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="身份证号"
android:layout_marginTop="@dimen/dp_20"
android:textColor="#ff383838"
android:textSize="14sp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
/>
<EditText
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginTop="10dp"
android:layout_height="58dp"
android:layout_marginTop="15dp"
android:id="@+id/number_et"
android:paddingStart="@dimen/dp_10"
android:gravity="center_vertical"
android:background="@color/transparent"
android:background="@drawable/cornor_stroke_thempink_gray"
android:hint ="请输入您本人的身份证号码"
android:textColorHint="#ff999999"
android:textSize="18sp"
android:textColor="@color/black"
/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#ededed"
android:visibility="visible" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:id="@+id/tips_tv"
android:visibility="invisible"
android:text="实名认证无法自行修改，如需修改请联系客服人员"
android:textColor="#ffff2b2b"
android:textSize="14sp"
/>
<Button
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="@dimen/dp_30"
android:text="提交"
android:id="@+id/sumbit_bt"
android:background="@drawable/button_true_bg1"
android:textColor="#fff6f8fd"
android:textColorHint="#BCBCBC"
android:textSize="16sp"
android:textColor="@color/color_2c2c2c"
/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:id="@+id/tips_tv"
android:visibility="gone"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:text="实名认证无法自行修改，如需修改请联系客服人员"
android:textColor="#ffff2b2b"
android:textSize="16sp"
/>
<Button
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginTop="@dimen/dp_30"
android:text="提交"
android:id="@+id/sumbit_bt"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/button_true_bg1"
android:textColor="#fff6f8fd"
android:textSize="16sp"
/>
</androidx.appcompat.widget.LinearLayoutCompat>

60
app/src/main/res/layout/activity_team_manager.xml
View File

@@ -8,7 +8,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_fffafa"
android:background="@drawable/user_true1"
android:orientation="vertical">
<LinearLayout
@@ -20,6 +20,7 @@
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:titleText="@string/teamsetting_other_teammanager"
app:titleTextColor="@color/color_333333" />
@@ -27,24 +28,28 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
>
<TextView
android:id="@+id/tv_tips"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:background="#EEF0F7"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingStart="@dimen/dp_15"
android:text="@string/team_owner"
android:textColor="@color/color_b8b5be"
android:textSize="@dimen/sp_14" />
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16" />
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/avatar_view"
android:layout_width="@dimen/dimen_45_dp"
android:layout_height="@dimen/dimen_45_dp"
android:layout_width="@dimen/dimen_56_dp"
android:layout_height="@dimen/dimen_56_dp"
android:layout_below="@+id/tv_tips"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="15dp"
android:layout_marginBottom="@dimen/dp_15"
app:avatarCorner="@dimen/dimen_45_dp" />
<TextView
@@ -57,44 +62,51 @@
android:layout_toEndOf="@+id/avatar_view"
android:gravity="center"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
android:textSize="@dimen/sp_18" />
<View
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:layout_below="@+id/avatar_view"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/color_ebe8F1" />
android:background="#EEF0F7"
/>
<TextView
android:id="@+id/tv_titlemanager"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/line"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_b8b5be"
android:textSize="@dimen/sp_14" />
android:background="#EEF0F7"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingStart="@dimen/dp_15"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview_manager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:layout_below="@+id/tv_titlemanager"
android:background="@color/white"
android:visibility="gone" />
<LinearLayout
android:id="@+id/layout_managerempty"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_125"
android:layout_height="430dp"
android:background="@color/white"
android:layout_below="@+id/tv_titlemanager"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_56"
android:src="@mipmap/ic_teammanager_empty" />
@@ -102,7 +114,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/str_teammanager_not"
android:textColor="@color/color_b8b5be"
android:layout_marginTop="@dimen/dp_10"
android:textColor="#9E9E9E"
android:textSize="@dimen/sp_14" />
</LinearLayout>
@@ -117,9 +130,8 @@
android:layout_marginEnd="@dimen/dp_15"
android:lineSpacingExtra="@dimen/dp_5"
android:text="@string/str_teammanager_tips"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_14"
android:textStyle="bold" />
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/text_size_16" />
</LinearLayout>

6
app/src/main/res/layout/activity_team_members_jinyan.xml
View File

@@ -9,19 +9,19 @@
android:id="@+id/layout_selectorroot"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:titleTextColor="@color/color_333333" />
@@ -29,6 +29,8 @@
android:id="@+id/rv_members"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="@color/white"
/>
</LinearLayout>

73
app/src/main/res/layout/activity_team_zhuanshu.xml Normal file
View File

@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/layout_selectorroot"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/user_true1"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:titleText="未领取专属红包展示区"
app:titleTextColor="@color/color_333333" />
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_members"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.scwang.smart.refresh.footer.ClassicsFooter
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:srlAccentColor="@color/color_333333" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
<LinearLayout
android:id="@+id/nodate_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/nodate_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/pyq_nodate" />
<TextView
android:id="@+id/nodate_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/nodate_txt"
android:textColor="@color/color_adb5bd"
android:layout_marginBottom="@dimen/dp_20"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>

51
app/src/main/res/layout/activity_teamannouncement.xml
View File

@@ -9,13 +9,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
android:background="@drawable/user_true1">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/titlebar_teamannouncement"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:background="@color/color_fcfcfc"
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:titleText="@string/teamsetting_other_announcement"
app:titleTextColor="@android:color/black" />
@@ -23,51 +23,52 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_teammanager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/color_f7f7f7"
android:layout_height="@dimen/dp_330"
android:background="@color/white"
android:layout_marginTop="1dp"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
android:visibility="visible"
app:layout_constraintTop_toBottomOf="@+id/titlebar_teamannouncement">
<EditText
android:id="@+id/edit_teamannouncement"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_400"
android:background="@android:color/white"
android:layout_height="@dimen/dp_300"
android:layout_margin="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:gravity="left"
android:maxLength="500"
android:hint="@string/teamsetting_other_announcement_hint"
android:padding="@dimen/dimen_15_dp"
android:textColor="@color/color_333333"
android:textColorHint="#D2CBDF"
android:textSize="@dimen/sp_14"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_16"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_textlength"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:layout_marginEnd="@dimen/dimen_30_dp"
android:layout_marginBottom="@dimen/dimen_15_dp"
android:textColor="@color/color_7e7b84"
android:textColor="#7E7E7E"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="@+id/edit_teamannouncement"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/tv_teamannouncement_save"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_40_dp"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_60_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:layout_marginBottom="@dimen/dimen_20_dp"
android:background="@drawable/fun_cornor_12d_fe6881"
android:gravity="center"
android:text="@string/team_save"
android:textColor="@android:color/white"
app:layout_constraintTop_toBottomOf="@+id/edit_teamannouncement" />
<!-- <TextView-->
<!-- android:id="@+id/tv_teamannouncement_save"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dimen_40_dp"-->
<!-- android:layout_marginStart="@dimen/dimen_15_dp"-->
<!-- android:layout_marginTop="@dimen/dimen_30_dp"-->
<!-- android:layout_marginEnd="@dimen/dimen_15_dp"-->
<!-- android:layout_marginBottom="@dimen/dimen_20_dp"-->
<!-- android:background="@drawable/fun_cornor_12d_fe6881"-->
<!-- android:gravity="center"-->
<!-- android:text="@string/team_save"-->
<!-- android:textColor="@android:color/white"-->
<!-- app:layout_constraintTop_toBottomOf="@+id/edit_teamannouncement" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout

488
app/src/main/res/layout/activity_teamothersetting.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="#EEF0F7"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
@@ -20,77 +20,11 @@
android:layout_height="@dimen/dp_1"
android:background="@color/color_f7f7f7" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
tools:context=".main.mine.MineInfoActivity">
<androidx.cardview.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_marginTop="@dimen/dp_5"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="0dp"
app:layout_constraintDimensionRatio="345:130"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/forbg_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@mipmap/ic_settingother_bg" />
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_marginStart="@dimen/dp_5"-->
<!-- android:layout_marginTop="@dimen/dp_5"-->
<!-- android:layout_marginEnd="@dimen/dp_5"-->
<!-- android:layout_marginBottom="@dimen/dp_5"-->
<!-- android:src="@mipmap/add_head_forbg_img" />-->
<RelativeLayout
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_centerInParent="true">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/cavAvatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/default_head_img"
app:es_shape_type="round" />
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_margin="@dimen/dp_5"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:src="@mipmap/add_head_forbg_img"/>-->
</RelativeLayout>
</RelativeLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:scrollbars="none"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_view">
@@ -102,57 +36,113 @@
android:orientation="vertical"
tools:ignore="SpUsage">
<LinearLayout
android:id="@+id/llTeamName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/teamsetting_other_teamname"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_14" />
android:background="@color/white"
android:orientation="vertical"
tools:ignore="SpUsage">
<FrameLayout
android:id="@+id/flteamhead"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40">
android:layout_height="@dimen/dp_72"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<EditText
android:id="@+id/tvTeamName"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:background="@android:color/transparent"
<TextView
android:id="@+id/tvPhone"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:maxLength="20"
android:singleLine="true"
android:text="@string/teamsetting_other_teamhead"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_clean_edit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/cavAvatar"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="end|center_vertical"
android:paddingLeft="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:visibility="gone"
app:srcCompat="@drawable/ic_selector_close" />
android:layout_marginEnd="@dimen/dp_35"
android:src="@mipmap/default_head_img"
app:es_shape_type="round" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_d8d8d8" />
android:layout_height="1dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="#EEF0F7" />
<LinearLayout
android:id="@+id/llTeamName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_62">
<TextView
android:layout_width="wrap_content"
android:layout_height="62dp"
android:gravity="center_vertical"
android:text="@string/teamsetting_other_teamname"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_16" />
<EditText
android:id="@+id/tvTeamName"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_100"
android:layout_marginEnd="@dimen/dp_30"
android:background="@android:color/transparent"
android:gravity="center_vertical|right"
android:maxLength="20"
android:singleLine="true"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_clean_edit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end|center_vertical"
android:paddingLeft="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:visibility="gone"
app:srcCompat="@drawable/ic_selector_close" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/llteamMemberType"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_marginTop="10dp"
android:background="@color/white"
android:orientation="vertical"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<FrameLayout
android:layout_width="match_parent"
@@ -160,8 +150,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_height="@dimen/dimen_24_dp"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:text="@string/teamsetting_other_addtype"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_16" />
@@ -185,34 +176,37 @@
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_50"
android:text="@string/teamsetting_other_addtypedesc"
android:textColor="@color/color_7f7b81"
android:textSize="@dimen/text_size_14" />
android:textColor="#7E7E7E"
android:textSize="@dimen/text_size_16" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_height="1dp"
android:layout_marginTop="@dimen/dp_15"
android:background="@color/color_f4f4f4" />
android:background="#EEF0F7" />
</LinearLayout>
<LinearLayout
android:id="@+id/llteamurl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_5">
android:layout_height="@dimen/dp_64"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_60"
android:background="@android:color/transparent"
android:ellipsize="end"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/teamsetting_other_teamurl"
android:textColor="@color/color_333333"
@@ -234,46 +228,43 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginTop="@dimen/dp_5"
android:background="@color/color_f4f4f4" />
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="#EEF0F7" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_60"
android:background="@android:color/transparent"
android:ellipsize="end"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/teamsetting_other_teamaddfriends"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_16" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swich_teamallowaddfriends"
android:layout_width="wrap_content"
android:layout_height="@dimen/dimen_24_dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_gravity="end|center_vertical"
android:checked="false"
android:thumb="@drawable/switch_thumb_selector"
app:track="@drawable/switch_track_selector" />
</FrameLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_5">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_60"
android:background="@android:color/transparent"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/teamsetting_other_teamaddfriends"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_16" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swich_teamallowaddfriends"
android:layout_width="wrap_content"
android:layout_height="@dimen/dimen_24_dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_gravity="end|center_vertical"
android:checked="false"
android:thumb="@drawable/switch_thumb_selector"
app:track="@drawable/switch_track_selector" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginTop="@dimen/dp_15"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/flcleanhistory"
@@ -304,152 +295,123 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginTop="@dimen/dp_5"
android:background="@color/color_f4f4f4"
android:background="#EEF0F7"
android:visibility="gone" />
<FrameLayout
android:id="@+id/flteamhead"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_marginTop="10dp"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:orientation="vertical">
<TextView
android:id="@+id/tvPhone"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/teamsetting_other_teamhead"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<FrameLayout
android:id="@+id/flteammanager"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
android:background="@color/white">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<TextView
android:id="@+id/tvManager"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/teamsetting_other_teammanager"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<FrameLayout
android:id="@+id/flteammanager"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="#EEF0F7" />
<TextView
android:id="@+id/tvManager"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/teamsetting_other_teammanager"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<FrameLayout
android:id="@+id/flteamtransfer"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<TextView
android:id="@+id/tvteamtransfer"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/teamsetting_other_teamtransfer"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<FrameLayout
android:id="@+id/flteamtransfer"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="#EEF0F7" />
<TextView
android:id="@+id/tvteamtransfer"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/teamsetting_other_teamtransfer"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<FrameLayout
android:id="@+id/fljinyan"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<TextView
android:id="@+id/tvjinyan"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/yijinyanchengyuan_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/fljinyan"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
</LinearLayout>
<TextView
android:id="@+id/tvjinyan"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/yijinyanchengyuan_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/flteamdiss"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
android:background="@color/white"
android:layout_marginTop="10dp"
android:layout_height="@dimen/dp_52">
<TextView
android:id="@+id/tvteamdiss"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:layout_gravity="center"
android:gravity="center"
android:singleLine="true"
android:text="@string/teamsetting_other_teamdiss"
android:textColor="@color/color_333333"
android:textColor="#FF4646"
android:textSize="@dimen/sp_16" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

21
app/src/main/res/layout/activity_tixian.xml
View File

@@ -26,7 +26,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_f6f5f7"
android:background="#EEF0F7"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titlebar">
@@ -39,7 +39,6 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
@@ -60,7 +59,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_weight="1"
android:text="我的零钱"
android:text="钱包余额"
android:textColor="@color/white"
android:textSize="16sp" />
@@ -70,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/sp_30"
android:layout_marginEnd="15dp"
android:textColor="#FCF0A1"
android:textColor="@color/white"
android:textSize="@dimen/sp_30"
tools:text="0" />
@@ -82,6 +81,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/dp_15"
android:background="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -99,7 +99,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_height="58dp"
android:background="@drawable/cornor_stroke_thempink_gray"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="7.5dp"
android:layout_marginRight="@dimen/dp_15"
@@ -111,7 +113,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:text="¥"
android:textColor="#ff444444"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<EditText
@@ -127,13 +129,14 @@
android:inputType="number"
android:maxLength="9"
android:paddingRight="@dimen/dp_10"
android:textColor="@color/black"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="24sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="全部提现"
android:layout_marginEnd="10dp"
android:id="@+id/all_tx_tv"
android:textColor="#ff4482ff"
android:textSize="16sp"
@@ -161,7 +164,7 @@
<View android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="@color/color_f6f5f7"/>
android:background="#EEF0F7"/>
<TextView
android:layout_width="wrap_content"
@@ -237,7 +240,7 @@
<!-- android:visibility="visible" />-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
android:layout_height="@dimen/dp_58"
android:gravity="center_vertical"
android:orientation="horizontal">

2
app/src/main/res/layout/activity_to_bind_wechat_alipay.xml
View File

@@ -85,7 +85,7 @@
android:layout_margin="@dimen/dp_15"
android:background="@drawable/index_user_bg"
android:orientation="vertical">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"
android:layout_gravity="center_horizontal"

151
app/src/main/res/layout/activity_topup.xml
View File

@@ -26,7 +26,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_f6f5f7"
android:background="#EEF0F7"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titlebar">
@@ -39,10 +39,8 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layout_topup_top"
android:layout_width="match_parent"
@@ -60,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_weight="1"
android:text="我的零钱"
android:text="钱包余额"
android:textColor="@color/white"
android:textSize="16sp" />
@@ -70,7 +68,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/sp_30"
android:layout_marginEnd="15dp"
android:textColor="#FCF0A1"
android:textColor="@color/white"
android:textSize="@dimen/sp_30"
tools:text="0" />
@@ -82,7 +80,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/dp_15"
android:background="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -96,13 +94,26 @@
android:textColor="@color/color_383838"
android:textSize="14sp"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recylerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title_tv1"
android:layout_marginLeft="7.5dp"
android:layout_marginTop="7.5dp"
android:layout_marginRight="7.5dp"
android:layout_marginBottom="7.5dp"
android:visibility="visible">
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_height="58dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="7.5dp"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -111,7 +122,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:text="¥"
android:textColor="#ff444444"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<EditText
@@ -127,56 +138,83 @@
android:inputType="number"
android:maxLength="9"
android:paddingRight="@dimen/dp_10"
android:textColor="@color/black"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="24sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="#ededed"
android:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recylerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title_tv1"
android:layout_marginLeft="7.5dp"
android:layout_marginTop="7.5dp"
android:layout_marginRight="7.5dp"
android:layout_marginBottom="7.5dp"
android:visibility="visible">
</androidx.recyclerview.widget.RecyclerView>
<View android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="@color/color_f6f5f7"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/cash_paytype"
android:textColor="@color/color_383838"
android:textSize="@dimen/sp_14" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_installment"
android:background="#EEF0F7"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_7"
android:layout_marginEnd="@dimen/dp_7"
android:visibility="visible" />
android:padding="@dimen/dp_15"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="钱包地址"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<TextView
android:layout_width="221dp"
android:id="@+id/usdt_addr_tv"
android:layout_height="wrap_content"
android:text="TRuf6kD5FXMMV6oxuhD9YJ7WzfH1SoJCAa"
android:textColor="#ff498afa"
android:textSize="16sp"
/>
</LinearLayout>
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:background="#EEF0F4"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="52dp"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="网络类型"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TRC20"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
</LinearLayout>
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:background="#EEF0F4"/>
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/usdt_addr_iv"
android:layout_width="@dimen/dp_255"
android:layout_height="@dimen/dp_255"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:padding="2dp"
android:background="@drawable/usdt_qr_bg_new"
android:src="@mipmap/add_img_wallet"
app:ease_radius="@dimen/dp_10"
app:es_shape_type="rectangle" />
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -188,6 +226,7 @@
android:layout_marginTop="@dimen/dp_20"
android:text="充值说明："
android:textColor="#ff333333"
android:textStyle="bold"
android:textSize="14sp"
/>
@@ -202,6 +241,22 @@
android:textColor="#ff333333"
android:textSize="14sp"
/>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/sumbit_bt"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_40"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:text="上传凭证"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</ScrollView>

391
app/src/main/res/layout/activity_transfer_accounts.xml
View File

@@ -116,7 +116,6 @@
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/xuxian_bg"
android:orientation="horizontal"
android:padding="@dimen/dp_10">
@@ -132,15 +131,15 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:textColor="#333333"
android:textSize="16sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="18sp" />
<TextView
android:id="@+id/cheatid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="#ff7f7b81"
android:textColor="#383838"
android:textSize="14sp" />
</LinearLayout>
@@ -148,197 +147,223 @@
android:id="@+id/user_head_iv"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:visibility="invisible"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="@dimen/dp_10"
android:src="@mipmap/default_head_img" />
</LinearLayout>
<androidx.appcompat.widget.LinearLayoutCompat
<LinearLayout
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="30dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/input_bg_t2"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="22dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_10"
android:minWidth="66dp"
android:text="@string/zhuanzhangjine_txt"
android:textColor="#ff333333"
android:textSize="16sp" />
<EditText
android:id="@+id/number_hint_et"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_weight="8"
android:background="@color/transparent"
android:drawablePadding="@dimen/dp_16"
android:gravity="center_vertical|right"
android:hint="0.00"
android:inputType="number"
android:paddingLeft="@dimen/dp_22"
android:textColor="@color/black"
android:textColorHint="@color/color_adb5bd"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_jinbi_type"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_weight="1" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/jinbi_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginRight="@dimen/dp_30"
android:gravity="end"
android:textColor="@color/color_999999"
android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
android:visibility="gone"
android:layout_marginRight="@dimen/dp_30"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:text="@string/shouxufei_txt"
android:textColor="@color/color_383838"
android:textSize="14sp" />
<TextView
android:id="@+id/shouxufei_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:textColor="@color/color_e4543e"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30"
android:visibility="gone"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:text="@string/totaljine_txt"
android:textColor="@color/color_383838"
android:textSize="14sp" />
<TextView
android:id="@+id/totaljine_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:textColor="@color/color_e4543e"
android:textSize="14sp" />
</RelativeLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/layout_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_30"
android:background="@mipmap/ic_shouxufei_bg"
android:gravity="center_vertical"
android:visibility="gone">
<TextView
android:id="@+id/totaljine_tips_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_5"
android:gravity="end"
android:textColor="@color/color_e4543e"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_20"
android:background="@drawable/input_bg_t2"
android:orientation="horizontal"
android:paddingTop="15dp">
<EditText
android:id="@+id/memo_et"
android:background="@drawable/shape_dialog_bg22"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="top"
android:hint="@string/transfer_instructions_hint_txt"
android:maxLength="30"
android:minWidth="120dp"
android:textColor="@color/black"
android:textColorHint="@color/color_adb5bd"
android:textSize="16sp" />
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center_vertical"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="转账金额"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
/>
<TextView
android:id="@+id/jinbi_tv"
android:text="11111"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/color_80333333"
android:textSize="14sp" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="10dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/cornor_stroke_thempink_gray"
android:gravity="center_vertical"
android:orientation="horizontal">
<EditText
android:id="@+id/number_hint_et"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_weight="8"
android:background="@color/transparent"
android:drawablePadding="@dimen/dp_16"
android:gravity="center_vertical"
android:hint="0.00"
android:inputType="number"
android:paddingLeft="@dimen/dp_22"
android:textColor="@color/black"
android:textColorHint="@color/color_adb5bd"
android:textSize="16sp" />
<TextView
android:id="@+id/iv_jinbi_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="元"
android:gravity="center"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
android:layout_weight="1" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/tv_login"
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="60dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/index_user_bg3"
android:clickable="true"
android:gravity="center"
android:text="@string/zhuanzhang_title_txt"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="18dp"
android:text="@string/no_get_to_back_t_txt"
android:textColor="@color/color_adb5bd"
android:textSize="12sp"
android:visibility="gone" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:text="@string/shouxufei_txt"
android:textColor="@color/color_383838"
android:textSize="14sp" />
<TextView
android:id="@+id/shouxufei_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:textColor="@color/color_e4543e"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:text="@string/totaljine_txt"
android:textColor="@color/color_383838"
android:textSize="14sp" />
<TextView
android:id="@+id/totaljine_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:textColor="@color/color_e4543e"
android:textSize="14sp" />
</RelativeLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/layout_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_30"
android:background="@mipmap/ic_shouxufei_bg"
android:gravity="center_vertical"
android:visibility="gone">
<TextView
android:id="@+id/totaljine_tips_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_5"
android:gravity="end"
android:textColor="@color/color_e4543e"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="转账说明（选填）"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_20"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/cornor_stroke_thempink_gray"
android:orientation="horizontal"
android:paddingTop="10dp">
<EditText
android:id="@+id/memo_et"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@color/transparent"
android:gravity="top"
android:hint="@string/transfer_instructions_hint_txt"
android:maxLength="30"
android:minWidth="120dp"
android:textColor="@color/black"
android:textColorHint="@color/color_adb5bd"
android:textSize="16sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/tv_login"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="60dp"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/index_user_bg33"
android:clickable="true"
android:gravity="center"
android:text="@string/zhuanzhang_title_txt"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="18dp"
android:text="@string/no_get_to_back_t_txt"
android:textColor="@color/color_adb5bd"
android:textSize="12sp"
android:visibility="gone" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>

95
app/src/main/res/layout/activity_transfer_info.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
@@ -20,10 +20,12 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/mid_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/contact_list_activity_titleBar"
android:layout_marginTop="34dp"
android:layout_marginTop="1dp"
android:background="@color/white"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
@@ -32,9 +34,10 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:gravity="center"
android:text="来自 Jeffrey 的金币赠送"
android:textColor="#ff333333"
android:textColor="@color/color_2c2c2c"
android:textSize="18sp"
/>
@@ -43,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
android:textColor="#999999"
android:textColor="@color/color_80333333"
android:textSize="14sp" />
<LinearLayout
@@ -57,6 +60,7 @@
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginRight="@dimen/dp_10"
android:visibility="gone"
android:src="@mipmap/wallet_jinbi_img"
android:textSize="16sp" />
<TextView
@@ -86,7 +90,7 @@
android:minHeight="@dimen/dp_30"
android:gravity="center"
android:text="@string/timeout_transfer_tips_txt"
android:textColor="#999999"
android:textColor="@color/color_80333333"
android:textSize="12sp" />
<TextView
android:id="@+id/tuihuan_tv"
@@ -95,45 +99,50 @@
android:gravity="center"
android:layout_marginLeft="@dimen/dp_5"
android:text="@string/refund_transfer_txt"
android:textColor="@color/color_6d80ff"
android:textColor="#FF4646"
android:textSize="14sp"
android:visibility="gone" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginTop="20dp"
android:background="#DEDEDF" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_24"
android:orientation="horizontal"
android:paddingLeft="20dp"
android:paddingTop="21dp"
android:paddingRight="20dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="50dp">
android:minHeight="62dp">
<TextView
android:layout_width="85dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="50dp"
android:minHeight="62dp"
android:text="转账说明"
android:textColor="#7E7B84"
android:textSize="14sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<TextView
android:id="@+id/memo_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:minHeight="50dp"
android:textColor="@color/color_333333"
android:textSize="14sp" />
android:minHeight="62dp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
@@ -149,25 +158,25 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:minHeight="50dp">
android:minHeight="62dp">
<TextView
android:layout_width="85dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="50dp"
android:minHeight="62dp"
android:text="转账时间"
android:textColor="#7E7B84"
android:textSize="14sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<TextView
android:id="@+id/time_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:minHeight="50dp"
android:textColor="@color/color_333333"
android:textSize="14sp" />
android:minHeight="62dp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
</LinearLayout>
<View
@@ -185,44 +194,44 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:minHeight="50dp"
android:minHeight="62dp"
android:visibility="gone">
<TextView
android:layout_width="85dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="50dp"
android:minHeight="62dp"
android:text="@string/get_transfer_time_txt"
android:id="@+id/time_left_tv"
android:textColor="#7E7B84"
android:textSize="14sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<TextView
android:id="@+id/time1_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:minHeight="50dp"
android:minHeight="62dp"
android:text="转账说明"
android:textColor="@color/color_333333"
android:textSize="14sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
</LinearLayout>
<TextView
android:id="@+id/button_tv"
android:layout_width="match_parent"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:layout_height="44dp"
android:layout_marginTop="60dp"
android:background="@drawable/index_user_bg4"
android:gravity="center"
android:text="@string/collection_transfer_txt"
android:textColor="@color/white"
android:textSize="14sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/button_tv"
android:layout_width="match_parent"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:layout_height="52dp"
android:layout_marginTop="60dp"
android:background="@drawable/index_user_bg33"
android:gravity="center"
android:layout_below="@id/mid_ly"
android:text="@string/collection_transfer_txt"
android:textColor="@color/white"
android:textSize="16sp" />
</RelativeLayout>

312
app/src/main/res/layout/activity_user_info.xml
View File

@@ -4,22 +4,25 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true"
android:fitsSystemWindows="false"
android:id="@+id/big_bg"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
<ImageView
android:id="@+id/for_bg_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="275dp"
android:scaleType="centerCrop"
android:src="@color/color_6b3689" />
android:src="@color/color_2c93fa" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#4D000000" />
android:layout_height="15dp"
android:layout_alignBottom="@id/for_bg_iv"
android:background="@drawable/rectangle_white_reduce_bg_top" />
、
<RelativeLayout
@@ -33,7 +36,7 @@
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:scaleType="centerInside"
android:src="@mipmap/user_colose_img" />
android:src="@mipmap/back_img1" />
<ImageView
android:id="@+id/more_iv"
@@ -57,76 +60,93 @@
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_168"
android:gravity="center"
android:layout_below="@id/for_bg_iv"
android:background="@color/white"
android:orientation="vertical">
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_88"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
app:avatarCorner="@dimen/dp_44"
app:es_shape_type="round" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_15"
android:gravity="bottom"
android:orientation="horizontal">
<TextView
android:id="@+id/user_name_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="20sp" />
<ImageView
android:id="@+id/edit_user_nickname_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_5"
android:src="@mipmap/edit_user_name_img"
android:visibility="gone" />
</LinearLayout>
<TextView
android:id="@+id/bro_tv"
android:id="@+id/user_name_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_10"
android:drawableLeft="@mipmap/user_bro_img"
android:drawablePadding="@dimen/dp_5"
android:text="2033年01月12日"
android:textColor="#ccFFFFFF"
android:textSize="12sp"
android:visibility="gone" />
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginBottom="@dimen/dp_15"
android:layout_weight="1"
android:text="11111111111111"
android:textColor="@color/color_2c2c2c"
android:textSize="20sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="#EEF0F4" />
<TextView
android:id="@+id/sign_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
android:gravity="center"
android:lineSpacingExtra="@dimen/dp_5"
android:text="笑"
android:textColor="#ffffffff"
android:textSize="14sp"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
android:visibility="gone" />
<LinearLayout
android:id="@+id/bro_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:visibility="gone">
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="#EEF0F7" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_62"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
<TextView
android:id="@+id/tvBirthdayTip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="@string/user_info_birthday"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
tools:ignore="SpUsage" />
<TextView
android:id="@+id/bro_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:drawableLeft="@mipmap/user_bro_img"
android:gravity="center"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
android:visibility="visible" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -169,9 +189,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
android:visibility="gone"
android:layout_marginRight="@dimen/dp_15"
android:background="#80FFFFFF" />
android:background="#80FFFFFF"
android:visibility="gone" />
<LinearLayout
android:id="@+id/ll_useralbum"
@@ -189,10 +209,10 @@
style="@style/settings_item_bg_group_full_20191"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:drawablePadding="@dimen/dp_15"
android:drawableTint="@color/white"
android:paddingTop="@dimen/dp_20"
android:background="@android:color/transparent"
android:paddingBottom="@dimen/dp_10"
android:textSize="@dimen/sp_14"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
@@ -207,80 +227,136 @@
</LinearLayout>
<LinearLayout
android:id="@+id/friend_ly"
</LinearLayout>
<androidx.cardview.widget.CardView
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:layout_centerHorizontal="true"
android:layout_marginTop="220dp"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_40">
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
android:orientation="horizontal"
android:visibility="gone">
android:layout_height="match_parent"
android:layout_margin="1dp"
android:scaleType="centerCrop"
app:avatarCorner="@dimen/dp_44"
app:es_shape_type="round" />
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/chat_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/chat_call_img"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/chat_txt"
android:textColor="#ffffffff"
android:textSize="12sp" />
<LinearLayout
android:id="@+id/black_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/white"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/voice_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone"
android:drawableTop="@mipmap/voice_call_img"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/chat_message_audio_call_action"
android:textColor="#ffffffff"
android:textSize="12sp" />
<TextView
android:id="@+id/black_tv"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:layout_weight="1"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:text="@string/removeblack_txt"
android:textColor="#ffffffff"
android:textSize="16sp" />
<TextView
android:id="@+id/video_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/video__call_img"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:visibility="gone"
android:text="@string/chat_message_video_call_action"
android:textColor="#ffffffff"
android:textSize="12sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="40dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/add_friends_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/white"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/add_friends_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_44"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_21"
android:background="@drawable/index_user_bg3"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:layout_weight="1"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:text="@string/add_friend_title"
android:textColor="#ffffffff"
android:textSize="14sp"
android:visibility="gone" />
android:textSize="16sp" />
<View
android:layout_width="match_parent"
android:layout_height="40dp" />
</LinearLayout>
<TextView
android:id="@+id/black_tv"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/friend_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dimen_40_dp"
android:drawableTop="@mipmap/beipingbi_user_img"
android:text="@string/removeblack_txt"
android:textColor="#ffffffff"
android:textSize="12sp"
android:visibility="gone" />
android:background="@color/white"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_10"
android:paddingEnd="@dimen/dp_15"
android:paddingBottom="@dimen/dp_10">
<ImageView
android:id="@+id/voice_tv"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@mipmap/voice_call_img" />
<ImageView
android:id="@+id/video_tv"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/dp_15"
android:src="@mipmap/video__call_img" />
<TextView
android:id="@+id/chat_tv"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_weight="1"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:text="发送消息"
android:textColor="#ffffffff"
android:textSize="16sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="40dp" />
</LinearLayout>
</RelativeLayout>

2
app/src/main/res/layout/activity_userphotos.xml
View File

@@ -24,7 +24,7 @@
app:layout_constraintTop_toBottomOf="@+id/userphoto_title_bar"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/activity_userphotos_details.xml
View File

@@ -23,7 +23,7 @@
app:layout_constraintTop_toBottomOf="@+id/userphoto_title_bar"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

288
app/src/main/res/layout/activity_wallet_info_red.xml
View File

@@ -26,7 +26,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="47dp"
android:layout_height="62dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -40,8 +40,8 @@
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/av_indexfra_head"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_marginLeft="@dimen/dp_15"
android:src="@mipmap/default_head_img"
app:es_shape_type="round" />
@@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_weight="1"
android:textColor="#383838"
android:textColor="#2C2C2C"
android:textSize="18sp"
tools:text="1111" />
@@ -67,135 +67,156 @@
android:drawablePadding="@dimen/dp_5"
android:gravity="center_vertical"
android:text="2025-03"
android:textColor="#383838"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_62"
android:id="@+id/fasong_ly"
android:visibility="visible"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:orientation="horizontal">
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:layout_marginEnd="7.5dp"
android:background="@drawable/index_user_bg1_line"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="发包数量"
android:textColor="#ff9e9e9e"
android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/fabao_count_tv"
android:textColor="#ff333333"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:layout_marginStart="7.5dp"
android:background="@drawable/index_user_bg1_line"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="发包金额"
android:textColor="#ff9e9e9e"
android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/fabao_amout_tv"
android:textColor="#ff333333"
android:textSize="18sp"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/shoudao_ly"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_62"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
android:orientation="horizontal">
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:layout_marginEnd="7.5dp"
android:background="@drawable/index_user_bg1_line"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收包数量"
android:textColor="#ff9e9e9e"
android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/shoubao_count_tv"
android:textColor="#ff333333"
android:textSize="18sp"
/>
</LinearLayout>
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:layout_marginStart="7.5dp"
android:background="@drawable/index_user_bg1_line"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收包金额"
android:textColor="#ff9e9e9e"
android:textSize="12sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/shoubao_amout_tv"
android:textColor="#ff333333"
android:textSize="18sp"
/>
</LinearLayout>
android:textColor="#2C2C2C"
android:textSize="18sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#ededed"
android:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="104dp"
android:paddingTop="@dimen/dp_20"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/shoudao_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
<TextView
android:id="@+id/shoubao_count_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="#2C2C2C"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="24sp"
android:gravity="bottom"
android:text="共"
android:textColor="#2C2C2C"
android:textSize="14sp" />
<TextView
android:id="@+id/shoubao_amout_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#2C2C2C"
android:text="1"
android:textSize="24sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="24sp"
android:gravity="bottom"
android:text="元"
android:textColor="#2C2C2C"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<View android:layout_width="1px"
android:layout_height="64dp"
android:background="#ededed"/>
<LinearLayout
android:id="@+id/fasong_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:orientation="vertical"
android:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
<TextView
android:id="@+id/fabao_count_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="#2C2C2C"
android:textSize="14sp"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="24sp"
android:gravity="bottom"
android:text="共"
android:textColor="#2C2C2C"
android:textSize="14sp" />
<TextView
android:id="@+id/fabao_amout_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#2C2C2C"
android:text="1"
android:textSize="24sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="24sp"
android:gravity="bottom"
android:text="元"
android:textColor="#2C2C2C"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="#F6F5F7" />
android:background="#EEF0F7" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_height="55dp"
android:orientation="vertical">
<LinearLayout
@@ -218,14 +239,11 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="我收到的"
android:textColor="@color/black"
android:textSize="16sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="18sp" />
</LinearLayout>
<View
android:layout_width="1px"
android:layout_height="21dp"
android:background="#EFEFEF" />
<LinearLayout
android:id="@+id/linecollection_ly"
@@ -241,8 +259,8 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="我发出的"
android:textColor="@color/color_7f7b81"
android:textSize="16sp" />
android:textColor="@color/color_2c2c2c"
android:textSize="18sp" />
</LinearLayout>
@@ -250,7 +268,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1.5dp"
android:layout_height="4dp"
android:background="@color/transparent"
android:orientation="horizontal">

4
app/src/main/res/layout/activity_wangji.xml
View File

@@ -181,7 +181,7 @@
android:textSize="14sp" />
<com.hbl.lewan.custom.PasswordEditText
<com.hbl.yuliao.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -193,7 +193,7 @@
app:passwordSize="26"
app:showPassword="true">
</com.hbl.lewan.custom.PasswordEditText>
</com.hbl.yuliao.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"

22
app/src/main/res/layout/activity_welcome.xml
View File

@@ -7,7 +7,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@mipmap/ic_welcome_bg"
tools:context=".welcome.WelcomeActivity">
<RelativeLayout
@@ -29,15 +28,13 @@
<!-- android:layout_centerHorizontal="true"-->
<!-- android:layout_marginTop="@dimen/dp_200"-->
<!-- android:scaleType="fitXY" />-->
<com.hbl.lewan.widget.CircleImageView
<ImageView
android:id="@+id/lottieView1"
android:layout_width="@dimen/dp_106"
android:layout_height="@dimen/dp_106"
app:es_shape_type="rectangle"
app:ease_radius="10dp"
android:visibility="visible"
android:layout_centerInParent="true"
android:src="@mipmap/ic_launche" />
android:src="@mipmap/ic_launch"
android:visibility="visible" />
</RelativeLayout>
@@ -45,20 +42,19 @@
android:id="@+id/bottom_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="6"
android:gravity="bottom"
android:orientation="vertical"
android:paddingBottom="@dimen/dp_64"
android:paddingBottom="@dimen/dp_80"
android:visibility="invisible">
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/login_bt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="52dp"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/bg_topup_btn"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:text="@string/login_txt"
android:textColor="@color/color_white"
@@ -67,14 +63,14 @@
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/reg_bt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="52dp"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/button_true_bg1"
android:background="@drawable/cornor_stroke_thempink_12dp"
android:gravity="center"
android:text="@string/reg_txt"
android:textColor="@color/white"
android:textColor="@color/color_themepink"
android:textSize="16sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>

2
app/src/main/res/layout/back_title_bar_layout.xml
View File

@@ -49,7 +49,7 @@
<TextView
android:id="@+id/tv_action"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="30dp"
android:gravity="center_vertical"
android:layout_marginEnd="@dimen/dimen_25_dp"
android:textSize="@dimen/dimen_16_dp"

51
app/src/main/res/layout/bottom_sheet_join_group.xml
View File

@@ -3,13 +3,18 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_dialog_bg2"
android:layout_height="match_parent"
android:background="#EEF0F7"
android:orientation="vertical">
<com.hbl.yuliao.widget.StatusLayout
android:id="@+id/join_title_tv_v"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="724dp"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<ImageView
@@ -31,12 +36,17 @@
android:textColor="#ff333333"
android:textSize="16sp"
/>
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginTop="?actionBarSize"
android:background="#EEF0F7"/>
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/group_head_iv"
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:layout_marginTop="@dimen/dp_200"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_100"
app:avatarCorner="@dimen/dp_64"
android:layout_centerHorizontal="true" />
@@ -52,22 +62,37 @@
android:layout_below="@id/group_head_iv"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_18"
android:textSize="@dimen/sp_20"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_32"
android:layout_height="wrap_content"
android:id="@+id/group_name_tv1"
android:layout_below="@id/group_name_tv"
android:text="群成员 52人"
android:layout_marginTop="@dimen/dp_10"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_20"
android:textColor="#ff2c2c2c"
android:textSize="16sp"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_20"
android:layout_below="@id/group_name_tv1"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_30"
android:id="@+id/join_tv"
android:background="@drawable/logout_btn_main1"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:text="@string/join_group_txt"
android:textColor="#ff6b3689"
android:textSize="14sp"
android:textColor="@color/white"
android:textSize="16sp"
/>
</RelativeLayout>

233
app/src/main/res/layout/bottom_sheet_qrcode_layout.xml
View File

@@ -3,115 +3,172 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_dialog_bg2"
android:layout_height="match_parent"
android:background="#EEF0F7"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_440"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<ImageView
android:id="@+id/colose_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_17"
android:layout_marginTop="@dimen/dp_21"
android:scaleType="centerInside"
android:src="@mipmap/dialog_colose_img" />
<RelativeLayout
android:id="@+id/top_rys"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:orientation="horizontal">
<ImageView
android:id="@+id/colose_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_17"
android:layout_marginTop="@dimen/dp_21"
android:scaleType="centerInside"
android:src="@mipmap/back_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="我的二维码"
android:id="@+id/top_title"
android:textColor="#ff2c2c2c"
android:textSize="18sp" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_below="@id/top_rys"
android:id="@+id/vvv"
android:background="#EEF0F7" />
<LinearLayout
android:id="@+id/qrcode_ly"
android:layout_width="@dimen/dp_175"
android:layout_height="@dimen/dp_175"
android:id="@+id/qrcode_ly1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/vvv"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60"
android:background="@drawable/qr_code_bg"
android:gravity="center"
android:padding="@dimen/dp_5"
android:orientation="vertical">
<ImageView
android:id="@+id/qrcode_iv"
<LinearLayout
android:id="@+id/qrcode_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/ic_launche"/>
android:layout_height="wrap_content"
android:layout_below="@id/vvv"
android:layout_centerHorizontal="true"
android:gravity="center"
android:padding="@dimen/dp_5"
android:orientation="vertical">
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_80"
android:layout_height="80dp"
app:es_shape_type="round"
android:layout_marginTop="20dp"
app:ease_border_color="@color/white"
android:id="@+id/user_iv"
app:ease_border_width="1dp"
android:src="@drawable/default_head_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="孤单芭蕾"
android:layout_marginTop="@dimen/dp_10"
android:textColor="#ff2c2c2c"
android:id="@+id/user_tv"
android:textSize="20sp" />
<LinearLayout
android:layout_width="@dimen/dp_165"
android:layout_height="@dimen/dp_165"
android:layout_below="@id/vvv"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_30"
android:background="@mipmap/qr_code_bg"
android:padding="@dimen/dp_10"
android:orientation="vertical">
<ImageView
android:id="@+id/qrcode_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/ic_launche" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/qrcode_tips_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_centerHorizontal="true"
android:layout_below="@id/qrcode_ly"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_18"
android:text="@string/save_code_add_friend_txt"
android:textColor="#7E7E7E"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/qrcode_action_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
android:gravity="bottom"
android:background="@drawable/user_true1"
android:layout_below="@id/qrcode_ly1"
android:paddingBottom="@dimen/dp_36"
android:orientation="horizontal">
<TextView
android:id="@+id/qrcode_tips_tv"
android:id="@+id/copy_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_centerHorizontal="true"
android:layout_below="@id/qrcode_ly"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/save_code_add_friend_txt"
android:textColor="#ff7f7b81"
android:textSize="14sp"
/>
<LinearLayout
android:id="@+id/qrcode_action_ly"
android:layout_weight="1"
android:text="@string/copy_link_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_20"
android:background="#D8D8D8"/>
<TextView
android:id="@+id/save_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_below="@id/qrcode_tips_tv"
android:layout_marginTop="@dimen/dp_30"
android:orientation="horizontal">
<TextView
android:id="@+id/copy_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:drawablePadding="@dimen/dp_10"
android:layout_weight="1"
android:drawableTop="@mipmap/qrcode_copy_img"
android:text="@string/copy_link_txt"
android:textColor="#ff333333"
android:textSize="14sp"
/>
<TextView
android:id="@+id/share_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:drawablePadding="@dimen/dp_10"
android:layout_weight="1"
android:drawableTop="@mipmap/qrcode_share_img"
android:text="@string/share_txt"
android:textColor="#ff333333"
android:textSize="14sp"
/>
<TextView
android:id="@+id/save_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:drawablePadding="@dimen/dp_10"
android:layout_weight="1"
android:drawableTop="@mipmap/qrcode_downloda_img"
android:text="@string/save_txt"
android:textColor="#ff333333"
android:textSize="14sp"
/>
</LinearLayout>
android:gravity="center"
android:layout_weight="1"
android:text="保存图片"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_20"
android:background="#D8D8D8"/>
<TextView
android:layout_width="wrap_content"
android:id="@+id/share_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:visibility="invisible"
android:layout_below="@id/qrcode_action_ly"
android:drawableLeft="@mipmap/qr_code_shuaxin_img"
android:text="@string/shuaxin_qrcode_txt"
android:id="@+id/shuaxin_tv"
android:layout_marginTop="@dimen/dp_30"
android:textColor="@color/color_6b3689"
android:drawablePadding="@dimen/dp_5"
android:textSize="14sp"
/>
android:gravity="center"
android:layout_weight="1"
android:text="分享好友"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

162
app/src/main/res/layout/bottom_sheet_qrcode_layout1.xml
View File

@@ -3,13 +3,17 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_dialog_bg2"
android:layout_height="match_parent"
android:background="#EEF0F7"
android:orientation="vertical">
<com.hbl.yuliao.widget.StatusLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_500"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<ImageView
@@ -23,19 +27,50 @@
<LinearLayout
android:id="@+id/qrcode_ly"
android:layout_width="@dimen/dp_175"
android:layout_height="@dimen/dp_175"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/vvv"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60"
android:background="@drawable/qr_code_bg"
android:orientation="vertical"
android:padding="@dimen/dp_5">
android:gravity="center"
android:padding="@dimen/dp_5"
android:orientation="vertical">
<ImageView
android:id="@+id/qrcode_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/ic_launche" />
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_80"
android:layout_height="80dp"
app:es_shape_type="round"
android:layout_marginTop="20dp"
app:ease_border_color="@color/white"
android:id="@+id/user_iv"
app:ease_border_width="1dp"
android:src="@drawable/default_head_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="孤单芭蕾"
android:layout_marginTop="@dimen/dp_10"
android:textColor="#ff2c2c2c"
android:id="@+id/user_tv"
android:textSize="20sp" />
<LinearLayout
android:layout_width="@dimen/dp_165"
android:layout_height="@dimen/dp_165"
android:layout_below="@id/vvv"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_30"
android:background="@mipmap/qr_code_bg"
android:padding="@dimen/dp_10"
android:orientation="vertical">
<ImageView
android:id="@+id/qrcode_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/ic_launche" />
</LinearLayout>
</LinearLayout>
<TextView
@@ -52,60 +87,16 @@
android:textColor="#ff7f7b81"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/qrcode_action_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/qrcode_tips_tv"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_20"
android:orientation="horizontal">
<TextView
android:id="@+id/copy_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/qrcode_copy_img"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/copy_link_txt"
android:textColor="#ff333333"
android:textSize="14sp" />
<TextView
android:id="@+id/share_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/qrcode_share_img"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/share_txt"
android:textColor="#ff333333"
android:textSize="14sp" />
<TextView
android:id="@+id/save_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/qrcode_downloda_img"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/save_txt"
android:textColor="#ff333333"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_shuaxin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/qrcode_action_ly"
android:layout_below="@id/qrcode_tips_tv"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_30"
android:visibility="gone"
android:orientation="horizontal">
<ImageView
@@ -131,6 +122,7 @@
android:layout_below="@id/layout_shuaxin"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_30"
android:background="@drawable/fun_themeblue_btn_bg"
android:gravity="center"
@@ -140,5 +132,53 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/qrcode_action_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
android:gravity="bottom"
android:layout_below="@id/qrcode_ly1"
android:paddingBottom="@dimen/dp_36"
android:orientation="horizontal">
<TextView
android:id="@+id/copy_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="1"
android:text="@string/copy_link_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_20"
android:background="#D8D8D8"/>
<TextView
android:id="@+id/save_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="1"
android:text="保存图片"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<View
android:layout_width="1dp"
android:layout_height="@dimen/dp_20"
android:background="#D8D8D8"/>
<TextView
android:id="@+id/share_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="1"
android:text="分享好友"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/chat_his_child_item.xml
View File

@@ -10,7 +10,7 @@
android:orientation="horizontal"
tools:ignore="MissingDefaultResource">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/item_civ"
android:layout_width="@dimen/dp_84"
android:layout_height="@dimen/dp_84"

2
app/src/main/res/layout/chat_his_child_item1.xml
View File

@@ -10,7 +10,7 @@
android:orientation="horizontal"
tools:ignore="MissingDefaultResource">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/item_civ"
android:layout_width="0dp"
android:layout_height="0dp"

7
app/src/main/res/layout/chat_his_child_itemtop.xml
View File

@@ -12,7 +12,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_17"
android:paddingBottom="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:orientation="horizontal">
@@ -23,8 +24,8 @@
android:layout_weight="1"
android:gravity="center_vertical"
android:text="2023年09月"
android:textColor="#ff7f7b81"
android:textSize="12sp" />
android:textColor="#2C2C2C"
android:textSize="16sp" />
<TextView
android:id="@+id/title_selector_tv"

12
app/src/main/res/layout/dialog_mianmi_confirm.xml
View File

@@ -19,7 +19,7 @@
android:text="@string/mianmi_title_txt"
android:layout_marginTop="@dimen/dp_20"
android:textStyle="bold"
android:textColor="#ff333333"
android:textColor="@color/color_2c2c2c"
android:textSize="18sp"
/>
@@ -33,7 +33,7 @@
android:id="@+id/content_tv"
android:layout_gravity="center_horizontal"
android:text="@string/mianmi_content_txt"
android:textColor="@color/color_333333"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp"
/>
<LinearLayout
@@ -72,10 +72,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_62"
android:layout_height="@dimen/dp_52"
android:layout_alignParentBottom="true"
android:layout_gravity="center_horizontal"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center_vertical"
android:layout_marginBottom="20dp"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
@@ -84,7 +88,7 @@
android:id="@+id/sumbit_tv"
android:text="@string/lijikaitong_txt"
android:gravity="center"
android:textColor="@color/color_6b3689"
android:textColor="@color/white"
android:textSize="16sp"
/>
</LinearLayout>

8
app/src/main/res/layout/dialog_mianmi_xieyi.xml
View File

@@ -35,10 +35,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_62"
android:layout_height="@dimen/dp_52"
android:layout_alignParentBottom="true"
android:layout_gravity="center_horizontal"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/dp_20"
android:layout_marginStart="30dp"
android:layout_marginEnd="@dimen/dp_30"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
@@ -47,7 +51,7 @@
android:id="@+id/sumbit_tv"
android:text="@string/woyiyuedubintongyi_txt"
android:gravity="center"
android:textColor="@color/color_6b3689"
android:textColor="@color/white"
android:textSize="16sp"
/>
</LinearLayout>

48
app/src/main/res/layout/dialog_select_head_photo.xml Normal file
View File

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_dialog_bg2"
android:orientation="vertical">
<TextView
android:id="@+id/head_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
android:layout_weight="1"
android:gravity="center"
android:text="@string/teamsetting_other_teamhead"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"></TextView>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="#F1F1F1" />
<TextView
android:id="@+id/fengmian_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
android:layout_weight="1"
android:gravity="center"
android:text="设置封面"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"></TextView>
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="#F4F4F4" />
<TextView
android:id="@+id/cancel_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
android:layout_weight="1"
android:gravity="center"
android:text="@string/cancel_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"></TextView>
</LinearLayout>

2
app/src/main/res/layout/dialog_select_pay_type.xml
View File

@@ -84,7 +84,7 @@
android:gravity="center_vertical"
android:paddingRight="@dimen/dp_15"
android:layout_weight="1">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:es_shape_type="round"

2
app/src/main/res/layout/discover_child_item.xml
View File

@@ -58,7 +58,7 @@
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/dp_5"
android:orientation="horizontal">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:scaleType="centerCrop"

4
app/src/main/res/layout/discover_child_item_default.xml
View File

@@ -23,7 +23,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:scaleType="fitXY"
android:adjustViewBounds="true"
android:layout_width="match_parent"
@@ -54,7 +54,7 @@
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/dp_5"
android:orientation="horizontal">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@color/common_list_custom_divider"

2
app/src/main/res/layout/explore_default_item.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/dongtai_portrait"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"

318
app/src/main/res/layout/fragment_chat.xml
View File

@@ -1,156 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:id="@+id/top_lyy"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="148dp"
android:background="@mipmap/chat_bg_index"
android:orientation="vertical">
<ImageView
android:id="@+id/card_view"
<com.hbl.yuliao.widget.StatusLayout
android:layout_width="match_parent"
android:layout_height="146dp"
android:background="@mipmap/chat_bg_index"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.hbl.lewan.widget.StatusLayout
android:id="@+id/sss"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_chatfm_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/chat_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_20"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/sss" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_8"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sss">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_indexfm_notifytop"
android:layout_width="@dimen/dp_40"
android:layout_height="wrap_content"
android:src="@mipmap/index_tongzhi_img"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/view_chatfm_notifypoint"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:background="@drawable/point_chat_ff4e54"
android:gravity="center"
android:minWidth="@dimen/dp_16"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_5"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_chatfm_setting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:src="@mipmap/ic_chat_list"
app:layout_constraintRight_toLeftOf="@+id/iv_chatfm_add"
app:layout_constraintTop_toTopOf="@+id/iv_chatfm_add" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_chatfm_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:src="@mipmap/ic_chat_add"
app:layout_constraintRight_toLeftOf="@+id/iv_chatfm_friend"
app:layout_constraintTop_toTopOf="@+id/iv_chatfm_contact" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_chatfm_friend"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:src="@mipmap/ic_chat_friend"
app:layout_constraintRight_toLeftOf="@+id/iv_chatfm_contact"
app:layout_constraintTop_toTopOf="@+id/iv_chatfm_contact" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_chatfm_contact"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_18"
android:layout_marginEnd="@dimen/dp_15"
android:src="@mipmap/ic_chat_contact"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/sss" />
<View
android:id="@+id/view_settingclick"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_40"
app:layout_constraintRight_toLeftOf="@+id/view_addclick"
app:layout_constraintTop_toBottomOf="@id/sss" />
<View
android:id="@+id/view_addclick"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_15"
app:layout_constraintLeft_toRightOf="@+id/iv_chatfm_setting"
app:layout_constraintTop_toBottomOf="@id/sss" />
<View
android:id="@+id/view_friendgclick"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_15"
app:layout_constraintLeft_toRightOf="@+id/iv_chatfm_add"
app:layout_constraintTop_toBottomOf="@id/sss" />
<View
android:id="@+id/view_contactclick"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_15"
app:layout_constraintLeft_toRightOf="@+id/iv_chatfm_friend"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/sss" />
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_88"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_chatfm_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/chat_txt"
android:textStyle="bold"
android:textColor="#2C2C2C"
android:textSize="@dimen/sp_22" />
<ImageView
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_15"
android:id="@+id/kefu_iv"
android:src="@mipmap/b_kefu"/>
<RelativeLayout
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_15"
>
<ImageView
android:id="@+id/iv_chatfm_contact"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:src="@mipmap/tab_message"/>
<ImageView
android:id="@+id/view_chatfm_notifypoint1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/tab_dot"
android:layout_alignParentRight="true"
android:visibility="gone"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_15"
>
<ImageView
android:id="@+id/iv_indexfm_notifytop"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:src="@mipmap/tab_tonzhi"/>
<ImageView
android:id="@+id/view_chatfm_notifypoint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/tab_dot"
android:layout_alignParentRight="true"
android:visibility="gone"/>
</RelativeLayout>
<ImageView
android:id="@+id/iv_chatfm_add"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_15"
android:src="@mipmap/tab_add"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginBottom="@dimen/dp_10"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
@@ -165,9 +105,10 @@
app:layout_constraintLeft_toLeftOf="@+id/tv_chatfm_title"
app:layout_constraintRight_toRightOf="@+id/iv_chatfm_contact"
app:layout_constraintTop_toBottomOf="@+id/tv_chatfm_title" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -378,10 +319,10 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="#EDE3E3" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="0.5dp"-->
<!-- android:background="#EDE3E3" />-->
<TextView
android:id="@+id/errorTv"
@@ -397,14 +338,93 @@
android:textColor="@color/color_50_000000"
android:textSize="14dp"
android:visibility="gone"
android:layout_below="@id/top_lyy"
app:drawableStartCompat="@drawable/ic_error"
app:layout_constraintTop_toBottomOf="@+id/layout_chatfm_all" />
/>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewpager_fm_chat"
android:layout_width="match_parent"
android:overScrollMode="never"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/errorTv" />
</LinearLayout>
android:layout_below="@id/errorTv" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
android:id="@+id/float_menu_ry">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_218"
app:cardCornerRadius="@dimen/dp_10"
android:layout_marginTop="90dp"
android:layout_alignParentRight="true"
app:cardBackgroundColor="@color/white"
app:cardElevation="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_15">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
android:paddingEnd="@dimen/dp_22"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:drawablePadding="@dimen/dp_10"
android:paddingStart="@dimen/dp_20"
android:drawableLeft="@mipmap/tab_bianji"
android:text="编辑列表"
android:textColor="#ff333333"
android:textSize="16sp"
android:id="@+id/bianji_tv"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:drawablePadding="@dimen/dp_10"
android:paddingStart="@dimen/dp_20"
android:drawableLeft="@mipmap/tab_tianjia"
android:text="添加好友"
android:textColor="#ff333333"
android:textSize="16sp"
android:id="@+id/tianjia_tv"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:drawablePadding="@dimen/dp_10"
android:paddingStart="@dimen/dp_20"
android:drawableLeft="@mipmap/tab_chuangjian"
android:text="创建群聊"
android:textColor="#ff333333"
android:textSize="16sp"
android:id="@+id/chuangjian_tv"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:drawablePadding="@dimen/dp_10"
android:paddingStart="@dimen/dp_20"
android:drawableLeft="@mipmap/tab_tongxunlu"
android:text="通讯录"
android:textColor="#ff333333"
android:textSize="16sp"
android:id="@+id/tongxunlu_tv"
/>
</LinearLayout>
</androidx.cardview.widget.CardView>
</RelativeLayout>
</RelativeLayout>

2
app/src/main/res/layout/fragment_circle.xml
View File

@@ -17,7 +17,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_comment.xml
View File

@@ -17,7 +17,7 @@
android:layout_marginBottom="@dimen/dp_95"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_followlist.xml
View File

@@ -13,7 +13,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_home_new.xml
View File

@@ -15,7 +15,7 @@
android:visibility="visible"
app:srlAccentColor="@color/white">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

449
app/src/main/res/layout/fragment_index2.xml
View File

@@ -4,328 +4,34 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
<LinearLayout
android:id="@+id/layout_indexfm_topright"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/av_indexfra_head"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_marginRight="@dimen/dp_10"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_topright" />
<include
android:id="@+id/layout_indexfm_search"
layout="@layout/layout_common_search1"
android:layout_width="0dp"
android:layout_height="@dimen/dp_32"
android:layout_marginRight="@dimen/dp_10"
android:layout_weight="1"
app:layout_constraintLeft_toLeftOf="@+id/tv_indexfra_nick"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/av_indexfra_head" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_indexfm_notifytop"
android:layout_width="@dimen/dp_20"
android:layout_height="match_parent"
android:src="@mipmap/ic_index_notify"
android:tint="@color/white"
app:layout_constraintRight_toLeftOf="@+id/iv_indexfm_addfriendtop"
app:layout_constraintTop_toTopOf="@+id/iv_indexfm_settingtop" />
<View
android:id="@+id/view_chatfm_frinedspoint"
android:layout_width="@dimen/dp_8"
android:layout_height="@dimen/dp_8"
android:layout_marginLeft="-8dp"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/point_chat_ff4e54"
android:visibility="gone" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_indexfm_addfriendtop"
android:layout_width="@dimen/dp_20"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_25"
android:src="@mipmap/ic_index_addfriends"
android:tint="@color/white"
android:visibility="visible"
app:layout_constraintRight_toLeftOf="@+id/iv_indexfm_settingtop"
app:layout_constraintTop_toTopOf="@+id/iv_indexfm_settingtop" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_indexfm_settingtop"
android:layout_width="@dimen/dp_20"
android:layout_height="match_parent"
android:src="@mipmap/ic_index_setting"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_indexfm_topright1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dimen_20_dp"
android:layout_marginRight="@dimen/dp_15"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="@+id/layout_indexfm_topright"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_topright">
<TextView
android:id="@+id/saoyisao_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/index_saoyisao_img"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/saoyisao_txt"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/zhuanzhang_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/wallet_taoleting_item_img1"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/taoleting_txt"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/fukuan_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/yinbi_shop_img1"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/jifenduihuan_txt"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/shoukuan_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/index_fukuanma_img1"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:text="@string/wdewm_txt"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<View
android:id="@+id/line1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/dp_20"
android:background="@color/transparent"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_topright1" />
android:background="#EEF0F7">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@drawable/index_main_bg"
android:paddingLeft="@dimen/dp_15"
android:layout_height="match_parent"
android:background="#EEF0F7"
android:paddingTop="@dimen/dp_10"
android:paddingRight="@dimen/dp_15"
android:scrollbars="none"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/line1"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line1">
android:scrollbars="none">
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/wawaji_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingDefaultResource">
<ImageView
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="vertical"
android:src="@mipmap/wallet_taoleting_img"
app:layout_constraintDimensionRatio="345:80"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_indexfm_aichat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/aichat_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/wawaji_ly" />
<RelativeLayout
android:id="@+id/layout_indexfm_aichat"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_20"
android:visibility="gone"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/tv_indexfm_aichat">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/iv_indexfm_aihead"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
app:avatarCorner="@dimen/dp_45" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_toEndOf="@+id/iv_indexfm_aihead"
android:text="@string/ainame_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/tv_indexfm_aicontent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/iv_indexfm_aihead"
android:layout_marginStart="@dimen/dp_15"
android:layout_toEndOf="@+id/iv_indexfm_aihead"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/aihint_txt"
android:textColor="@color/color_7f7b81"
android:textSize="@dimen/sp_14" />
</RelativeLayout>
<LinearLayout
android:id="@+id/tebieguanzhu_ly"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_aichat">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_indexfm_tbgztitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/tebiezhuanzhu_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_aichat" />
<TextView
android:id="@+id/tv_indexfm_tbgzpull"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_3"
android:paddingStart="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:visibility="gone"
app:drawableEndCompat="@mipmap/ic_indexfm_down"
app:layout_constraintBottom_toBottomOf="@+id/tv_indexfm_friendstitle"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_indexfm_friendstitle" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contacttbgz"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/tv_indexfm_tbgztitle"
app:showIndexBar="false"
app:showSelector="false"
app:showTopPin="false" />
<View android:layout_width="match_parent"
android:layout_height="20dp"/>
</LinearLayout>
<TextView
android:id="@+id/tv_indexfm_friendstitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/haoyou_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tebieguanzhu_ly" />
<TextView
android:id="@+id/tv_indexfm_friendspull"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_3"
android:paddingStart="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:visibility="gone"
app:drawableEndCompat="@mipmap/ic_indexfm_down"
app:layout_constraintBottom_toBottomOf="@+id/tv_indexfm_friendstitle"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_indexfm_friendstitle" />
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/layout_indexfm_addfriends"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/tv_indexfm_friendstitle">
android:layout_height="80dp"
android:paddingTop="@dimen/dp_15"
android:background="@color/white"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_indexfm_addfriends"
@@ -352,45 +58,21 @@
android:textColor="@color/color_7f7b81"
android:textSize="@dimen/sp_14" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contactfriends"
<View
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_addfriends" />
<TextView
android:id="@+id/tv_indexfm_grouptitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/group_text"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contactfriends" />
<TextView
android:id="@+id/tv_indexfm_grouppull"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_3"
android:paddingStart="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:visibility="gone"
app:drawableEndCompat="@mipmap/ic_indexfm_down"
app:layout_constraintBottom_toBottomOf="@+id/tv_indexfm_grouptitle"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_indexfm_grouptitle" />
android:layout_height="@dimen/dp_1"
android:background="#EEF0F4"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"/>
<RelativeLayout
android:id="@+id/layout_indexfm_addgroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintTop_toBottomOf="@+id/tv_indexfm_grouptitle">
android:layout_height="80dp"
android:paddingTop="@dimen/dp_15"
android:paddingLeft="@dimen/dp_15"
android:background="@color/white"
android:paddingRight="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_addfriends">
<androidx.appcompat.widget.AppCompatImageView
@@ -418,17 +100,84 @@
android:textColor="@color/color_7f7b81"
android:textSize="@dimen/sp_14" />
</RelativeLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/tv_indexfm_friendstitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/haoyou_txt"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_addgroup" />
<TextView
android:id="@+id/tv_indexfm_friendspull"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_3"
android:paddingStart="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
android:visibility="gone"
app:drawableEndCompat="@mipmap/ic_indexfm_down"
app:layout_constraintBottom_toBottomOf="@+id/tv_indexfm_friendstitle"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_indexfm_friendstitle" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contactfriends"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@+id/tv_indexfm_friendstitle" />
<TextView
android:id="@+id/tv_indexfm_grouptitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/group_text"
android:layout_marginStart="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contactfriends" />
<TextView
android:id="@+id/tv_indexfm_grouppull"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_3"
android:paddingStart="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
android:visibility="gone"
app:drawableEndCompat="@mipmap/ic_indexfm_down"
app:layout_constraintBottom_toBottomOf="@+id/tv_indexfm_grouptitle"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_indexfm_grouptitle" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contactgroups"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15"
android:background="@color/white"
android:paddingStart="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_20"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/layout_indexfm_addgroup" />
app:layout_constraintTop_toBottomOf="@+id/tv_indexfm_grouptitle" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_like.xml
View File

@@ -18,7 +18,7 @@
android:layout_marginBottom="@dimen/dp_40"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_mine.xml
View File

@@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.hbl.lewan.widget.StatusLayout
<com.hbl.yuliao.widget.StatusLayout
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="wrap_content"/>

428
app/src/main/res/layout/fragment_mine_new.xml
View File

@@ -4,15 +4,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#EEF0F7"
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
android:background="#F2F2F2"
android:scrollbars="none">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -23,15 +25,6 @@
android:layout_height="wrap_content"
tools:context=".main.mine.MineInfoActivity">
<ImageView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="175dp"
android:background="@mipmap/user_info_bg1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -76,8 +69,8 @@
android:background="@color/transparent"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:textColor="#2C2C2C"
android:textSize="@dimen/sp_20"
app:layout_constraintEnd_toStartOf="@id/ivRightArrow"
app:layout_constraintStart_toEndOf="@id/cavIcon"
app:layout_constraintTop_toTopOf="@id/cavIcon"
@@ -89,11 +82,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/ic_frame_mine_right_arrow"
android:scaleType="centerInside"
android:src="@mipmap/ic_frame_mine_right_arrow"
app:layout_constraintBottom_toBottomOf="@id/cavIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/cavIcon"
app:tint="@color/white" />
app:layout_constraintTop_toTopOf="@id/cavIcon" />
</LinearLayout>
<LinearLayout
@@ -174,191 +167,42 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="205dp"
android:layout_height="203dp"
android:visibility="visible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/index_user_bg1"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="345:60"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/jinbi_tv1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@mipmap/index_dianshu_img"
android:drawableRight="@mipmap/index_wallet_next_img"
android:drawablePadding="@dimen/dp_5"
android:text="@string/cash_dianshu_txt"
android:textColor="#ff525252"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/yinbi_tv1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="12dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@mipmap/me_qianbao_img"
android:drawablePadding="@dimen/dp_5"
android:text="我的钱包"
android:textColor="#ff525252"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/tongbi_tv1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@mipmap/index_lijin_img"
android:drawableRight="@mipmap/index_wallet_next_img"
android:drawablePadding="@dimen/dp_5"
android:text="@string/lijin_txt"
android:textColor="#ff525252"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/jinbi_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:autoSizeMaxTextSize="21sp"
android:autoSizeMinTextSize="16sp"
android:autoSizeTextType="uniform"
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:textColor="#FA6947"
android:textStyle="bold"
android:visibility="gone"
tools:text="8888" />
<View
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center_vertical"
android:background="#49B78C8C"
android:visibility="gone" />
<TextView
android:id="@+id/yinbi_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:autoSizeMaxTextSize="21sp"
android:autoSizeMinTextSize="16sp"
android:autoSizeTextType="uniform"
android:drawableRight="@mipmap/index_wallet_next_img"
android:drawablePadding="10dp"
android:drawableTint="#26000000"
android:ellipsize="end"
android:gravity="center_vertical|right"
android:lines="1"
android:textColor="#FA6947"
android:textStyle="bold"
tools:text="8888" />
<View
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center_vertical"
android:background="#49B78C8C"
android:visibility="gone" />
<TextView
android:id="@+id/tongbi_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:autoSizeMaxTextSize="21sp"
android:autoSizeMinTextSize="16sp"
android:autoSizeTextType="uniform"
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:textColor="#FA6947"
android:textStyle="bold"
android:visibility="gone"
tools:text="8888" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/index_user_bg"
android:orientation="vertical"
android:layout_below="@id/cl_root">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginLeft="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/user_info_title"
android:textColor="@color/color_666666"
android:textSize="12sp" />
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="40dp"-->
<!-- android:layout_marginLeft="@dimen/dp_15"-->
<!-- android:gravity="center_vertical"-->
<!-- android:text="@string/user_info_title"-->
<!-- android:textColor="@color/color_666666"-->
<!-- android:textSize="12sp" />-->
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="#D8D8D8" />
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1px"-->
<!-- android:layout_marginLeft="@dimen/dp_15"-->
<!-- android:layout_marginRight="@dimen/dp_15"-->
<!-- android:background="#D8D8D8" />-->
<LinearLayout
android:layout_width="match_parent"
@@ -384,8 +228,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/account_and_security_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/icon_safa"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
@@ -412,8 +256,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/pay_setting_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/wallet_pay_setting_img"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
@@ -442,7 +286,7 @@
android:gravity="center_vertical"
android:text="@string/myphoto_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/ic_info_myphoto"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
@@ -453,27 +297,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/index_user_bg"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginLeft="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/changgui_txt"
android:textColor="@color/color_666666"
android:textSize="12sp" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="#D8D8D8" />
<LinearLayout
android:layout_width="match_parent"
@@ -499,8 +326,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/setting_notify_info"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/icon_tongzhi"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
@@ -532,8 +359,8 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/black_list_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/icon_friend_quanxian"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
@@ -585,12 +412,56 @@
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="#D8D8D8" />
<LinearLayout
android:id="@+id/version_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="SpUsage">
<Button
android:id="@+id/version_tv"
style="@style/settings_item_bg_group_full_20191"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/now_version_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16"
app:drawableLeftCompat="@mipmap/icon_dangqian_left" />
<TextView
android:id="@+id/version_desc_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:gravity="center_vertical"
android:text="v1.0.0"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_14"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_15"
@@ -681,89 +552,27 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="#D8D8D8" />
<LinearLayout
android:id="@+id/version_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="SpUsage">
<Button
android:id="@+id/version_tv"
style="@style/settings_item_bg_group_full_20191"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:text="@string/now_version_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
app:drawableLeftCompat="@mipmap/icon_dangqian_left" />
<TextView
android:id="@+id/version_desc_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:gravity="center_vertical"
android:text="v1.0.0"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12"
app:drawableRightCompat="@drawable/ic_frame_mine_right_arrow" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_16"
android:background="@drawable/index_user_bg"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:id="@+id/tvChange"
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center"
android:singleLine="true"
android:text="切换账号"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_16"
tools:ignore="NotSibling,SpUsage" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="@dimen/dp_7"
android:layout_marginRight="@dimen/dp_7"
android:background="#D8D8D8" />
<TextView
android:id="@+id/tvLogout"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_height="@dimen/dp_62"
android:gravity="center"
android:singleLine="true"
android:text="@string/tab_mine_logout"
android:textColor="@color/color_ff2b2b"
android:textSize="@dimen/dp_16"
android:textSize="@dimen/sp_16"
tools:ignore="NotSibling,SpUsage" />
</LinearLayout>
@@ -771,6 +580,69 @@
<View
android:layout_width="match_parent"
android:layout_height="20dp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_alignBottom="@id/cl_root"
android:layout_marginBottom="-4dp"
android:background="@mipmap/index_user_bg1"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/yinbi_tv1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="12dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_5"
android:text="我的钱包"
android:textColor="#FFE396"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/yinbi_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:autoSizeMaxTextSize="21sp"
android:autoSizeMinTextSize="16sp"
android:autoSizeTextType="uniform"
android:drawableRight="@mipmap/index_wallet_next_img"
android:drawablePadding="10dp"
android:drawableTint="#FFFFFF"
android:ellipsize="end"
android:gravity="center_vertical|right"
android:lines="1"
android:textColor="#F3F3F3"
android:textStyle="bold"
tools:text="8888" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

39
app/src/main/res/layout/fragment_shop.xml Normal file
View File

@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<com.smallbuer.jsbridge.core.BridgeWebView
android:id="@+id/jsbridge_bridgewebview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" />
<LinearLayout
android:id="@+id/show_top_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#EEF0F7"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:indeterminateDrawable="@drawable/pass_word_bg1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
android:text="正在加载数据…" />
</LinearLayout>
</RelativeLayout>

2
app/src/main/res/layout/fragment_voom.xml
View File

@@ -11,7 +11,7 @@
android:background="@color/color_f7f7f7"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.hbl.lewan.widget.StatusLayout
<com.hbl.yuliao.widget.StatusLayout
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="wrap_content"/>

91
app/src/main/res/layout/fragment_wallet_info.xml
View File

@@ -12,15 +12,10 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_82"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_height="56dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -47,49 +42,49 @@
android:textColor="@color/color_333333"
android:textSize="16sp"
android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="总支出："
android:textColor="#ff9e9e9e"
android:textSize="14sp"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0"
android:id="@+id/out_tv"
android:layout_weight="1"
android:textColor="#FA6947"
android:textSize="14sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="总收入："
android:textColor="#ff9e9e9e"
android:textSize="14sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:id="@+id/income_tv"
android:textColor="#FA6947"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="总支出："
android:textColor="#ff9e9e9e"
android:textSize="14sp"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0"
android:id="@+id/out_tv"
android:layout_weight="1"
android:textColor="#FA6947"
android:textSize="14sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="总收入："
android:textColor="#ff9e9e9e"
android:textSize="14sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:id="@+id/income_tv"
android:textColor="#FA6947"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
@@ -105,7 +100,7 @@
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_wallet_info1.xml
View File

@@ -57,7 +57,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_wallet_info_log.xml
View File

@@ -21,7 +21,7 @@
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_wallet_info_new.xml
View File

@@ -19,7 +19,7 @@
app:srlAccentColor="@color/color_6b3689">
<com.hbl.lewan.widget.BezierCircleHeader
<com.hbl.yuliao.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/item_account.xml
View File

@@ -12,7 +12,7 @@
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/input_bg_t"
tools:ignore="MissingDefaultResource">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_56"
android:layout_marginStart="10dp"

96
app/src/main/res/layout/item_bank.xml
View File

@@ -2,65 +2,63 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/big_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_93"
android:layout_height="@dimen/dp_142"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bank_bg1"
android:gravity="center_vertical"
android:orientation="vertical"
android:id="@+id/big_bg"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:background="@drawable/bank_bg1"
tools:ignore="MissingDefaultResource">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="中国工商银行"
android:gravity="center_vertical"
android:textColor="#FFFFFF"
android:id="@+id/title_tv"
android:layout_weight="1"
android:textSize="18sp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center_vertical">
<LinearLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/title_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="张三"
android:id="@+id/des_tv"
android:layout_marginEnd="@dimen/dp_15"
android:textColor="#FFFFFF"
android:textSize="18sp"
/>
<TextView
android:layout_width="4dp"
android:layout_height="25dp"
android:text="|"
android:textColor="#ffffffff"
android:textSize="18sp"
/>
<TextView
android:id="@+id/number_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lines="1"
android:ellipsize="middle"
android:layout_marginStart="@dimen/dp_15"
android:text="6210 0001 1752 4866"
android:textColor="#ffffffff"
android:textSize="20sp"
/>
</LinearLayout>
android:text="中国工商银行"
android:textColor="#FFFFFF"
android:textSize="18sp" />
<TextView
android:id="@+id/des_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="张三"
android:textColor="#FFFFFF"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#EEF0F4" />
<TextView
android:id="@+id/number_tv"
android:layout_width="match_parent"
android:layout_height="60dp"
android:gravity="center_vertical"
android:ellipsize="middle"
android:lines="1"
android:text="6210 0001 1752 4866"
android:textColor="#ffffffff"
android:textSize="24sp" />
</LinearLayout>

2
app/src/main/res/layout/item_bill_installment.xml
View File

@@ -16,7 +16,7 @@
<TextView
android:id="@+id/title_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:lines="1"
android:ellipsize="end"

15
app/src/main/res/layout/item_bill_top.xml
View File

@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
android:gravity="center_vertical"
android:orientation="vertical"
android:id="@+id/big_bg"
android:layout_margin="7.5dp"
@@ -13,7 +12,7 @@
tools:ignore="MissingDefaultResource">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
tools:text="10"
android:gravity="center"
android:textColor="#654C35"
@@ -31,4 +30,12 @@
android:textColor="#916D4B"
android:textSize="16sp"
/>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/xuanxiang_t"
android:id="@+id/gou_iv"
android:visibility="gone"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"/>
</RelativeLayout>

2
app/src/main/res/layout/item_comment_list.xml
View File

@@ -11,7 +11,7 @@
android:paddingBottom="@dimen/dp_5"
tools:ignore="MissingDefaultResource">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"

11
app/src/main/res/layout/item_contactlist.xml
View File

@@ -12,8 +12,8 @@
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/avatar_view"
android:layout_width="@dimen/dimen_45_dp"
android:layout_height="@dimen/dimen_45_dp"
android:layout_width="@dimen/dimen_48_dp"
android:layout_height="@dimen/dimen_48_dp"
android:layout_marginTop="@dimen/dimen_10_dp"
android:layout_marginBottom="@dimen/dimen_10_dp"
app:avatarCorner="@dimen/dimen_45_dp"
@@ -126,7 +126,12 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/dp_60"
android:background="#EEF0F4"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/item_help_list_t.xml
View File

@@ -11,7 +11,7 @@
android:gravity="center"
android:orientation="vertical">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:id="@+id/item_iv"

2
app/src/main/res/layout/item_like_list.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/big_bg"
tools:ignore="MissingDefaultResource">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"

4
app/src/main/res/layout/item_message_list.xml
View File

@@ -17,7 +17,7 @@
android:layout_height="@dimen/dp_62"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
android:id="@+id/item_head_civ"
@@ -59,7 +59,7 @@
android:layout_marginBottom="@dimen/dp_15"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/big_iv"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"

8
app/src/main/res/layout/item_post_circle.xml
View File

@@ -9,7 +9,7 @@
android:padding="@dimen/dp_8"
tools:ignore="MissingDefaultResource">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/item_image_iv"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -19,20 +19,18 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:scaleType="centerCrop"
android:src="@mipmap/push_add_img" />
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/item_image_iv1"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="gone"
android:background="@drawable/add_cir_pic_bg_true"
android:src="@mipmap/push_add_img"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:scaleType="centerInside" />
android:scaleType="fitXY" />
<ImageView
android:id="@+id/colose_iv"
android:layout_width="@dimen/dp_20"

12
app/src/main/res/layout/item_team_manager.xml
View File

@@ -7,10 +7,10 @@
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/item_avatar"
android:layout_width="@dimen/dimen_45_dp"
android:layout_height="@dimen/dimen_45_dp"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginBottom="@dimen/dp_10"
android:layout_width="@dimen/dimen_56_dp"
android:layout_height="@dimen/dimen_56_dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_15"
app:avatarCorner="@dimen/dimen_45_dp"
app:layout_constraintBottom_toTopOf="@+id/item_line"
app:layout_constraintStart_toStartOf="parent"
@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
android:textSize="@dimen/sp_18"
app:layout_constraintBottom_toBottomOf="@+id/item_avatar"
app:layout_constraintStart_toEndOf="@+id/item_avatar"
app:layout_constraintTop_toTopOf="@+id/item_avatar" />
@@ -31,7 +31,7 @@
android:id="@+id/item_line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_ebe8F1"
android:background="#EEF0F4"
app:layout_constraintBottom_toBottomOf="parent" />
<ImageView

4
app/src/main/res/layout/item_tiktok_layout.xml
View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.hbl.lewan.voom.comm.CusVideoView
<com.hbl.yuliao.voom.comm.CusVideoView
android:id="@+id/mVideoView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_alignParentTop="true"

111
app/src/main/res/layout/item_wl_rd_item.xml Normal file
View File

@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/item_ry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:gravity="center"
android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="0dp"
android:maxHeight="@dimen/dp_200"
android:background="@mipmap/weiling_rd_bg"
android:orientation="vertical"
app:layout_constraintDimensionRatio="315:132"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
android:paddingBottom="@dimen/dp_20"
android:layout_weight="38">
<ImageView
android:layout_width="@dimen/dp_64"
android:layout_height="@dimen/dp_64"
android:layout_marginStart="@dimen/dp_10"
android:src="@mipmap/weiling_rd_img"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
android:orientation="vertical"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_20">
<TextView
android:id="@+id/title_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="给Tony stark的红包"
android:textColor="#FFFEE3"
android:textSize="16sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="bottom"
android:text="￥15.00"
android:textStyle="bold"
android:id="@+id/jine_tv"
android:textColor="#FEE391"
android:textSize="18sp"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="94">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10">
<TextView
android:layout_width="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:layout_height="match_parent"
android:text="专属红包"
android:textColor="#FFFFFF"
android:textSize="12sp"
/>
<TextView
android:id="@+id/time_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="2025-03-28 07:15:48"
android:textColor="#ffffffff"
android:textSize="12sp"
/>
</LinearLayout>
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:id="@+id/bot_line"
android:visibility="gone"
android:background="#D9DBDF" />
</androidx.appcompat.widget.LinearLayoutCompat>

2
app/src/main/res/layout/layout_common_search.xml
View File

@@ -24,7 +24,7 @@
android:background="@android:color/transparent"
android:gravity="center_vertical"
android:hint="@string/addfriend_search_text"
android:textColorHint="@color/color_cccccc"
android:textColorHint="#2C2C2C"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/ic_common_search"

86
app/src/main/res/layout/layout_statistic.xml Normal file
View File

@@ -0,0 +1,86 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/statistic_bg"
android:paddingHorizontal="20dp"
android:paddingVertical="10dp">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tvStatistic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableEnd="@mipmap/app_icon_switch"
android:drawablePadding="2dp"
android:text="@string/app_statistic"
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TableLayout
android:id="@+id/tlStatistic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible"
app:layout_constraintTop_toBottomOf="@id/tvStatistic"
tools:visibility="visible">
<TableRow >
<TextView
android:id="@+id/tvEncodeDimensions"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="12sp"
android:paddingVertical="3dp"
tools:text="@string/app_statistic_dimensions" />
</TableRow>
<TableRow >
<TextView
android:id="@+id/tvEncodeFrameRate"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="12sp"
android:paddingVertical="3dp"
tools:text="@string/app_statistic_frame_rate" />
</TableRow>
<TableRow >
<TextView
android:id="@+id/tvEncodeBitrate"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="12sp"
android:paddingVertical="3dp"
tools:text="@string/app_statistic_bitrate" />
</TableRow>
<TableRow >
<TextView
android:id="@+id/tvLocalUid"
android:layout_weight="1"
android:paddingVertical="3dp"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="@string/app_local_uid" />
</TableRow>
<TableRow >
<TextView
android:id="@+id/tvPkChannels"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="12sp"
android:paddingVertical="3dp"
tools:text="@string/app_pk_channels" />
</TableRow>
</TableLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/link_image.xml
View File

@@ -58,7 +58,7 @@
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/dp_5"
android:orientation="horizontal">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:scaleType="centerCrop"

50
app/src/main/res/layout/report_activity.xml
View File

@@ -3,17 +3,19 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@drawable/user_true1"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/main_about_titleBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_fcfcfc"
android:background="@color/white"
app:titleText="@string/teamsetting_jubao"/>
<androidx.core.widget.NestedScrollView
android:id="@+id/step_1_lyf"
android:layout_marginTop="1dp"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -22,6 +24,7 @@
android:id="@+id/step_1_ly"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="visible">
@@ -95,7 +98,7 @@
android:layout_gravity="center_vertical"
android:layout_height="@dimen/dp_42">
<com.hbl.lewan.widget.CircleImageView
<com.hbl.yuliao.widget.CircleImageView
android:id="@+id/big_iv"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
@@ -134,15 +137,13 @@
android:background="@color/white"
android:visibility="gone" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="#F6F5F7"
android:visibility="visible" />
<TextView
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_20"
android:text="@string/report_reason_txt"
@@ -151,6 +152,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recylerview"
android:background="@color/white"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -158,6 +160,7 @@
android:layout_width="match_parent"
android:layout_height="44dp"
android:gravity="center_vertical"
android:background="@color/white"
android:paddingLeft="@dimen/dp_20"
android:text="@string/report_sau_remarks_txt"
android:textColor="#303336"
@@ -165,6 +168,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="@dimen/dp_120">
<EditText
@@ -173,7 +177,8 @@
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/input_bg_t"
android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
android:gravity="top"
android:hint="@string/report_edit_hint_txt"
android:maxLength="100"
@@ -181,8 +186,8 @@
android:paddingLeft="@dimen/dp_23"
android:paddingRight="@dimen/dp_18"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_adb5bd"
android:textSize="@dimen/sp_14" />
android:textColorHint="#BCBCBC"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/number_tv"
@@ -191,10 +196,10 @@
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="30dp"
android:layout_marginBottom="10dp"
android:layout_marginBottom="20dp"
android:text="0/100"
android:textColor="#ffadb5bd"
android:textSize="10sp" />
android:textColor="#BCBCBC"
android:textSize="12sp" />
</RelativeLayout>
<TextView
@@ -203,25 +208,28 @@
android:layout_height="44dp"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_20"
android:background="@color/white"
android:text="@string/tupianzhengming_txt"
android:textColor="#303336"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:paddingStart="@dimen/dp_20"
android:background="@color/white"
android:text="@string/report_pic_des_txt"
android:textColor="#ffadb5bd"
android:textColor="#7E7E7E"
android:textSize="12sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recylerview1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="13dp"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginRight="13dp" />
android:paddingStart="13dp"
android:background="@color/white"
android:paddingTop="@dimen/dp_5"
android:paddingEnd="13dp" />
<TextView
@@ -232,7 +240,7 @@
android:layout_marginRight="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_34"
android:background="@drawable/index_user_bg3"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:text="@string/sumbit_txt"
android:textColor="#ffffffff"

24
app/src/main/res/layout/scankit_layout.xml
View File

@@ -11,27 +11,5 @@
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="@dimen/dp_240"
android:gravity="center"
android:clickable="true"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:onClick="showQrcode"
android:id="@+id/layout_hide"
android:background="@drawable/saoma_btn1"
android:layout_height="@dimen/dp_40">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wdewm_txt"
android:gravity="center_vertical"
android:drawablePadding="@dimen/dp_5"
android:drawableLeft="@mipmap/saoma_img"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
/>
</LinearLayout>
</FrameLayout>

2
app/src/main/res/layout/scankit_zxl_capture.xml
View File

@@ -146,5 +146,5 @@
/>
</LinearLayout>
</FrameLayout>

119
app/src/main/res/layout/scankit_zxl_capture_new.xml
View File

@@ -17,6 +17,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false">
<FrameLayout
android:id="@+id/layout"
android:layout_width="match_parent"
@@ -35,17 +36,20 @@
android:layout_height="match_parent"
android:textAllCaps="false"
my_view:scankit_line_anim="false" />
<LinearLayout
android:id="@+id/scanLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:id="@+id/scankit_title_frame"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
android:layout_weight="2">
android:layout_weight="2"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/scan_title"
android:layout_width="match_parent"
@@ -74,9 +78,16 @@
android:src="@mipmap/user_colose_img" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="扫一扫"
android:textColor="#ffffffff"
android:textSize="18sp" />
</RelativeLayout>
</FrameLayout>
<ImageView
android:id="@+id/ivScan"
android:layout_width="match_parent"
@@ -98,8 +109,8 @@
android:id="@+id/flash_light_ll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="invisible">
<ImageView
android:id="@+id/ivFlash"
@@ -117,8 +128,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center"
android:fontFamily="sans-serif"
android:gravity="center"
android:shadowColor="#4d000000"
android:shadowRadius="4.0"
android:text="@string/scankit_light"
@@ -130,80 +141,98 @@
</LinearLayout>
</FrameLayout>
</LinearLayout>
<include layout="@layout/scankit_title_landscape" />
<LinearLayout
android:id="@+id/scan_title_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:layout_centerHorizontal="true"
android:layout_marginStart="24dp"
android:layout_marginTop="80dp"
android:layout_marginEnd="24dp"
android:orientation="vertical">
<TextView
android:id="@+id/title_scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:fontFamily="sans-serif-medium"
android:gravity="center_horizontal"
android:shadowColor="#4d000000"
android:shadowRadius="4.0"
android:visibility="invisible"
android:text="@string/scankit_title_all"
android:textAllCaps="false"
android:textColor="#FFFFFF"
android:textSize="18sp"
android:gravity="center_horizontal"
android:layout_gravity="center" />
android:visibility="invisible" />
<TextView
android:id="@+id/title_scan_level_two"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:gravity="center_horizontal"
android:shadowColor="#4d000000"
android:shadowRadius="4.0"
android:visibility="invisible"
android:text="@string/scankit_title_all_level_two"
android:textAllCaps="false"
android:textColor="#99ffffff"
android:textSize="14sp"
android:textStyle="normal"
android:gravity="center_horizontal"
android:layout_marginTop="8dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" />
android:visibility="invisible" />
</LinearLayout>
<LinearLayout
android:id="@+id/bot_ly"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_200"
android:layout_gravity="bottom|right"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:id="@+id/bot_ly"
android:layout_alignParentBottom="true"
android:background="@color/white">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="@dimen/dp_60"
android:text="@string/saoyisao_tips_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
/>
android:layout_gravity="bottom|right"
android:background="@color/white"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20">
<LinearLayout
android:id="@+id/layout_hide"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_30"
android:clickable="true"
android:gravity="center"
android:onClick="showQrcode"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@mipmap/saoma_img"
android:drawablePadding="@dimen/dp_5"
android:drawableTint="@color/color_2c2c2c"
android:gravity="center_vertical"
android:text="@string/wdewm_txt"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/sp_16" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/gallery_Layout"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_marginEnd="12dp"
android:layout_alignParentBottom="true"
android:layout_marginTop="4dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="@dimen/dp_240"
android:background="@drawable/scankit_appbar_pressed_selected">
@@ -219,4 +248,32 @@
android:src="@drawable/scankit_ic_photo" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="@dimen/dp_250"
android:gravity="center"
android:text="请将镜头对准需要识别的二维码"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<LinearLayout
android:id="@+id/qr_ryt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#EEF0F7"
android:visibility="gone"
android:orientation="vertical">
<com.hbl.yuliao.widget.StatusLayout
android:background="@color/white"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<FrameLayout
android:id="@+id/qr_ry"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
</RelativeLayout>

113
app/src/main/res/layout/sumbit_usdt_activity.xml Normal file
View File

@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#EEF0F7"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/main_about_titleBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
app:titleText="上传凭证" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_15"
android:text="充值金额"
android:textColor="#ff2c2c2c"
android:textSize="16sp" />
<TextView
android:id="@+id/number_tv"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:textColor="#ff2c2c2c"
android:textSize="36sp"
android:textStyle="bold" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="15dp"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="#EEF0F4" />
<TextView
android:id="@+id/tupianzhenming_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_15"
android:text="上传充值截图（0/5）"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recylerview1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginBottom="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="15dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:orientation="vertical"
android:background="@color/white">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_15"
android:text="交易Hash"
android:textColor="@color/color_2c2c2c"
android:textSize="16sp" />
<EditText
android:layout_width="match_parent"
android:layout_height="@dimen/dp_74"
android:maxLines="200"
android:id="@+id/beizhu_et"
android:hint="请输入交易Hash"
android:textSize="@dimen/sp_16"
android:padding="@dimen/dp_10"
android:gravity="top"
android:textColorHint="#BCBCBC"
android:textColor="@color/color_2c2c2c"
android:layout_margin="@dimen/dp_15"
android:background="@drawable/cornor_stroke_thempink_gray"
/>
</LinearLayout>
<TextView
android:id="@+id/tijiao_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_52"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_34"
android:background="@drawable/cornor_thempink_12dp"
android:gravity="center"
android:text="提交充值申请"
android:textColor="#ffffffff"
android:textSize="16sp" />
</LinearLayout>

2
app/src/main/res/mipmap-anydpi-v26/ic_launche.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/transparent"/>
<background android:drawable="@color/ic_launche_background"/>
<foreground android:drawable="@mipmap/ic_launche_foreground"/>
</adaptive-icon>

2
app/src/main/res/mipmap-anydpi-v26/ic_launche_round.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/transparent"/>
<background android:drawable="@color/ic_launche_background"/>
<foreground android:drawable="@mipmap/ic_launche_foreground"/>
</adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launche.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launche_foreground.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launche_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launche.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launche_foreground.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launche_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_chat_scan.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 709 B

BIN
app/src/main/res/mipmap-xhdpi/ic_launche.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launche_foreground.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launche_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/add_bank_iii.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/app_icon_switch.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 815 B

BIN
app/src/main/res/mipmap-xxhdpi/b_kefu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/chat_bg_index.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 221 KiB

BIN
app/src/main/res/mipmap-xxhdpi/chat_img_f.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/chat_img_t.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/czjl_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/default_head_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/src/main/res/mipmap-xxhdpi/goumaifuhao.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/guanduan_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/hb_tp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 259 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
app/src/main/res/mipmap-xxhdpi/hbkz_red_img1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/mipmap-xxhdpi/home_yellow_line_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 239 B

BIN
app/src/main/res/mipmap-xxhdpi/honebao_left_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/mipmap-xxhdpi/hongbao.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_addfriend_apply.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_addfriend_group.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_addfriend_opentxl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_addfriend_qrcode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_addfriend_saoyisao.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_addfriend_search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_chat_scan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_chat_search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_chat_search1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_chat_titleannouncement.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_frame_mine_right_arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 667 B

BIN
app/src/main/res/mipmap-xxhdpi/ic_indexfm_addfriend.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_indexfm_addgroup.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launch.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 88 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launche.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launche1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 MiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launche_foreground.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launche_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_exit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_invited.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_link.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_members.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_message.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 693 B

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_notifyclose.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_notifyopen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_photo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_pingbi_close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_pingbi_open.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_set.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_set1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 878 B

BIN
app/src/main/res/mipmap-xxhdpi/ic_setting_set2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_topup_cashbg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 207 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_welcome_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 376 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_dangqian_left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_friend_quanxian.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_safa.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_tongzhi.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/index_user_bg1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 KiB

BIN
app/src/main/res/mipmap-xxhdpi/jietong_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/jinyan_red_img1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/kaiqimaikefeng.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/kaiqiyangshengqi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/mingxi.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/nan_img_f.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/nan_img_t.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/no_bank_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 44 KiB

BIN
app/src/main/res/mipmap-xxhdpi/nv_img_f.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/nv_img_t.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/push_add_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/qianbao_top_float_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 286 KiB

After

Width:  |  Height:  |  Size: 162 KiB

BIN
app/src/main/res/mipmap-xxhdpi/qr_code_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xxhdpi/tab_add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/tab_add1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/tab_bianji.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
app/src/main/res/mipmap-xxhdpi/tab_chuangjian.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/mipmap-xxhdpi/tab_dot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/tab_message.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/tab_tianjia.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/tab_tongxunlu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/tab_tonzhi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/txjl_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/usdt.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/user_blue_edit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/video__call_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/voice_call_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/voom_img_f.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/voom_img_t.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/wallet_pay_setting_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/weiling_rd_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/weiling_rd_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xxhdpi/weixin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/wo_f.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/wo_t.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanxiang_t.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/yangshengqi_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/yinhangqiahao.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/zhifubao.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_chat_scan.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 536 B

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launche.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launche_foreground.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launche_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_welcome_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 MiB

13
app/src/main/res/values/colors.xml
View File

@@ -7,15 +7,15 @@
<resources>
<color name="black">#FF000000</color>
<color name="color_titlebar">#FFFBFB</color>
<color name="color_themeblue">#6D80FF</color>
<color name="color_themepink">#FE6881</color>
<color name="color_themeblue">#498AFA</color>
<color name="color_themepink">#498AFA</color>
<color name="color_themeblue_alpha70">#4d6D80FF</color> <!--透明度70-->
<color name="color_lineddd">#DDDDDD</color>
<color name="colorWhite">#FFFFFF</color>
<color name="white">#FFFFFF</color>
<color name="color_white">#FFFFFFFF</color>
<color name="color_333333">#ff333333</color>
<color name="color_80333333">#80333333</color>
<color name="color_333333">#2C2C2C</color>
<color name="color_80333333">#802C2C2C</color>
<color name="color_898989">#898989</color>
<color name="color_fe6881">#FE6881</color>
<color name="color_fee8bf">#FEE8BF</color>
@@ -25,6 +25,9 @@
<color name="color_383838">#383838</color>
<color name="color_ffe29e">#FFE29E</color>
<color name="color_f6f5f7">#F6F5F7</color>
<color name="color_babeca">#BABECA</color>
<color name="color_2c2c2c">#2C2C2C</color>
<color name="color_eefof7">#EEF0F7</color>
<!-- nim -->
<color name="color_blue_3a9efb">#3a9efb</color>
@@ -75,7 +78,7 @@
<color name="color_adb5bd">#ADB5BD</color>
<color name="color_ffc20f">#ffc20f</color>
<color name="color_537ff4">#000000</color>
<color name="color_cf924f">#CF924F</color>
<color name="color_cf924f">#F2AA00</color>
<color name="color_fffbfb">#FFFBFB</color>
<color name="color_eee9e9">#EEE9E9</color>
<color name="color_4e3025">#4E3025</color>

4
app/src/main/res/values/ic_launche_background.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launche_background">#3595FA</color>
</resources>

141
app/src/main/res/values/strings.xml
View File

@@ -7,7 +7,7 @@
<resources>
<string name="google_map_key">AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8</string>
<string name="app_name">乐玩</string>
<string name="app_name">遇聊</string>
<string name="yunxin_name">网易云信</string>
<string name="yunxin_desc">真正稳定的IM 云服务</string>
@@ -43,7 +43,7 @@
<string name="mine_collect">收藏</string>
<string name="mine_about">关于乐玩</string>
<string name="mine_about">关于遇聊</string>
<string name="mine_setting">设置</string>
<string name="mine_version">版本号</string>
<string name="mine_product">产品介绍</string>
@@ -97,7 +97,7 @@
<string name="common_skin">通用皮肤</string>
<string name="shouye_txt">首页</string>
<string name="chat_txt">聊天</string>
<string name="voom_txt">短影音</string>
<string name="voom_txt">商城</string>
<string name="wallet_txt">钱包</string>
<string name="usercenter_txt">个人中心</string>
<string name="login_txt">登录</string>
@@ -105,7 +105,7 @@
<string name="dengru_txt">登入</string>
<string name="mobile_login_txt">手机号登入</string>
<string name="wechat_login_txt">微信登入</string>
<string name="denglujitongyi_txt">输入您的手机号并点击箭头按钮，即表示您同意乐玩的</string>
<string name="denglujitongyi_txt">输入您的手机号并点击箭头按钮，即表示您同意遇聊的</string>
<string name="fuwuxieyi_txt">服务协议</string>
<string name="yiji_txt">及</string>
<string name="yinsizhengche_txt">隐私政策</string>
@@ -119,8 +119,8 @@
<string name="setpwd_hint_txt">请设置不少于8位密码，且必须同时包含字母和数字</string>
<string name="qhwyzmdl_txt">切换为验证码登录</string>
<string name="qsryzm_txt">请输入验证码</string>
<string name="djfsyzm_txt"><![CDATA[点击[发送验证码]将验证码发送至：<font color = \'#D7006F\'>%s</font>]]></string>
<string name="djfsyzm_txt1"><![CDATA[验证码已通过短信发送至：<font color = \'#D7006F\'>%s</font>]]></string>
<string name="djfsyzm_txt"><![CDATA[点击[发送验证码]将验证码发送至：<font color = \'#498AFA\'>%s</font>]]></string>
<string name="djfsyzm_txt1"><![CDATA[验证码已通过短信发送至：<font color = \'#498AFA\'>%s</font>]]></string>
<string name="qhwmmdl_txt">切换为密码登录</string>
<string name="yzmyfs_txt">验证码已发送</string>
@@ -145,7 +145,7 @@
<string name="now_open_loc_txt">立即开启</string>
<string name="push_say_hint_txt">一起分享新鲜事~</string>
<string name="all_visible_txt">全部可见</string>
<string name="all_visible_des_txt">所有乐玩用戶均可见</string>
<string name="all_visible_des_txt">所有遇聊用戶均可见</string>
<string name="friend_visible_txt">仅好友可见</string>
<string name="friend_visible_des_txt">只有双向好友可查看</string>
<string name="onlyme_visible_txt">仅自己可见</string>
@@ -160,7 +160,7 @@
<string name="group_text">群组</string>
<string name="groupchat_text">群聊</string>
<string name="taball_text">全部</string>
<string name="creategroup_text">建立群组</string>
<string name="creategroup_text">创建群组</string>
<string name="creategroup_hint_text">与好友们创建群组聊天室</string>
<string name="addfrineds_hint_text">快去添加好友吧</string>
<string name="allread_text">全部已读</string>
@@ -176,7 +176,7 @@
<string name="addfriend_opentxl_text">启用通讯录</string>
<string name="addfriend_opentxlhit_text">启用通讯录，快速找到好友</string>
<string name="addfriend_apply_text">好友申请列表</string>
<string name="addfriend_addgroup_text">建立群</string>
<string name="addfriend_addgroup_text">创建群</string>
<string name="addfriend_addgrouphit_text">和好友建立群</string>
<string name="addfriend_maybeknow_text">可能认识的人</string>
<string name="sjhswzcqxzc_txt">该手机号码尚未注册，请先注册！</string>
@@ -205,7 +205,7 @@
<string name="nodate_txt">暂无数据</string>
<string name="help_center_txt">帮助中心</string>
<string name="account_and_security_txt">账号与安全</string>
<string name="accout_s_txt">乐玩 ID</string>
<string name="accout_s_txt">遇聊 ID</string>
<string name="weishezhi_txt">未设置</string>
<string name="wechat_txt">微信</string>
<string name="phone_number_txt">手机号</string>
@@ -231,9 +231,9 @@
<string name="qrcode_generate_activity_qr_generate_fail">二维码生成失败！</string>
<string name="qrcode_share_succ_txt">二维码分享成功</string>
<string name="qrcode_scan_activity_not_invalid_qrcode">无效的2维码！</string>
<string name="lailiaozhanghao_txt">乐玩账号</string>
<string name="lailiaozhanghao_txt">遇聊账号</string>
<string name="shuaxinchenggong_txt">刷新成功</string>
<string name="mingzi_txt">名字</string>
<string name="mingzi_txt">昵称</string>
<string name="friendbeizhu_txt">设置好友备注名</string>
<string name="friendnick_txt">好友昵称：</string>
<string name="gexingqianming_txt">个性签名</string>
@@ -256,12 +256,12 @@
<string name="allow_search_id_txt">允许通过账号搜索到我</string>
<string name="allow_add_me_at_group_txt">允许通过群聊方式添加我</string>
<string name="black_list_txt">黑名单</string>
<string name="qszacc_txt">请设置乐玩账号</string>
<string name="qszacc1_txt">乐玩账户ID支持英文、数字、下划线</string>
<string name="qszacc_hint_txt">请输入乐玩账户</string>
<string name="qszacc_txt">请设置遇聊账号</string>
<string name="qszacc1_txt">遇聊账号支持5-15位，英文、数字、下划线</string>
<string name="qszacc_hint_txt">请输入遇聊账户</string>
<string name="meiyuegaiyici_txt">每月只可修改一次，请谨慎修改！</string>
<string name="zsvbxg_txt">您暂时不能修改MMID</string>
<string name="zsbnxg1_txt">MMID一个月只可修改一次，您将于%s年%s月%s日才可修改！</string>
<string name="zsvbxg_txt">您暂时不能修改遇聊ID</string>
<string name="zsbnxg1_txt">遇聊ID一个月只可修改一次，您将于%s年%s月%s日才可修改！</string>
<string name="yhzlxgcg_txt">用户信息修改成功！</string>
<string name="general_got_it">知道了</string>
<string name="qxbdsjh_txt">请先绑定手机号</string>
@@ -318,7 +318,7 @@
<string name="qrcode_scan_activity_not_surpport_qrcontent">不支持的2维码内容！</string>
<string name="shouquandenglu_txt">授权登录</string>
<string name="tltdbj_txt">淘乐町门店设备登录</string>
<string name="seqs_dl_txt">申请使用您的乐玩账号登录</string>
<string name="seqs_dl_txt">申请使用您的遇聊账号登录</string>
<string name="ndnc_txt">您的头像、昵称将会授权其使用</string>
<string name="yunxu_txt">允许</string>
<string name="jujue_txt">拒绝</string>
@@ -920,4 +920,109 @@
<string name="jiechujinyan_txt">解除禁言</string>
<string name="app_channel_name">频&#8194;道&#8194;号</string>
<string name="app_role">角&#12288;&#12288;色</string>
<string name="app_input_channel">输入直播频道名</string>
<string name="app_input_title_local_uid">当前的用户id</string>
<string name="app_input_local_uid">输入当前的用uid</string>
<string name="app_role_broadcaster">主播</string>
<string name="app_role_audience">观众</string>
<string name="app_join_channel">加入频道</string>
<string name="app_debugging">Debug页面</string>
<string name="app_debugging_title">开发者模式设置</string>
<string name="app_debug_encode_dimensions">编码分辨率</string>
<string name="app_debug_encode_frame_rate">编码帧率</string>
<string name="app_debug_encode_bitrate">码率</string>
<string name="app_debug_x">x</string>
<string name="app_debug_frame_rate">fps</string>
<string name="app_debug_bitrate">kbps</string>
<string name="app_confirm">确认</string>
<string name="app_pk_channel">对端频道</string>
<string name="app_update_pk_channel">更新对端频道号</string>
<string name="app_quit_channel">退出</string>
<string name="app_statistic">实时数据</string>
<string name="app_statistic_dimensions">编码分辨率: %s</string>
<string name="app_statistic_frame_rate">编码帧率: %s fps</string>
<string name="app_statistic_bitrate">编码码率: %s Kbps</string>
<string name="app_pk_channels">对端频道：%s</string>
<string name="app_local_uid">UID：%s</string>
<string name="app_main_channel_empty">加入的频道不能为空</string>
<!-- Radio Buttons -->
<string name="radio_rtm_show_1v1">RTM秀转场1V1</string>
<string name="radio_rtm_pure_1v1">RTM纯1V1</string>
<string name="radio_easemob_show_1v1">环信秀转场1V1</string>
<string name="radio_easemob_pure_1v1">环信纯1V1</string>
<!-- Input Fields -->
<string name="input_broadcaster_id">主播id</string>
<string name="input_broadcaster_id_hint">输入主播id</string>
<!-- Checkboxes -->
<string name="checkbox_auto_accept">收到呼叫自动接受</string>
<string name="checkbox_first_frame">音视频首帧与接通相关</string>
<string name="checkbox_join_rtc">提前加入RTC频道</string>
<!-- Toast Messages -->
<string name="toast_no_im_app_key">未配置IM_APP_KEY</string>
<string name="toast_user_id_empty">用户id不能为空</string>
<string name="toast_local_user_id_number">本地用户的id需要是纯数字</string>
<string name="toast_both_user_id_number">本地和远端用户的id需要是纯数字</string>
<string name="toast_get_token_failed">get token failed</string>
<!-- Button Text -->
<string name="btn_create_show_to_1v1">创建秀场转1v1</string>
<string name="btn_join_show_to_1v1">加入秀场转1v1</string>
<string name="btn_enter_pure_1v1">进入纯1v1</string>
<!-- Channel -->
<string name="app_current_channel">当前频道: %s</string>
<string name="label_current_user_id">当前用户id：%1$s</string>
<!-- Call Type Dialog -->
<string name="call_type_dialog_title">通话类型选择</string>
<string name="call_type_dialog_message">选择音频或视频通话</string>
<string name="call_type_audio">音频</string>
<string name="call_type_video">视频</string>
<!-- Alert Dialog -->
<string name="alert_title">提示</string>
<string name="alert_calling_user">呼叫用户 %d 中</string>
<string name="alert_cancel">取消</string>
<string name="alert_incoming_call">用户 %1$d 邀请您1对1通话</string>
<string name="alert_accept">同意</string>
<string name="alert_reject">拒绝</string>
<!-- Toast Messages -->
<string name="toast_no_permission">没给权限😯</string>
<string name="toast_call_api_initializing">CallAPi初始化中</string>
<string name="toast_no_target_user">无目标用户</string>
<string name="toast_rtm_connected">rtm已连接</string>
<string name="toast_rtm_disconnected">rtm已断开</string>
<string name="toast_easemob_connected">环信已连接</string>
<string name="toast_easemob_disconnected">环信已断开</string>
<string name="toast_rtm_not_logged_in">rtm未登录或连接异常</string>
<string name="toast_easemob_not_logged_in">环信未登录或连接异常</string>
<string name="toast_call_started">通话开始%s</string>
<string name="toast_call_ended">通话结束</string>
<string name="toast_call_rejected">通话被拒绝</string>
<string name="toast_no_answer">无应答</string>
<string name="toast_user_busy">用户正忙</string>
<!-- Call Status -->
<string name="call_status_start">通话开始,\nRTC 频道号: %1$s,\n主叫用户id: %2$d,\n当前用户id: %3$d,\n开始时间戳: %4$d ms</string>
<string name="call_status_end">通话结束,\nRTC 频道号: %1$s,\n挂断用户id: %2$d,\n当前用户id: %3$d,\n结束时间戳: %4$d ms，\n通话时长: %5$d ms</string>
<!-- Pure 1v1 Activity -->
<string name="pure_1v1_target_uid">目标用户uid</string>
<string name="pure_1v1_target_uid_hint">输入目标用户uid</string>
<string name="pure_1v1_current_uid">当前用户id</string>
<string name="pure_1v1_invite">邀请</string>
<string name="pure_1v1_hangup">挂断</string>
<string name="pure_1v1_video_on">开启视频</string>
<string name="pure_1v1_video_off">关闭视频</string>
<string name="pure_1v1_audio_on">开启音频</string>
<string name="pure_1v1_audio_off">关闭音频</string>
</resources>

45
app/src/main/res/values/styles.xml
View File

@@ -77,6 +77,18 @@
<item name="android:drawableRight">@null</item>
</style>
<style name="settings_item_bg_group_top_2019_new" parent="@style/ButtonBase">
<item name="android:layout_height">@dimen/dp_62</item>
<item name="android:layout_width">match_parent</item>
<item name="android:background">@color/white</item>
<item name="android:drawablePadding">10.0dip</item>
<item name="android:paddingRight">15dp</item>
<item name="android:paddingLeft">15dp</item>
<item name="android:gravity">left|center</item>
<item name="android:textColor">@color/color_2c2c2c</item>
<item name="android:textSize">@dimen/sp_16</item>
<item name="android:drawableRight">@null</item>
</style>
<style name="login_edit_text_style">
<item name="android:layout_height">52dp</item>
<item name="android:layout_width">match_parent</item>
@@ -87,7 +99,7 @@
</style>
<style name="settings_item_bg_group_full_2019" parent="@style/ButtonBase">
<item name="android:layout_height">@dimen/dp_54</item>
<item name="android:layout_height">@dimen/dp_62</item>
<item name="android:layout_width">match_parent</item>
<item name="android:background">@color/white</item>
<item name="android:drawablePadding">10.0dip</item>
@@ -100,7 +112,7 @@
</style>
<style name="settings_item_bg_group_full_20191" parent="@style/ButtonBase">
<item name="android:layout_height">@dimen/dp_54</item>
<item name="android:layout_height">@dimen/dp_62</item>
<item name="android:layout_width">match_parent</item>
<item name="android:background">@color/transparent</item>
<item name="android:drawablePadding">10.0dip</item>
@@ -121,7 +133,22 @@
<item name="android:textSize">@dimen/sp_12</item>
<item name="android:padding">0dp</item>
</style>
<style name="AppThemeLogin" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowTranslucentStatus">false</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="colorAccent">@color/black</item>
<item name="windowActionBar">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowDisablePreview">true</item>
<!-- 隐藏Activity窗口的Title标题栏 -->
<item name="windowNoTitle">true</item>
<item name="android:windowBackground">@color/white</item>
<item name="background">@color/white</item>
</style>
<style name="SampleTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">false</item>
@@ -137,7 +164,21 @@
<item name="colorAccent">@color/black</item>
<item name="android:windowBackground">@mipmap/ic_welcome_bg</item>
</style>
<style name="SampleTheme_new" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
<!-- 标题栏颜色 -->
<item name="colorPrimary">@color/white</item>
<!-- 状态栏颜色 -->
<item name="colorPrimaryDark">@color/white</item>
<!-- 标题栏文字颜色 -->
<item name="colorAccent">@color/black</item>
<item name="android:windowBackground">@color/white</item>
</style>
<style name="SampleTheme1" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="android:statusBarColor">@android:color/transparent</item>

10
app/src/main/res/values/themes.xml
View File

@@ -94,6 +94,16 @@
<item name="bottomSheetStyle">@style/bottomSheetStyleWrapper</item>
<item name="android:navigationBarColor">@color/color_white</item>
</style>
<style name="CustomBottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
<item name="android:background">@android:color/transparent</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowSoftInputMode">adjustResize</item>
<item name="android:windowFullscreen">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="bottomSheetStyleWrapper" parent="Widget.Design.BottomSheet.Modal">
<item name="android:background">@android:color/transparent</item>
</style>