diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cc2ec86..3d949dc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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") diff --git a/app/google-services.json b/app/google-services.json index e8ab899..48f7fa5 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -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" } }, diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 4e5b3b6..aa6404e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -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 ();} -ignorewarnings +-keep class io.agora.**{*;} +-dontwarn io.agora.** diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 6f40594..4cb9a33 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -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" } ], diff --git a/app/release/lewan_216.apk b/app/release/yuliao.apk similarity index 91% rename from app/release/lewan_216.apk rename to app/release/yuliao.apk index 6fa107b..15590f8 100644 Binary files a/app/release/lewan_216.apk and b/app/release/yuliao.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 324c0e6..49af297 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:installLocation="auto"> - + @@ -13,12 +13,12 @@ android:required="false" /> - - + + @@ -28,9 +28,9 @@ - + - + - + @@ -96,7 +96,16 @@ tools:ignore="UniquePermission" /> - + + + + + + + + + + @@ -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"> @@ -462,6 +472,11 @@ android:name=".imkit.team.TeamSettingActivity" android:exported="true" 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"> @@ -852,12 +869,12 @@ @@ -1062,7 +1079,7 @@ - + @@ -1080,6 +1097,12 @@ android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" /> + + + + + + \ No newline at end of file diff --git a/app/src/main/ic_launche-playstore.png b/app/src/main/ic_launche-playstore.png index 07007b5..71ea586 100644 Binary files a/app/src/main/ic_launche-playstore.png and b/app/src/main/ic_launche-playstore.png differ diff --git a/app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java b/app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java deleted file mode 100644 index 9f73d68..0000000 --- a/app/src/main/java/com/hbl/lewan/main/CustomCallOrderHelper.java +++ /dev/null @@ -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 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); -// } -// } -//} diff --git a/app/src/main/java/com/hbl/lewan/main/index/Index2Fragment.java b/app/src/main/java/com/hbl/lewan/main/index/Index2Fragment.java deleted file mode 100644 index 86f8af5..0000000 --- a/app/src/main/java/com/hbl/lewan/main/index/Index2Fragment.java +++ /dev/null @@ -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 usersExistBeans = new ArrayList<>(); - List usersExistBeansShouQi = new ArrayList<>(); - boolean isFollowShouQi = true; - - public androidx.lifecycle.Observer>> contactFriendObserver; //联系人变更 - public androidx.lifecycle.Observer>> contactGroupObserver; //群组 - public androidx.lifecycle.Observer>> conversationObserver; //获取会话 - public androidx.lifecycle.Observer>> changeConversationObserver; //会话变更 - private Observer>> verifyObserver; - private com.netease.nimlib.sdk.Observer> 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 = - new EventNotify() { - @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 stringUpdateEvent = - new EventNotify() { - @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 = - new EventNotify() { - @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() { - @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 = 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 list) { - friendContactAdapter.setData(list,0); - } - - public void addFriendContactData(List list) { - friendContactAdapter.addFriendDataList(list); - } - - public void removeFriendContactData(List list) { - friendContactAdapter.removeDataList(list); - } - - public void updateFriendContactData(List 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 list) { - teamContactAdapter.setData(list,1); - } - - public void addTeamContactData(List list) { - teamContactAdapter.addTeamDataList(list); - } - - public void removeTeamContactData(List list) { - teamContactAdapter.removeDataList(list); - } - - public void updateTeamContactData(Team team) { - List 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 list) { - for (ConversationBean conversationBean : list) { - if (conversationBean.infoData.getFriendInfo() != null) { - friendContactAdapter.updateFriendDataContentItem(conversationBean.infoData); - } - if (conversationBean.infoData.getTeamInfo() != null) { - teamContactAdapter.updateTeamDataContentItem(conversationBean.infoData); - } - } - } - - List listFollow = new ArrayList<>(); - - //更新特别关注的会话记录 - public void updateConversation(List 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 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() { - @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> 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); - - } -} diff --git a/app/src/main/java/com/hbl/lewan/AppSkinConfig.java b/app/src/main/java/com/hbl/yuliao/AppSkinConfig.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/AppSkinConfig.java rename to app/src/main/java/com/hbl/yuliao/AppSkinConfig.java index a62618e..ae83fe5 100644 --- a/app/src/main/java/com/hbl/lewan/AppSkinConfig.java +++ b/app/src/main/java/com/hbl/yuliao/AppSkinConfig.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/CustomConfig.java b/app/src/main/java/com/hbl/yuliao/CustomConfig.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/CustomConfig.java rename to app/src/main/java/com/hbl/yuliao/CustomConfig.java index a466164..0560c0a 100644 --- a/app/src/main/java/com/hbl/lewan/CustomConfig.java +++ b/app/src/main/java/com/hbl/yuliao/CustomConfig.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/IMApplication.java b/app/src/main/java/com/hbl/yuliao/IMApplication.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/IMApplication.java rename to app/src/main/java/com/hbl/yuliao/IMApplication.java index 91f0df6..6bb4214 100644 --- a/app/src/main/java/com/hbl/lewan/IMApplication.java +++ b/app/src/main/java/com/hbl/yuliao/IMApplication.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java b/app/src/main/java/com/hbl/yuliao/IMUIKitConfig.java similarity index 73% rename from app/src/main/java/com/hbl/lewan/IMUIKitConfig.java rename to app/src/main/java/com/hbl/yuliao/IMUIKitConfig.java index 71548d9..1a3f706 100644 --- a/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java +++ b/app/src/main/java/com/hbl/yuliao/IMUIKitConfig.java @@ -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=" ; diff --git a/app/src/main/java/com/hbl/lewan/NimSDKOptionConfig.java b/app/src/main/java/com/hbl/yuliao/NimSDKOptionConfig.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/NimSDKOptionConfig.java rename to app/src/main/java/com/hbl/yuliao/NimSDKOptionConfig.java index 271f7c4..b7b8b7c 100644 --- a/app/src/main/java/com/hbl/lewan/NimSDKOptionConfig.java +++ b/app/src/main/java/com/hbl/yuliao/NimSDKOptionConfig.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/NotificationMsgService.java b/app/src/main/java/com/hbl/yuliao/NotificationMsgService.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/NotificationMsgService.java rename to app/src/main/java/com/hbl/yuliao/NotificationMsgService.java index bc9c8a4..0631411 100644 --- a/app/src/main/java/com/hbl/lewan/NotificationMsgService.java +++ b/app/src/main/java/com/hbl/yuliao/NotificationMsgService.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/about/AboutActivity.java b/app/src/main/java/com/hbl/yuliao/about/AboutActivity.java similarity index 88% rename from app/src/main/java/com/hbl/lewan/about/AboutActivity.java rename to app/src/main/java/com/hbl/yuliao/about/AboutActivity.java index 373fd60..7d7559a 100644 --- a/app/src/main/java/com/hbl/lewan/about/AboutActivity.java +++ b/app/src/main/java/com/hbl/yuliao/about/AboutActivity.java @@ -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 { diff --git a/app/src/main/java/com/hbl/lewan/adapter/CommonAdapter.java b/app/src/main/java/com/hbl/yuliao/adapter/CommonAdapter.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/adapter/CommonAdapter.java rename to app/src/main/java/com/hbl/yuliao/adapter/CommonAdapter.java index d8857b7..b9e72b8 100644 --- a/app/src/main/java/com/hbl/lewan/adapter/CommonAdapter.java +++ b/app/src/main/java/com/hbl/yuliao/adapter/CommonAdapter.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/adapter/CommunityAdapter.java b/app/src/main/java/com/hbl/yuliao/adapter/CommunityAdapter.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/adapter/CommunityAdapter.java rename to app/src/main/java/com/hbl/yuliao/adapter/CommunityAdapter.java index 202f326..b833706 100644 --- a/app/src/main/java/com/hbl/lewan/adapter/CommunityAdapter.java +++ b/app/src/main/java/com/hbl/yuliao/adapter/CommunityAdapter.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.adapter; +package com.hbl.yuliao.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/hbl/lewan/adapter/ViewHolder.java b/app/src/main/java/com/hbl/yuliao/adapter/ViewHolder.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/adapter/ViewHolder.java rename to app/src/main/java/com/hbl/yuliao/adapter/ViewHolder.java index 679ef48..cf6d446 100644 --- a/app/src/main/java/com/hbl/lewan/adapter/ViewHolder.java +++ b/app/src/main/java/com/hbl/yuliao/adapter/ViewHolder.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.adapter; +package com.hbl.yuliao.adapter; import android.content.Context; import android.util.SparseArray; diff --git a/app/src/main/java/com/hbl/lewan/base/LllChatBaseActivity.java b/app/src/main/java/com/hbl/yuliao/base/LllChatBaseActivity.java similarity index 79% rename from app/src/main/java/com/hbl/lewan/base/LllChatBaseActivity.java rename to app/src/main/java/com/hbl/yuliao/base/LllChatBaseActivity.java index 02ffacc..5c71ad6 100644 --- a/app/src/main/java/com/hbl/lewan/base/LllChatBaseActivity.java +++ b/app/src/main/java/com/hbl/yuliao/base/LllChatBaseActivity.java @@ -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); } diff --git a/app/src/main/java/com/hbl/lewan/contact/ContactGroupSettingActivity.java b/app/src/main/java/com/hbl/yuliao/contact/ContactGroupSettingActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/contact/ContactGroupSettingActivity.java rename to app/src/main/java/com/hbl/yuliao/contact/ContactGroupSettingActivity.java index 6a74da5..c8a2c6d 100644 --- a/app/src/main/java/com/hbl/lewan/contact/ContactGroupSettingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/contact/ContactGroupSettingActivity.java @@ -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) { diff --git a/app/src/main/java/com/hbl/lewan/contact/FunBlackListActivity.java b/app/src/main/java/com/hbl/yuliao/contact/FunBlackListActivity.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/contact/FunBlackListActivity.java rename to app/src/main/java/com/hbl/yuliao/contact/FunBlackListActivity.java index 9648027..de2d9db 100644 --- a/app/src/main/java/com/hbl/lewan/contact/FunBlackListActivity.java +++ b/app/src/main/java/com/hbl/yuliao/contact/FunBlackListActivity.java @@ -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); + } } diff --git a/app/src/main/java/com/hbl/lewan/contact/ReportActivity.java b/app/src/main/java/com/hbl/yuliao/contact/ReportActivity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/contact/ReportActivity.java rename to app/src/main/java/com/hbl/yuliao/contact/ReportActivity.java index acf4315..8b78089 100644 --- a/app/src/main/java/com/hbl/lewan/contact/ReportActivity.java +++ b/app/src/main/java/com/hbl/yuliao/contact/ReportActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/contact/UserInfoActivity.java b/app/src/main/java/com/hbl/yuliao/contact/UserInfoActivity.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/contact/UserInfoActivity.java rename to app/src/main/java/com/hbl/yuliao/contact/UserInfoActivity.java index ae74b1f..cd7edb1 100644 --- a/app/src/main/java/com/hbl/lewan/contact/UserInfoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/contact/UserInfoActivity.java @@ -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); } } diff --git a/app/src/main/java/com/hbl/lewan/custom/ChatStickerViewHolder.java b/app/src/main/java/com/hbl/yuliao/custom/ChatStickerViewHolder.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/custom/ChatStickerViewHolder.java rename to app/src/main/java/com/hbl/yuliao/custom/ChatStickerViewHolder.java index bc7d88f..8852f79 100644 --- a/app/src/main/java/com/hbl/lewan/custom/ChatStickerViewHolder.java +++ b/app/src/main/java/com/hbl/yuliao/custom/ChatStickerViewHolder.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew.java b/app/src/main/java/com/hbl/yuliao/custom/CustomDatePickerNew.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew.java rename to app/src/main/java/com/hbl/yuliao/custom/CustomDatePickerNew.java index ed88770..34029d2 100644 --- a/app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew.java +++ b/app/src/main/java/com/hbl/yuliao/custom/CustomDatePickerNew.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew1.java b/app/src/main/java/com/hbl/yuliao/custom/CustomDatePickerNew1.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew1.java rename to app/src/main/java/com/hbl/yuliao/custom/CustomDatePickerNew1.java index 066aef9..5da1211 100644 --- a/app/src/main/java/com/hbl/lewan/custom/CustomDatePickerNew1.java +++ b/app/src/main/java/com/hbl/yuliao/custom/CustomDatePickerNew1.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/custom/PasswordEditText.java b/app/src/main/java/com/hbl/yuliao/custom/PasswordEditText.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/custom/PasswordEditText.java rename to app/src/main/java/com/hbl/yuliao/custom/PasswordEditText.java index 8238184..47be78d 100644 --- a/app/src/main/java/com/hbl/lewan/custom/PasswordEditText.java +++ b/app/src/main/java/com/hbl/yuliao/custom/PasswordEditText.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/ActionConfirmDialog.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/ActionConfirmDialog.java index 6e4b40a..ae12c85 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/ActionConfirmDialog.java @@ -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; /** * 通用弹窗 diff --git a/app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog1.java b/app/src/main/java/com/hbl/yuliao/dialog/ActionConfirmDialog1.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog1.java rename to app/src/main/java/com/hbl/yuliao/dialog/ActionConfirmDialog1.java index ca6acdc..97f1dd8 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/ActionConfirmDialog1.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/ActionConfirmDialog1.java @@ -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; /** * 通用弹窗 diff --git a/app/src/main/java/com/hbl/lewan/dialog/ActionInputConfirmDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/ActionInputConfirmDialog.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/dialog/ActionInputConfirmDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/ActionInputConfirmDialog.java index 32873cd..c6302e8 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/ActionInputConfirmDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/ActionInputConfirmDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/MianMiDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/MianMiDialog.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/dialog/MianMiDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/MianMiDialog.java index 54dc883..67e6574 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/MianMiDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/MianMiDialog.java @@ -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; /** diff --git a/app/src/main/java/com/hbl/lewan/dialog/MianMiXieyiDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/MianMiXieyiDialog.java similarity index 90% rename from app/src/main/java/com/hbl/lewan/dialog/MianMiXieyiDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/MianMiXieyiDialog.java index 2149da3..0707c20 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/MianMiXieyiDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/MianMiXieyiDialog.java @@ -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; /** diff --git a/app/src/main/java/com/hbl/lewan/dialog/PayCashDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/PayCashDialog.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/dialog/PayCashDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/PayCashDialog.java index 04d765f..e87c4e4 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/PayCashDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/PayCashDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/PayCashFingerDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/PayCashFingerDialog.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/dialog/PayCashFingerDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/PayCashFingerDialog.java index ee9580a..5660c1a 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/PayCashFingerDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/PayCashFingerDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/PayDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/PayDialog.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/dialog/PayDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/PayDialog.java index 4ed21d7..e6fa008 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/PayDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/PayDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectBanksDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectBanksDialog.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/dialog/SelectBanksDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectBanksDialog.java index 6bd2651..d12bb6e 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectBanksDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectBanksDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectCountryDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectCountryDialog.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/dialog/SelectCountryDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectCountryDialog.java index 37d13d6..1a33a0f 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectCountryDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectCountryDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/yuliao/dialog/SelectHeadDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectHeadDialog.java new file mode 100644 index 0000000..9c9d01f --- /dev/null +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectHeadDialog.java @@ -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); + } + } + + +} diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectLanguageDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectLanguageDialog.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/dialog/SelectLanguageDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectLanguageDialog.java index da55327..0f00398 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectLanguageDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectLanguageDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectPayTypeDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectPayTypeDialog.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/dialog/SelectPayTypeDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectPayTypeDialog.java index b4a5564..ef9ae58 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectPayTypeDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectPayTypeDialog.java @@ -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 { diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectPhotoTypeDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectPhotoTypeDialog.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/dialog/SelectPhotoTypeDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectPhotoTypeDialog.java index 8d5fa3e..f9a486f 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectPhotoTypeDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectPhotoTypeDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectPhotosMoveDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectPhotosMoveDialog.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/dialog/SelectPhotosMoveDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectPhotosMoveDialog.java index 62b3ba5..d21fdad 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectPhotosMoveDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectPhotosMoveDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectPushTypeDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectPushTypeDialog.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/dialog/SelectPushTypeDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectPushTypeDialog.java index d13f9c2..1656cc0 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectPushTypeDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectPushTypeDialog.java @@ -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 { diff --git a/app/src/main/java/com/hbl/yuliao/dialog/SelectSettingPhotoDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectSettingPhotoDialog.java new file mode 100644 index 0000000..da27da1 --- /dev/null +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectSettingPhotoDialog.java @@ -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); + + } + + +} diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectSexDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectSexDialog.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/dialog/SelectSexDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectSexDialog.java index 07bd9fa..00150da 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectSexDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectSexDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/SelectTypeDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/SelectTypeDialog.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/dialog/SelectTypeDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/SelectTypeDialog.java index eeadb77..f3190d4 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/SelectTypeDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/SelectTypeDialog.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/dialog/VersionDialog.java b/app/src/main/java/com/hbl/yuliao/dialog/VersionDialog.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/dialog/VersionDialog.java rename to app/src/main/java/com/hbl/yuliao/dialog/VersionDialog.java index 8a59b7b..75e5fb5 100644 --- a/app/src/main/java/com/hbl/lewan/dialog/VersionDialog.java +++ b/app/src/main/java/com/hbl/yuliao/dialog/VersionDialog.java @@ -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; /** * 版本弹窗 diff --git a/app/src/main/java/com/hbl/lewan/event/ConversationEditEvent.java b/app/src/main/java/com/hbl/yuliao/event/ConversationEditEvent.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/event/ConversationEditEvent.java rename to app/src/main/java/com/hbl/yuliao/event/ConversationEditEvent.java index 745447e..4233689 100644 --- a/app/src/main/java/com/hbl/lewan/event/ConversationEditEvent.java +++ b/app/src/main/java/com/hbl/yuliao/event/ConversationEditEvent.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.event; +package com.hbl.yuliao.event; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/hbl/lewan/event/UserAlbumsUpdateEvent.java b/app/src/main/java/com/hbl/yuliao/event/UserAlbumsUpdateEvent.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/event/UserAlbumsUpdateEvent.java rename to app/src/main/java/com/hbl/yuliao/event/UserAlbumsUpdateEvent.java index c841a21..aa63abc 100644 --- a/app/src/main/java/com/hbl/lewan/event/UserAlbumsUpdateEvent.java +++ b/app/src/main/java/com/hbl/yuliao/event/UserAlbumsUpdateEvent.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.event; +package com.hbl.yuliao.event; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java b/app/src/main/java/com/hbl/yuliao/game/JsBridgeActivity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java rename to app/src/main/java/com/hbl/yuliao/game/JsBridgeActivity.java index 565af2d..7d576de 100644 --- a/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java +++ b/app/src/main/java/com/hbl/yuliao/game/JsBridgeActivity.java @@ -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); } } diff --git a/app/src/main/java/com/hbl/yuliao/game/ShopFragment.java b/app/src/main/java/com/hbl/yuliao/game/ShopFragment.java new file mode 100644 index 0000000..e6f2923 --- /dev/null +++ b/app/src/main/java/com/hbl/yuliao/game/ShopFragment.java @@ -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 mUploadCallbackForHighApi; + ActivityResultLauncher pickMultipleMedia; + private static final int REQUEST_CODE_FILE_CHOOSER = 1; + private ValueCallback 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 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>() { + @Override + public void onSuccess(Result 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 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 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>() { + @Override + public void onSuccess(Result feedbackResp) { +// LogUtils.i("回调获取到的数据：" + GsonUtils.beanToJSONString(feedbackResp)); + callBackFunction.onCallBack(GsonUtils.beanToJSONString(feedbackResp)); + } + + @Override + public void onError(int code, String msg) { + Map map1 = new HashMap<>(); + map1.put("code", code); + map1.put("error", msg); + callBackFunction.onCallBack(GsonUtils.beanToJSONString(map1)); + } + }); + } + + @Override + public void dimess() { + Map 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>() { + + @Override + public void onSuccess(Result 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>() { + + @Override + public void onSuccess(Result 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>() { + + @Override + public void onSuccess(Result feedbackResp) { + Map 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 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 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 uploadMsg, String acceptType) { + LogUtils.i("数据接口：openFileChooseracceptType"); + + openFilerChooser(uploadMsg); + } +// +// //For Android 4.1+ +// protected void openFileChooser(ValueCallback uploadMsg, String acceptType, String capture) { +// openFilerChooser(uploadMsg); +// } + + private void openFilerChooser(ValueCallback 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 permissionLauncher; + + private void requestCameraPermission(String permission) { + permissionLauncher.launch(new String[]{permission}); + } + +} diff --git a/app/src/main/java/com/hbl/lewan/imkit/add/FunAddFriendActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/add/FunAddFriendActivity.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/imkit/add/FunAddFriendActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/add/FunAddFriendActivity.java index a1efc32..bd48f47 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/add/FunAddFriendActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/add/FunAddFriendActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/base/BaseSettingOtherActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/base/BaseSettingOtherActivity.java similarity index 86% rename from app/src/main/java/com/hbl/lewan/imkit/base/BaseSettingOtherActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/base/BaseSettingOtherActivity.java index 1896af1..41938d2 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/base/BaseSettingOtherActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/base/BaseSettingOtherActivity.java @@ -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; /** diff --git a/app/src/main/java/com/hbl/lewan/imkit/base/fragment/SettingPhotoFragment.java b/app/src/main/java/com/hbl/yuliao/imkit/base/fragment/SettingPhotoFragment.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/imkit/base/fragment/SettingPhotoFragment.java rename to app/src/main/java/com/hbl/yuliao/imkit/base/fragment/SettingPhotoFragment.java index f9b855c..484eff2 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/base/fragment/SettingPhotoFragment.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/base/fragment/SettingPhotoFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/person/PersonOtherSettingActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/person/PersonOtherSettingActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/imkit/person/PersonOtherSettingActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/person/PersonOtherSettingActivity.java index 0fe1570..a895609 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/person/PersonOtherSettingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/person/PersonOtherSettingActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/person/PersonSettingActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/person/PersonSettingActivity.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/imkit/person/PersonSettingActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/person/PersonSettingActivity.java index c01a441..5c5bdff 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/person/PersonSettingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/person/PersonSettingActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/selector/FunContactSelectorActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/selector/FunContactSelectorActivity.java index 5c2c9b4..5e2f9b7 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/selector/FunContactSelectorActivity.java @@ -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){ diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/BaseTeamQrSettingActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/BaseTeamQrSettingActivity.java index cd25cfe..d526a0a 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/BaseTeamQrSettingActivity.java @@ -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(); } diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/SettingResourceActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/SettingResourceActivity.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/imkit/team/SettingResourceActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/SettingResourceActivity.java index d69bad3..76bf3a6 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/SettingResourceActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/SettingResourceActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamAddManagerActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamAddManagerActivity.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamAddManagerActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamAddManagerActivity.java index d2f2c73..0518960 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamAddManagerActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamAddManagerActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamAnnouncementActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamAnnouncementActivity.java similarity index 77% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamAnnouncementActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamAnnouncementActivity.java index 220cf30..a07039f 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamAnnouncementActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamAnnouncementActivity.java @@ -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()); }); diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamHeadBgSettingActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamHeadBgSettingActivity.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamHeadBgSettingActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamHeadBgSettingActivity.java index 98638a2..e8886a7 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamHeadBgSettingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamHeadBgSettingActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamInvitedJoinActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamInvitedJoinActivity.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamInvitedJoinActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamInvitedJoinActivity.java index 46b111e..6ebe64a 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamInvitedJoinActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamInvitedJoinActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamManagerActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamManagerActivity.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamManagerActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamManagerActivity.java index d875e2a..9b3039d 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamManagerActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamManagerActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersJinYanActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersJinYanActivity.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersJinYanActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersJinYanActivity.java index 35382dc..1f9f102 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersJinYanActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersJinYanActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList1Activity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersList1Activity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList1Activity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersList1Activity.java index 4123641..d362e6a 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList1Activity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersList1Activity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList2Activity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersList2Activity.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList2Activity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersList2Activity.java index 7adf689..42f639d 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList2Activity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersList2Activity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersListActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersListActivity.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersListActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersListActivity.java index fc30170..adcdc64 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersListActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamMembersListActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamOtherSettingActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamOtherSettingActivity.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamOtherSettingActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamOtherSettingActivity.java index f1016bf..984a6a4 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamOtherSettingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamOtherSettingActivity.java @@ -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); }); diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamSettingActivity.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/TeamSettingActivity.java index e6bb6e6..47cc907 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/TeamSettingActivity.java @@ -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() { diff --git a/app/src/main/java/com/hbl/yuliao/imkit/team/ZhuanShuListActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/team/ZhuanShuListActivity.java new file mode 100644 index 0000000..bb966eb --- /dev/null +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/ZhuanShuListActivity.java @@ -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 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> feedbackResp) { + changeDate(feedbackResp.data); + } + + @Override + public void onError(int code, String msg) { + viewBinding.refreshLayout.finishRefresh(); + viewBinding.refreshLayout.finishLoadMore(); + changeView(false); + } + }); + } + + + + private void changeDate(ListBeanResult data) { + if (data.getList() != null) { + if (page == 1) { + quesListBeans = (ArrayList) data.getList(); + commonAdapter1.setDates(quesListBeans); + DataUtils.set(ZhuanShuListActivity.this, "message_list_" + IMKitClient.account(), GsonUtils.beanToJSONString(quesListBeans)); + } else { + commonAdapter1.addDates(data.getList()); + quesListBeans = (ArrayList) 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(); + }); + } + + +} diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter.java b/app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter.java index 4a911f8..72a4376 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter1.java b/app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter1.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter1.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter1.java index 5d90aaa..a7f43f7 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter1.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter1.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter2.java b/app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter2.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter2.java rename to app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter2.java index df4b027..660ab47 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter2.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/team/adapter/TeamMembersAdapter2.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/verify/FunVerifyListActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/verify/FunVerifyListActivity.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/imkit/verify/FunVerifyListActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/verify/FunVerifyListActivity.java index 6746eaa..55108b8 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/verify/FunVerifyListActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/verify/FunVerifyListActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/imkit/watch/CheckImageVideoActivity.java b/app/src/main/java/com/hbl/yuliao/imkit/watch/CheckImageVideoActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/imkit/watch/CheckImageVideoActivity.java rename to app/src/main/java/com/hbl/yuliao/imkit/watch/CheckImageVideoActivity.java index 6122782..7f3f61f 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/watch/CheckImageVideoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/imkit/watch/CheckImageVideoActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/jpush/LocalBroadcastManager.java b/app/src/main/java/com/hbl/yuliao/jpush/LocalBroadcastManager.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/jpush/LocalBroadcastManager.java rename to app/src/main/java/com/hbl/yuliao/jpush/LocalBroadcastManager.java index 2b3225d..adaae12 100644 --- a/app/src/main/java/com/hbl/lewan/jpush/LocalBroadcastManager.java +++ b/app/src/main/java/com/hbl/yuliao/jpush/LocalBroadcastManager.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.jpush; +package com.hbl.yuliao.jpush; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java b/app/src/main/java/com/hbl/yuliao/jpush/PushMessageReceiver.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java rename to app/src/main/java/com/hbl/yuliao/jpush/PushMessageReceiver.java index a7a33c3..1d38bb3 100644 --- a/app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java +++ b/app/src/main/java/com/hbl/yuliao/jpush/PushMessageReceiver.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/jpush/TagAliasOperatorHelper.java b/app/src/main/java/com/hbl/yuliao/jpush/TagAliasOperatorHelper.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/jpush/TagAliasOperatorHelper.java rename to app/src/main/java/com/hbl/yuliao/jpush/TagAliasOperatorHelper.java index 6b1bfa2..848b1c4 100644 --- a/app/src/main/java/com/hbl/lewan/jpush/TagAliasOperatorHelper.java +++ b/app/src/main/java/com/hbl/yuliao/jpush/TagAliasOperatorHelper.java @@ -1,4 +1,4 @@ -//package com.hbl.lewan.jpush; +//package com.hbl.yuliao.jpush; // //import android.content.Context; //import android.os.Handler; diff --git a/app/src/main/java/com/hbl/lewan/jpush/Utils.java b/app/src/main/java/com/hbl/yuliao/jpush/Utils.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/jpush/Utils.java rename to app/src/main/java/com/hbl/yuliao/jpush/Utils.java index c4eeb2e..436d11a 100644 --- a/app/src/main/java/com/hbl/lewan/jpush/Utils.java +++ b/app/src/main/java/com/hbl/yuliao/jpush/Utils.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.jpush; +package com.hbl.yuliao.jpush; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/com/hbl/lewan/login/ChongZhiActivity.java b/app/src/main/java/com/hbl/yuliao/login/ChongZhiActivity.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/login/ChongZhiActivity.java rename to app/src/main/java/com/hbl/yuliao/login/ChongZhiActivity.java index 3dc575a..7d354e4 100644 --- a/app/src/main/java/com/hbl/lewan/login/ChongZhiActivity.java +++ b/app/src/main/java/com/hbl/yuliao/login/ChongZhiActivity.java @@ -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 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 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 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); diff --git a/app/src/main/java/com/hbl/lewan/login/LoginActivity.java b/app/src/main/java/com/hbl/yuliao/login/LoginActivity.java similarity index 90% rename from app/src/main/java/com/hbl/lewan/login/LoginActivity.java rename to app/src/main/java/com/hbl/yuliao/login/LoginActivity.java index b4d3419..19f473f 100644 --- a/app/src/main/java/com/hbl/lewan/login/LoginActivity.java +++ b/app/src/main/java/com/hbl/yuliao/login/LoginActivity.java @@ -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 */ diff --git a/app/src/main/java/com/hbl/lewan/login/PhoneLoginActivity.java b/app/src/main/java/com/hbl/yuliao/login/PhoneLoginActivity.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/login/PhoneLoginActivity.java rename to app/src/main/java/com/hbl/yuliao/login/PhoneLoginActivity.java index 60b5632..1328b11 100644 --- a/app/src/main/java/com/hbl/lewan/login/PhoneLoginActivity.java +++ b/app/src/main/java/com/hbl/yuliao/login/PhoneLoginActivity.java @@ -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 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); diff --git a/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java b/app/src/main/java/com/hbl/yuliao/login/RegisterActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/login/RegisterActivity.java rename to app/src/main/java/com/hbl/yuliao/login/RegisterActivity.java index ac17fbc..70af86e 100644 --- a/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java +++ b/app/src/main/java/com/hbl/yuliao/login/RegisterActivity.java @@ -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 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); diff --git a/app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java b/app/src/main/java/com/hbl/yuliao/login/RegisterActivityBf.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java rename to app/src/main/java/com/hbl/yuliao/login/RegisterActivityBf.java index 7ca4fdf..023e195 100644 --- a/app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java +++ b/app/src/main/java/com/hbl/yuliao/login/RegisterActivityBf.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/login/WangjiActivity.java b/app/src/main/java/com/hbl/yuliao/login/WangjiActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/login/WangjiActivity.java rename to app/src/main/java/com/hbl/yuliao/login/WangjiActivity.java index 7999356..3891296 100644 --- a/app/src/main/java/com/hbl/lewan/login/WangjiActivity.java +++ b/app/src/main/java/com/hbl/yuliao/login/WangjiActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/yuliao/main/CustomCallOrderHelper.java b/app/src/main/java/com/hbl/yuliao/main/CustomCallOrderHelper.java new file mode 100644 index 0000000..c972a94 --- /dev/null +++ b/app/src/main/java/com/hbl/yuliao/main/CustomCallOrderHelper.java @@ -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 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); + } + } +} diff --git a/app/src/main/java/com/hbl/lewan/main/FragmentAdapter.java b/app/src/main/java/com/hbl/yuliao/main/FragmentAdapter.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/FragmentAdapter.java rename to app/src/main/java/com/hbl/yuliao/main/FragmentAdapter.java index 94e18ac..c5be6e5 100644 --- a/app/src/main/java/com/hbl/lewan/main/FragmentAdapter.java +++ b/app/src/main/java/com/hbl/yuliao/main/FragmentAdapter.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/MainActivity.java b/app/src/main/java/com/hbl/yuliao/main/MainActivity.java similarity index 75% rename from app/src/main/java/com/hbl/lewan/main/MainActivity.java rename to app/src/main/java/com/hbl/yuliao/main/MainActivity.java index eed6d1e..45ce5c5 100644 --- a/app/src/main/java/com/hbl/lewan/main/MainActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/MainActivity.java @@ -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 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 eventInfo) { +// LogUtils.i("注册获取tokencanJoinRtcOnCalling："+GsonUtils.beanToJSONString(eventInfo)); +// callMaps = (Map) 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() { +// @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 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() { +// @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 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 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() { + @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() { + @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 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() { @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() { @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 titleUsers; private ArrayList titleUsersIsCheck; diff --git a/app/src/main/java/com/hbl/lewan/main/authorize/AuthorizeActivity.java b/app/src/main/java/com/hbl/yuliao/main/authorize/AuthorizeActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/authorize/AuthorizeActivity.java rename to app/src/main/java/com/hbl/yuliao/main/authorize/AuthorizeActivity.java index b3a1486..a666b43 100644 --- a/app/src/main/java/com/hbl/lewan/main/authorize/AuthorizeActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/authorize/AuthorizeActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/chat/AllConversationFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/AllConversationFragment.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/chat/AllConversationFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/AllConversationFragment.java index ed3aab8..b23bb3a 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/AllConversationFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/AllConversationFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/ChatConversationFragment.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/ChatConversationFragment.java index e59cad7..38cfb5f 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/ChatConversationFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ChatGroupFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/ChatGroupFragment.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/chat/ChatGroupFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/ChatGroupFragment.java index 7718b08..92d0384 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/ChatGroupFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/ChatGroupFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ChatMain2Fragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/ChatMain2Fragment.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/main/chat/ChatMain2Fragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/ChatMain2Fragment.java index 37b62a7..0019fcd 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/ChatMain2Fragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/ChatMain2Fragment.java @@ -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)) ); diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ChatMainFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/ChatMainFragment.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/chat/ChatMainFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/ChatMainFragment.java index 20e5884..7a9f6e0 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/ChatMainFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/ChatMainFragment.java @@ -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)) ); diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/ChatTabFragment.java similarity index 84% rename from app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/ChatTabFragment.java index c84ddbc..7d2c44a 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/ChatTabFragment.java @@ -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)); } diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ContactActivity.java b/app/src/main/java/com/hbl/yuliao/main/chat/ContactActivity.java similarity index 87% rename from app/src/main/java/com/hbl/lewan/main/chat/ContactActivity.java rename to app/src/main/java/com/hbl/yuliao/main/chat/ContactActivity.java index 8c31095..8642e43 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/ContactActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/ContactActivity.java @@ -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; //通讯录 diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ContactFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/ContactFragment.java similarity index 85% rename from app/src/main/java/com/hbl/lewan/main/chat/ContactFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/ContactFragment.java index a9990b4..5fa84be 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/ContactFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/ContactFragment.java @@ -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 = 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); } }); diff --git a/app/src/main/java/com/hbl/lewan/main/chat/EditChatRecordlistActivity.java b/app/src/main/java/com/hbl/yuliao/main/chat/EditChatRecordlistActivity.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/main/chat/EditChatRecordlistActivity.java rename to app/src/main/java/com/hbl/yuliao/main/chat/EditChatRecordlistActivity.java index 6d4067e..f421cc3 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/EditChatRecordlistActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/EditChatRecordlistActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/chat/FollowListFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/FollowListFragment.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/main/chat/FollowListFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/FollowListFragment.java index b90fc14..77233c0 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/FollowListFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/FollowListFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/chat/FriendConversationFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/FriendConversationFragment.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/chat/FriendConversationFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/FriendConversationFragment.java index bc4b56d..a95653b 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/FriendConversationFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/FriendConversationFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/chat/TeamConversationFragment.java b/app/src/main/java/com/hbl/yuliao/main/chat/TeamConversationFragment.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/chat/TeamConversationFragment.java rename to app/src/main/java/com/hbl/yuliao/main/chat/TeamConversationFragment.java index a50f657..e555c72 100644 --- a/app/src/main/java/com/hbl/lewan/main/chat/TeamConversationFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/chat/TeamConversationFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/home/CustomServicesActivity.java b/app/src/main/java/com/hbl/yuliao/main/home/CustomServicesActivity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/main/home/CustomServicesActivity.java rename to app/src/main/java/com/hbl/yuliao/main/home/CustomServicesActivity.java index bd795d7..688e5a3 100644 --- a/app/src/main/java/com/hbl/lewan/main/home/CustomServicesActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/home/CustomServicesActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java b/app/src/main/java/com/hbl/yuliao/main/home/HomeFragment.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java rename to app/src/main/java/com/hbl/yuliao/main/home/HomeFragment.java index fe94d31..faaf9c6 100644 --- a/app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/home/HomeFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java b/app/src/main/java/com/hbl/yuliao/main/index/AiChatActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java rename to app/src/main/java/com/hbl/yuliao/main/index/AiChatActivity.java index cac7cd5..94bbea9 100644 --- a/app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/index/AiChatActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/index/Index2FragmentBf.java b/app/src/main/java/com/hbl/yuliao/main/index/Index2FragmentBf.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/main/index/Index2FragmentBf.java rename to app/src/main/java/com/hbl/yuliao/main/index/Index2FragmentBf.java index c3ce616..8094c49 100644 --- a/app/src/main/java/com/hbl/lewan/main/index/Index2FragmentBf.java +++ b/app/src/main/java/com/hbl/yuliao/main/index/Index2FragmentBf.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/index/IndexFragment.java b/app/src/main/java/com/hbl/yuliao/main/index/IndexFragment.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/main/index/IndexFragment.java rename to app/src/main/java/com/hbl/yuliao/main/index/IndexFragment.java index a3e4bc3..82d9e4d 100644 --- a/app/src/main/java/com/hbl/lewan/main/index/IndexFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/index/IndexFragment.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/index/adapter/IndexContactAdapter.java b/app/src/main/java/com/hbl/yuliao/main/index/adapter/IndexContactAdapter.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/index/adapter/IndexContactAdapter.java rename to app/src/main/java/com/hbl/yuliao/main/index/adapter/IndexContactAdapter.java index bfc9c6f..7fb23d2 100644 --- a/app/src/main/java/com/hbl/lewan/main/index/adapter/IndexContactAdapter.java +++ b/app/src/main/java/com/hbl/yuliao/main/index/adapter/IndexContactAdapter.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java b/app/src/main/java/com/hbl/yuliao/main/index/add/AddFriendsActivity.java similarity index 90% rename from app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java rename to app/src/main/java/com/hbl/yuliao/main/index/add/AddFriendsActivity.java index 1be30f7..7920c20 100644 --- a/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/index/add/AddFriendsActivity.java @@ -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() { @@ -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() { @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) { // 保存到相册成功 diff --git a/app/src/main/java/com/hbl/lewan/main/message/NotifyActMessageActivity.java b/app/src/main/java/com/hbl/yuliao/main/message/NotifyActMessageActivity.java similarity index 85% rename from app/src/main/java/com/hbl/lewan/main/message/NotifyActMessageActivity.java rename to app/src/main/java/com/hbl/yuliao/main/message/NotifyActMessageActivity.java index 363a6fb..ffb2a7c 100644 --- a/app/src/main/java/com/hbl/lewan/main/message/NotifyActMessageActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/message/NotifyActMessageActivity.java @@ -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 feedbackResp) { + DataUtils.set(NotifyActMessageActivity.this, "notify_message_time_" + IMKitClient.account(), System.currentTimeMillis()); + changeDate(feedbackResp.data); } diff --git a/app/src/main/java/com/hbl/lewan/main/message/NotifyMessageActivity.java b/app/src/main/java/com/hbl/yuliao/main/message/NotifyMessageActivity.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/main/message/NotifyMessageActivity.java rename to app/src/main/java/com/hbl/yuliao/main/message/NotifyMessageActivity.java index 9143148..afd99d4 100644 --- a/app/src/main/java/com/hbl/lewan/main/message/NotifyMessageActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/message/NotifyMessageActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/message/NotifyMessageDetailsActivity.java b/app/src/main/java/com/hbl/yuliao/main/message/NotifyMessageDetailsActivity.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/main/message/NotifyMessageDetailsActivity.java rename to app/src/main/java/com/hbl/yuliao/main/message/NotifyMessageDetailsActivity.java index 4d0a373..cff8f3d 100644 --- a/app/src/main/java/com/hbl/lewan/main/message/NotifyMessageDetailsActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/message/NotifyMessageDetailsActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/AccountAndSecurityActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/AccountAndSecurityActivity.java index dbd16f2..2dd6ef8 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/AccountAndSecurityActivity.java @@ -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); diff --git a/app/src/main/java/com/hbl/lewan/main/mine/AccoutListActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/AccoutListActivity.java similarity index 87% rename from app/src/main/java/com/hbl/lewan/main/mine/AccoutListActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/AccoutListActivity.java index 21bb9e1..0e8a413 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/AccoutListActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/AccoutListActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/BuyAccountActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/BuyAccountActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/mine/BuyAccountActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/BuyAccountActivity.java index 803eb4c..dc6da8b 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/BuyAccountActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/BuyAccountActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/ChangeAccoutActionActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/ChangeAccoutActionActivity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/main/mine/ChangeAccoutActionActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/ChangeAccoutActionActivity.java index e1053e9..3cf27f8 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/ChangeAccoutActionActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/ChangeAccoutActionActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/ChangePasswordActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/ChangePasswordActivity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/main/mine/ChangePasswordActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/ChangePasswordActivity.java index abd799f..5068b08 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/ChangePasswordActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/ChangePasswordActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/ChangePhoneActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/ChangePhoneActivity.java similarity index 87% rename from app/src/main/java/com/hbl/lewan/main/mine/ChangePhoneActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/ChangePhoneActivity.java index af191f9..8467a3e 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/ChangePhoneActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/ChangePhoneActivity.java @@ -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 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 { diff --git a/app/src/main/java/com/hbl/lewan/main/mine/CloseAccountActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/CloseAccountActivity.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/main/mine/CloseAccountActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/CloseAccountActivity.java index 8701eae..1a4ca4f 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/CloseAccountActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/CloseAccountActivity.java @@ -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(); }); diff --git a/app/src/main/java/com/hbl/lewan/main/mine/EditFriendUserInfoActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/EditFriendUserInfoActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/mine/EditFriendUserInfoActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/EditFriendUserInfoActivity.java index b8cd40d..bc9f703 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/EditFriendUserInfoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/EditFriendUserInfoActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/EditUserInfoActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/EditUserInfoActivity.java similarity index 81% rename from app/src/main/java/com/hbl/lewan/main/mine/EditUserInfoActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/EditUserInfoActivity.java index 1d2804a..0ad6693 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/EditUserInfoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/EditUserInfoActivity.java @@ -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 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( diff --git a/app/src/main/java/com/hbl/lewan/main/mine/FriendPermissionsActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/FriendPermissionsActivity.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/main/mine/FriendPermissionsActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/FriendPermissionsActivity.java index b6f6d5b..338b61e 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/FriendPermissionsActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/FriendPermissionsActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/Help1Activity.java b/app/src/main/java/com/hbl/yuliao/main/mine/Help1Activity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/mine/Help1Activity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/Help1Activity.java index c236d62..2a4393a 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/Help1Activity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/Help1Activity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/HelpActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/HelpActivity.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/main/mine/HelpActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/HelpActivity.java index 1349c28..d3b19dd 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/HelpActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/HelpActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java b/app/src/main/java/com/hbl/yuliao/main/mine/MineFragment.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java rename to app/src/main/java/com/hbl/yuliao/main/mine/MineFragment.java index 8178967..40cf61e 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/MineFragment.java @@ -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)); } } diff --git a/app/src/main/java/com/hbl/lewan/main/mine/MineFragmentBf.java b/app/src/main/java/com/hbl/yuliao/main/mine/MineFragmentBf.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/mine/MineFragmentBf.java rename to app/src/main/java/com/hbl/yuliao/main/mine/MineFragmentBf.java index fc73778..c0c6120 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/MineFragmentBf.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/MineFragmentBf.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/MineInfoActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/MineInfoActivity.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/mine/MineInfoActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/MineInfoActivity.java index cc22846..e2e337e 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/MineInfoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/MineInfoActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/SettingAccoutIdActivity.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/SettingAccoutIdActivity.java index c08a94e..1f6358d 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/SettingAccoutIdActivity.java @@ -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); } }); diff --git a/app/src/main/java/com/hbl/lewan/main/mine/TypeSelectActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/TypeSelectActivity.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/main/mine/TypeSelectActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/TypeSelectActivity.java index 4f3da78..ad3c6ad 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/TypeSelectActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/TypeSelectActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/UnBindPhoneActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/UnBindPhoneActivity.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/main/mine/UnBindPhoneActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/UnBindPhoneActivity.java index af36e00..701c335 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/UnBindPhoneActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/UnBindPhoneActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/UserHeadEditActivity.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/UserHeadEditActivity.java index bbd2afa..25dd343 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/UserHeadEditActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/UserInfoActivity.java similarity index 77% rename from app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/UserInfoActivity.java index 409ff34..cbacad6 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/UserInfoActivity.java @@ -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{ private ActivityLocUserInfoBinding binding; private ActivityResultLauncher 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 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 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 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 permissionLauncher; protected ActivityResultLauncher permissionLauncher1; + protected ActivityResultLauncher 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() { + @Override + public void onResult(ArrayList 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 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 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); + } + } } diff --git a/app/src/main/java/com/hbl/lewan/main/mine/photo/AddPhotoActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/photo/AddPhotoActivity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/main/mine/photo/AddPhotoActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/photo/AddPhotoActivity.java index 59eabe6..50f9f05 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/photo/AddPhotoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/photo/AddPhotoActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/photo/EditPhotoActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/photo/EditPhotoActivity.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/main/mine/photo/EditPhotoActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/photo/EditPhotoActivity.java index 89750ee..75b7b84 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/photo/EditPhotoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/photo/EditPhotoActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoDetailsActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/photo/UserPhotoDetailsActivity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoDetailsActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/photo/UserPhotoDetailsActivity.java index 67c3ca6..695224b 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoDetailsActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/photo/UserPhotoDetailsActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoListActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/photo/UserPhotoListActivity.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoListActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/photo/UserPhotoListActivity.java index 1dc389d..2027f91 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoListActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/photo/UserPhotoListActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/photo/UserSelectPhotoActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/photo/UserSelectPhotoActivity.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/main/mine/photo/UserSelectPhotoActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/photo/UserSelectPhotoActivity.java index 4223585..78825c0 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/photo/UserSelectPhotoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/photo/UserSelectPhotoActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/photo/WatchImagesActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/photo/WatchImagesActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/mine/photo/WatchImagesActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/photo/WatchImagesActivity.java index df286f4..11b961d 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/photo/WatchImagesActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/photo/WatchImagesActivity.java @@ -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)); diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/ClearCacheActivity.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/ClearCacheActivity.java index bfaf521..db5ed1e 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/ClearCacheActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheViewModel.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/ClearCacheViewModel.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheViewModel.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/ClearCacheViewModel.java index c9db0a4..e0da263 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/ClearCacheViewModel.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/ClearCacheViewModel.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/SettingActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingActivity.java index df55dc9..53824e7 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNewActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNewActivity.java similarity index 84% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNewActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNewActivity.java index a044492..a89b132 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNewActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNewActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyActivity.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyActivity.java index 123cd3d..0978e1f 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyActivity.java @@ -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(); diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyRingActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyRingActivity.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyRingActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyRingActivity.java index b7cc6ed..850064e 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyRingActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyRingActivity.java @@ -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(); } diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyViewModel.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyViewModel.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyViewModel.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyViewModel.java index 8a08cf7..34dd549 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyViewModel.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingNotifyViewModel.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingViewModel.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingViewModel.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/SettingViewModel.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingViewModel.java index ae6dbab..5be6e62 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/SettingViewModel.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SettingViewModel.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/main/mine/setting/SkinActivity.java b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SkinActivity.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/main/mine/setting/SkinActivity.java rename to app/src/main/java/com/hbl/yuliao/main/mine/setting/SkinActivity.java index 452bb88..d8c69bc 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/setting/SkinActivity.java +++ b/app/src/main/java/com/hbl/yuliao/main/mine/setting/SkinActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/map/LocationPageActivity1.java b/app/src/main/java/com/hbl/yuliao/map/LocationPageActivity1.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/map/LocationPageActivity1.java rename to app/src/main/java/com/hbl/yuliao/map/LocationPageActivity1.java index 1c8d8e3..393cf31 100644 --- a/app/src/main/java/com/hbl/lewan/map/LocationPageActivity1.java +++ b/app/src/main/java/com/hbl/yuliao/map/LocationPageActivity1.java @@ -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() { diff --git a/app/src/main/java/com/hbl/lewan/model/AccountsBean.java b/app/src/main/java/com/hbl/yuliao/model/AccountsBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/AccountsBean.java rename to app/src/main/java/com/hbl/yuliao/model/AccountsBean.java index 1f037e9..4b8a040 100644 --- a/app/src/main/java/com/hbl/lewan/model/AccountsBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AccountsBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; /** * ********************** diff --git a/app/src/main/java/com/hbl/lewan/model/ActivityMsgBean.java b/app/src/main/java/com/hbl/yuliao/model/ActivityMsgBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/ActivityMsgBean.java rename to app/src/main/java/com/hbl/yuliao/model/ActivityMsgBean.java index 1a76a29..a72734b 100644 --- a/app/src/main/java/com/hbl/lewan/model/ActivityMsgBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ActivityMsgBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/AdBean.java b/app/src/main/java/com/hbl/yuliao/model/AdBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/AdBean.java rename to app/src/main/java/com/hbl/yuliao/model/AdBean.java index 45e1088..1daeed6 100644 --- a/app/src/main/java/com/hbl/lewan/model/AdBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AdBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class AdBean { diff --git a/app/src/main/java/com/hbl/lewan/model/AddFriendBean.java b/app/src/main/java/com/hbl/yuliao/model/AddFriendBean.java similarity index 82% rename from app/src/main/java/com/hbl/lewan/model/AddFriendBean.java rename to app/src/main/java/com/hbl/yuliao/model/AddFriendBean.java index 9d86441..466604c 100644 --- a/app/src/main/java/com/hbl/lewan/model/AddFriendBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AddFriendBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class AddFriendBean { public String user_uid; diff --git a/app/src/main/java/com/hbl/lewan/model/AfterCountBean.java b/app/src/main/java/com/hbl/yuliao/model/AfterCountBean.java similarity index 86% rename from app/src/main/java/com/hbl/lewan/model/AfterCountBean.java rename to app/src/main/java/com/hbl/yuliao/model/AfterCountBean.java index 6964afe..98a280f 100644 --- a/app/src/main/java/com/hbl/lewan/model/AfterCountBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AfterCountBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class AfterCountBean { diff --git a/app/src/main/java/com/hbl/lewan/model/AiChatUpdateEvent.java b/app/src/main/java/com/hbl/yuliao/model/AiChatUpdateEvent.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/AiChatUpdateEvent.java rename to app/src/main/java/com/hbl/yuliao/model/AiChatUpdateEvent.java index d47c5d3..ea2bb1c 100644 --- a/app/src/main/java/com/hbl/lewan/model/AiChatUpdateEvent.java +++ b/app/src/main/java/com/hbl/yuliao/model/AiChatUpdateEvent.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/hbl/lewan/model/AiConvertBean.java b/app/src/main/java/com/hbl/yuliao/model/AiConvertBean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/AiConvertBean.java rename to app/src/main/java/com/hbl/yuliao/model/AiConvertBean.java index c596cfe..0e1a630 100644 --- a/app/src/main/java/com/hbl/lewan/model/AiConvertBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AiConvertBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class AiConvertBean { diff --git a/app/src/main/java/com/hbl/lewan/model/AiMessageBean.java b/app/src/main/java/com/hbl/yuliao/model/AiMessageBean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/AiMessageBean.java rename to app/src/main/java/com/hbl/yuliao/model/AiMessageBean.java index 817d02e..00e66a9 100644 --- a/app/src/main/java/com/hbl/lewan/model/AiMessageBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AiMessageBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/hbl/lewan/model/AlbumBean.java b/app/src/main/java/com/hbl/yuliao/model/AlbumBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/AlbumBean.java rename to app/src/main/java/com/hbl/yuliao/model/AlbumBean.java index e33cd36..31cbe56 100644 --- a/app/src/main/java/com/hbl/lewan/model/AlbumBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AlbumBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/AlbumItemBean.java b/app/src/main/java/com/hbl/yuliao/model/AlbumItemBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/AlbumItemBean.java rename to app/src/main/java/com/hbl/yuliao/model/AlbumItemBean.java index 878b899..2f60166 100644 --- a/app/src/main/java/com/hbl/lewan/model/AlbumItemBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AlbumItemBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/AuthorizeBean.java b/app/src/main/java/com/hbl/yuliao/model/AuthorizeBean.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/model/AuthorizeBean.java rename to app/src/main/java/com/hbl/yuliao/model/AuthorizeBean.java index d44298c..44bb90e 100644 --- a/app/src/main/java/com/hbl/lewan/model/AuthorizeBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AuthorizeBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class AuthorizeBean { diff --git a/app/src/main/java/com/hbl/lewan/model/AvaterBean.java b/app/src/main/java/com/hbl/yuliao/model/AvaterBean.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/model/AvaterBean.java rename to app/src/main/java/com/hbl/yuliao/model/AvaterBean.java index fe422ec..b2e190e 100644 --- a/app/src/main/java/com/hbl/lewan/model/AvaterBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/AvaterBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class AvaterBean { diff --git a/app/src/main/java/com/hbl/lewan/model/BankBean.java b/app/src/main/java/com/hbl/yuliao/model/BankBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/BankBean.java rename to app/src/main/java/com/hbl/yuliao/model/BankBean.java index 821bad4..b505dca 100644 --- a/app/src/main/java/com/hbl/lewan/model/BankBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/BankBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class BankBean { diff --git a/app/src/main/java/com/hbl/lewan/model/BankListBean.java b/app/src/main/java/com/hbl/yuliao/model/BankListBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/BankListBean.java rename to app/src/main/java/com/hbl/yuliao/model/BankListBean.java index 48d1845..5eefaf5 100644 --- a/app/src/main/java/com/hbl/lewan/model/BankListBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/BankListBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class BankListBean { diff --git a/app/src/main/java/com/hbl/lewan/model/BillBean.java b/app/src/main/java/com/hbl/yuliao/model/BillBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/BillBean.java rename to app/src/main/java/com/hbl/yuliao/model/BillBean.java index 1af2188..3d3f29b 100644 --- a/app/src/main/java/com/hbl/lewan/model/BillBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/BillBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; diff --git a/app/src/main/java/com/hbl/lewan/model/BindBean.java b/app/src/main/java/com/hbl/yuliao/model/BindBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/BindBean.java rename to app/src/main/java/com/hbl/yuliao/model/BindBean.java index 83d231b..337556e 100644 --- a/app/src/main/java/com/hbl/lewan/model/BindBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/BindBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; diff --git a/app/src/main/java/com/hbl/lewan/model/BindUserBean.java b/app/src/main/java/com/hbl/yuliao/model/BindUserBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/BindUserBean.java rename to app/src/main/java/com/hbl/yuliao/model/BindUserBean.java index 7edc4da..fe1412a 100644 --- a/app/src/main/java/com/hbl/lewan/model/BindUserBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/BindUserBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; diff --git a/app/src/main/java/com/hbl/lewan/model/CallBean.java b/app/src/main/java/com/hbl/yuliao/model/CallBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/CallBean.java rename to app/src/main/java/com/hbl/yuliao/model/CallBean.java index 747bb9a..0e1f7ce 100644 --- a/app/src/main/java/com/hbl/lewan/model/CallBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/CallBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class CallBean { /**0 语音消息 1 视频消息*/ diff --git a/app/src/main/java/com/hbl/lewan/model/ChargingBean.java b/app/src/main/java/com/hbl/yuliao/model/ChargingBean.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/model/ChargingBean.java rename to app/src/main/java/com/hbl/yuliao/model/ChargingBean.java index 4a03205..545a921 100644 --- a/app/src/main/java/com/hbl/lewan/model/ChargingBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ChargingBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class ChargingBean { diff --git a/app/src/main/java/com/hbl/lewan/model/ChongZhiLogBean.java b/app/src/main/java/com/hbl/yuliao/model/ChongZhiLogBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/ChongZhiLogBean.java rename to app/src/main/java/com/hbl/yuliao/model/ChongZhiLogBean.java index 98e34ac..11f5eae 100644 --- a/app/src/main/java/com/hbl/lewan/model/ChongZhiLogBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ChongZhiLogBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; /** * ********************** diff --git a/app/src/main/java/com/hbl/lewan/model/ChongZhiQuDaoBean.java b/app/src/main/java/com/hbl/yuliao/model/ChongZhiQuDaoBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/ChongZhiQuDaoBean.java rename to app/src/main/java/com/hbl/yuliao/model/ChongZhiQuDaoBean.java index e34c44d..a302b38 100644 --- a/app/src/main/java/com/hbl/lewan/model/ChongZhiQuDaoBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ChongZhiQuDaoBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; /** * ********************** diff --git a/app/src/main/java/com/hbl/lewan/model/CirPushMessage.java b/app/src/main/java/com/hbl/yuliao/model/CirPushMessage.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/CirPushMessage.java rename to app/src/main/java/com/hbl/yuliao/model/CirPushMessage.java index 9024364..046bfd4 100644 --- a/app/src/main/java/com/hbl/lewan/model/CirPushMessage.java +++ b/app/src/main/java/com/hbl/yuliao/model/CirPushMessage.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class CirPushMessage { diff --git a/app/src/main/java/com/hbl/lewan/model/CircleShareBean.java b/app/src/main/java/com/hbl/yuliao/model/CircleShareBean.java similarity index 84% rename from app/src/main/java/com/hbl/lewan/model/CircleShareBean.java rename to app/src/main/java/com/hbl/yuliao/model/CircleShareBean.java index 646feb6..0c7989a 100644 --- a/app/src/main/java/com/hbl/lewan/model/CircleShareBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/CircleShareBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import com.netease.yunxin.kit.chatkit.ui.custom.StickerAttachment; diff --git a/app/src/main/java/com/hbl/lewan/model/CommentBean.java b/app/src/main/java/com/hbl/yuliao/model/CommentBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/CommentBean.java rename to app/src/main/java/com/hbl/yuliao/model/CommentBean.java index 9361604..c857dbb 100644 --- a/app/src/main/java/com/hbl/lewan/model/CommentBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/CommentBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; diff --git a/app/src/main/java/com/hbl/lewan/model/ConfigBean.java b/app/src/main/java/com/hbl/yuliao/model/ConfigBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/ConfigBean.java rename to app/src/main/java/com/hbl/yuliao/model/ConfigBean.java index eb90c18..deff6a9 100644 --- a/app/src/main/java/com/hbl/lewan/model/ConfigBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ConfigBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; /** * 配置开关 diff --git a/app/src/main/java/com/hbl/lewan/model/CountryBean.java b/app/src/main/java/com/hbl/yuliao/model/CountryBean.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/model/CountryBean.java rename to app/src/main/java/com/hbl/yuliao/model/CountryBean.java index 306b05e..07f1ed8 100644 --- a/app/src/main/java/com/hbl/lewan/model/CountryBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/CountryBean.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/CreditsConfBean.java b/app/src/main/java/com/hbl/yuliao/model/CreditsConfBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/CreditsConfBean.java rename to app/src/main/java/com/hbl/yuliao/model/CreditsConfBean.java index 3b16bec..b3550fe 100644 --- a/app/src/main/java/com/hbl/lewan/model/CreditsConfBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/CreditsConfBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class CreditsConfBean { diff --git a/app/src/main/java/com/hbl/lewan/model/DongTaiActionBean.java b/app/src/main/java/com/hbl/yuliao/model/DongTaiActionBean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/DongTaiActionBean.java rename to app/src/main/java/com/hbl/yuliao/model/DongTaiActionBean.java index faf7637..0cc61c9 100644 --- a/app/src/main/java/com/hbl/lewan/model/DongTaiActionBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/DongTaiActionBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class DongTaiActionBean { diff --git a/app/src/main/java/com/hbl/lewan/model/EditMessageBean.java b/app/src/main/java/com/hbl/yuliao/model/EditMessageBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/EditMessageBean.java rename to app/src/main/java/com/hbl/yuliao/model/EditMessageBean.java index d2b4f30..3bf5db2 100644 --- a/app/src/main/java/com/hbl/lewan/model/EditMessageBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/EditMessageBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; diff --git a/app/src/main/java/com/hbl/lewan/model/ExchangeConfBean.java b/app/src/main/java/com/hbl/yuliao/model/ExchangeConfBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/ExchangeConfBean.java rename to app/src/main/java/com/hbl/yuliao/model/ExchangeConfBean.java index 01e052b..176eaf4 100644 --- a/app/src/main/java/com/hbl/lewan/model/ExchangeConfBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ExchangeConfBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/ExplorePostPinglunBean.java b/app/src/main/java/com/hbl/yuliao/model/ExplorePostPinglunBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/ExplorePostPinglunBean.java rename to app/src/main/java/com/hbl/yuliao/model/ExplorePostPinglunBean.java index a5f1371..1db0689 100644 --- a/app/src/main/java/com/hbl/lewan/model/ExplorePostPinglunBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ExplorePostPinglunBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class ExplorePostPinglunBean { diff --git a/app/src/main/java/com/hbl/lewan/model/ForBiddenInfoBean.java b/app/src/main/java/com/hbl/yuliao/model/ForBiddenInfoBean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/ForBiddenInfoBean.java rename to app/src/main/java/com/hbl/yuliao/model/ForBiddenInfoBean.java index 9a954da..cf42255 100644 --- a/app/src/main/java/com/hbl/lewan/model/ForBiddenInfoBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ForBiddenInfoBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class ForBiddenInfoBean { diff --git a/app/src/main/java/com/hbl/lewan/model/FukuanResultBean.java b/app/src/main/java/com/hbl/yuliao/model/FukuanResultBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/FukuanResultBean.java rename to app/src/main/java/com/hbl/yuliao/model/FukuanResultBean.java index 214cc73..f34fea4 100644 --- a/app/src/main/java/com/hbl/lewan/model/FukuanResultBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/FukuanResultBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class FukuanResultBean { diff --git a/app/src/main/java/com/hbl/lewan/model/GameBean.java b/app/src/main/java/com/hbl/yuliao/model/GameBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/GameBean.java rename to app/src/main/java/com/hbl/yuliao/model/GameBean.java index d7a034e..97c8256 100644 --- a/app/src/main/java/com/hbl/lewan/model/GameBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/GameBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; diff --git a/app/src/main/java/com/hbl/lewan/model/GroupActionBean.java b/app/src/main/java/com/hbl/yuliao/model/GroupActionBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/GroupActionBean.java rename to app/src/main/java/com/hbl/yuliao/model/GroupActionBean.java index 639d6e9..11193ec 100644 --- a/app/src/main/java/com/hbl/lewan/model/GroupActionBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/GroupActionBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class GroupActionBean { diff --git a/app/src/main/java/com/hbl/lewan/model/GroupAtMessageBean.java b/app/src/main/java/com/hbl/yuliao/model/GroupAtMessageBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/GroupAtMessageBean.java rename to app/src/main/java/com/hbl/yuliao/model/GroupAtMessageBean.java index e251a9b..f15cda5 100644 --- a/app/src/main/java/com/hbl/lewan/model/GroupAtMessageBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/GroupAtMessageBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/GroupBeanResult.java b/app/src/main/java/com/hbl/yuliao/model/GroupBeanResult.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/GroupBeanResult.java rename to app/src/main/java/com/hbl/yuliao/model/GroupBeanResult.java index a983cde..2cb14bb 100644 --- a/app/src/main/java/com/hbl/lewan/model/GroupBeanResult.java +++ b/app/src/main/java/com/hbl/yuliao/model/GroupBeanResult.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/GroupListBean.java b/app/src/main/java/com/hbl/yuliao/model/GroupListBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/GroupListBean.java rename to app/src/main/java/com/hbl/yuliao/model/GroupListBean.java index 1d8b59c..67a24c0 100644 --- a/app/src/main/java/com/hbl/lewan/model/GroupListBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/GroupListBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class GroupListBean { diff --git a/app/src/main/java/com/hbl/lewan/model/H5ChangeTitle.java b/app/src/main/java/com/hbl/yuliao/model/H5ChangeTitle.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/H5ChangeTitle.java rename to app/src/main/java/com/hbl/yuliao/model/H5ChangeTitle.java index f4a281f..8e39af6 100644 --- a/app/src/main/java/com/hbl/lewan/model/H5ChangeTitle.java +++ b/app/src/main/java/com/hbl/yuliao/model/H5ChangeTitle.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class H5ChangeTitle { diff --git a/app/src/main/java/com/hbl/lewan/model/HisChatShowBean.java b/app/src/main/java/com/hbl/yuliao/model/HisChatShowBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/HisChatShowBean.java rename to app/src/main/java/com/hbl/yuliao/model/HisChatShowBean.java index d91e8e0..b387570 100644 --- a/app/src/main/java/com/hbl/lewan/model/HisChatShowBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/HisChatShowBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import com.netease.yunxin.kit.chatkit.model.IMMessageInfo; diff --git a/app/src/main/java/com/hbl/lewan/model/InstallmentBean.java b/app/src/main/java/com/hbl/yuliao/model/InstallmentBean.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/model/InstallmentBean.java rename to app/src/main/java/com/hbl/yuliao/model/InstallmentBean.java index 6b2e9e8..327acca 100644 --- a/app/src/main/java/com/hbl/lewan/model/InstallmentBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/InstallmentBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; diff --git a/app/src/main/java/com/hbl/lewan/model/InviteDetailsBean.java b/app/src/main/java/com/hbl/yuliao/model/InviteDetailsBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/InviteDetailsBean.java rename to app/src/main/java/com/hbl/yuliao/model/InviteDetailsBean.java index d3077a8..2d3d4c5 100644 --- a/app/src/main/java/com/hbl/lewan/model/InviteDetailsBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/InviteDetailsBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; diff --git a/app/src/main/java/com/hbl/lewan/model/JsBridgeOrderBean.java b/app/src/main/java/com/hbl/yuliao/model/JsBridgeOrderBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/JsBridgeOrderBean.java rename to app/src/main/java/com/hbl/yuliao/model/JsBridgeOrderBean.java index bbf0780..5bf647c 100644 --- a/app/src/main/java/com/hbl/lewan/model/JsBridgeOrderBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/JsBridgeOrderBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class JsBridgeOrderBean { diff --git a/app/src/main/java/com/hbl/lewan/model/LikeBean.java b/app/src/main/java/com/hbl/yuliao/model/LikeBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/LikeBean.java rename to app/src/main/java/com/hbl/yuliao/model/LikeBean.java index 8374fc1..e5ad423 100644 --- a/app/src/main/java/com/hbl/lewan/model/LikeBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/LikeBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; diff --git a/app/src/main/java/com/hbl/lewan/model/LinkBean.java b/app/src/main/java/com/hbl/yuliao/model/LinkBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/LinkBean.java rename to app/src/main/java/com/hbl/yuliao/model/LinkBean.java index 55f9508..d44bf52 100644 --- a/app/src/main/java/com/hbl/lewan/model/LinkBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/LinkBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class LinkBean { diff --git a/app/src/main/java/com/hbl/lewan/model/ListBeanResult.java b/app/src/main/java/com/hbl/yuliao/model/ListBeanResult.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/ListBeanResult.java rename to app/src/main/java/com/hbl/yuliao/model/ListBeanResult.java index 4a46696..0536120 100644 --- a/app/src/main/java/com/hbl/lewan/model/ListBeanResult.java +++ b/app/src/main/java/com/hbl/yuliao/model/ListBeanResult.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/LngLat.java b/app/src/main/java/com/hbl/yuliao/model/LngLat.java similarity index 87% rename from app/src/main/java/com/hbl/lewan/model/LngLat.java rename to app/src/main/java/com/hbl/yuliao/model/LngLat.java index 734877d..5f1a5a9 100644 --- a/app/src/main/java/com/hbl/lewan/model/LngLat.java +++ b/app/src/main/java/com/hbl/yuliao/model/LngLat.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class LngLat { public double longitude; diff --git a/app/src/main/java/com/hbl/lewan/model/LoginBean.java b/app/src/main/java/com/hbl/yuliao/model/LoginBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/LoginBean.java rename to app/src/main/java/com/hbl/yuliao/model/LoginBean.java index c39167e..b8d1fbf 100644 --- a/app/src/main/java/com/hbl/lewan/model/LoginBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/LoginBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class LoginBean extends RosterElementEntity { diff --git a/app/src/main/java/com/hbl/lewan/model/LoginBeanJiaXu.java b/app/src/main/java/com/hbl/yuliao/model/LoginBeanJiaXu.java similarity index 87% rename from app/src/main/java/com/hbl/lewan/model/LoginBeanJiaXu.java rename to app/src/main/java/com/hbl/yuliao/model/LoginBeanJiaXu.java index 5e2b82f..cc34d11 100644 --- a/app/src/main/java/com/hbl/lewan/model/LoginBeanJiaXu.java +++ b/app/src/main/java/com/hbl/yuliao/model/LoginBeanJiaXu.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class LoginBeanJiaXu { private String loginUrl; diff --git a/app/src/main/java/com/hbl/lewan/model/LoginUserBean.java b/app/src/main/java/com/hbl/yuliao/model/LoginUserBean.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/model/LoginUserBean.java rename to app/src/main/java/com/hbl/yuliao/model/LoginUserBean.java index c2c6334..b8bc4e5 100644 --- a/app/src/main/java/com/hbl/lewan/model/LoginUserBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/LoginUserBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class LoginUserBean { diff --git a/app/src/main/java/com/hbl/lewan/model/Message54Bean.java b/app/src/main/java/com/hbl/yuliao/model/Message54Bean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/Message54Bean.java rename to app/src/main/java/com/hbl/yuliao/model/Message54Bean.java index 9f9184b..30e4618 100644 --- a/app/src/main/java/com/hbl/lewan/model/Message54Bean.java +++ b/app/src/main/java/com/hbl/yuliao/model/Message54Bean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/MessageAtQuBean.java b/app/src/main/java/com/hbl/yuliao/model/MessageAtQuBean.java similarity index 87% rename from app/src/main/java/com/hbl/lewan/model/MessageAtQuBean.java rename to app/src/main/java/com/hbl/yuliao/model/MessageAtQuBean.java index 416ce43..b7e17c4 100644 --- a/app/src/main/java/com/hbl/lewan/model/MessageAtQuBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/MessageAtQuBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class MessageAtQuBean { private String content; diff --git a/app/src/main/java/com/hbl/lewan/model/MessageBean.java b/app/src/main/java/com/hbl/yuliao/model/MessageBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/MessageBean.java rename to app/src/main/java/com/hbl/yuliao/model/MessageBean.java index 993a805..6d193c4 100644 --- a/app/src/main/java/com/hbl/lewan/model/MessageBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/MessageBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class MessageBean{ diff --git a/app/src/main/java/com/hbl/lewan/model/MessagefcmBean.java b/app/src/main/java/com/hbl/yuliao/model/MessagefcmBean.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/model/MessagefcmBean.java rename to app/src/main/java/com/hbl/yuliao/model/MessagefcmBean.java index 72a17cb..d2bb717 100644 --- a/app/src/main/java/com/hbl/lewan/model/MessagefcmBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/MessagefcmBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class MessagefcmBean { diff --git a/app/src/main/java/com/hbl/lewan/model/NearbySearchBean.java b/app/src/main/java/com/hbl/yuliao/model/NearbySearchBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/NearbySearchBean.java rename to app/src/main/java/com/hbl/yuliao/model/NearbySearchBean.java index 4428a23..572ee81 100644 --- a/app/src/main/java/com/hbl/lewan/model/NearbySearchBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/NearbySearchBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/NewsBean.java b/app/src/main/java/com/hbl/yuliao/model/NewsBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/NewsBean.java rename to app/src/main/java/com/hbl/yuliao/model/NewsBean.java index ca4fbfa..4b7b0e6 100644 --- a/app/src/main/java/com/hbl/lewan/model/NewsBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/NewsBean.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/NotifyCountBean.java b/app/src/main/java/com/hbl/yuliao/model/NotifyCountBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/NotifyCountBean.java rename to app/src/main/java/com/hbl/yuliao/model/NotifyCountBean.java index a2ad494..a78e915 100644 --- a/app/src/main/java/com/hbl/lewan/model/NotifyCountBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/NotifyCountBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import android.print.PageRange; diff --git a/app/src/main/java/com/hbl/lewan/model/NotifyExtraBean.java b/app/src/main/java/com/hbl/yuliao/model/NotifyExtraBean.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/model/NotifyExtraBean.java rename to app/src/main/java/com/hbl/yuliao/model/NotifyExtraBean.java index 165dfa4..264db65 100644 --- a/app/src/main/java/com/hbl/lewan/model/NotifyExtraBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/NotifyExtraBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; diff --git a/app/src/main/java/com/hbl/lewan/model/OauthAppBean.java b/app/src/main/java/com/hbl/yuliao/model/OauthAppBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/OauthAppBean.java rename to app/src/main/java/com/hbl/yuliao/model/OauthAppBean.java index 3ae50dd..6ca66f5 100644 --- a/app/src/main/java/com/hbl/lewan/model/OauthAppBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/OauthAppBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class OauthAppBean { diff --git a/app/src/main/java/com/hbl/lewan/model/PassWordLoginBean.java b/app/src/main/java/com/hbl/yuliao/model/PassWordLoginBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/PassWordLoginBean.java rename to app/src/main/java/com/hbl/yuliao/model/PassWordLoginBean.java index 94cfb2a..6e0f1ff 100644 --- a/app/src/main/java/com/hbl/lewan/model/PassWordLoginBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/PassWordLoginBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class PassWordLoginBean { private String phone; diff --git a/app/src/main/java/com/hbl/lewan/model/PayInfoBean.java b/app/src/main/java/com/hbl/yuliao/model/PayInfoBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/PayInfoBean.java rename to app/src/main/java/com/hbl/yuliao/model/PayInfoBean.java index 88d9ce3..34be06f 100644 --- a/app/src/main/java/com/hbl/lewan/model/PayInfoBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/PayInfoBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class PayInfoBean { diff --git a/app/src/main/java/com/hbl/lewan/model/PayInfoWxBean.java b/app/src/main/java/com/hbl/yuliao/model/PayInfoWxBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/PayInfoWxBean.java rename to app/src/main/java/com/hbl/yuliao/model/PayInfoWxBean.java index 79fc298..d5ea3b8 100644 --- a/app/src/main/java/com/hbl/lewan/model/PayInfoWxBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/PayInfoWxBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class PayInfoWxBean { diff --git a/app/src/main/java/com/hbl/lewan/model/PushBean.java b/app/src/main/java/com/hbl/yuliao/model/PushBean.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/model/PushBean.java rename to app/src/main/java/com/hbl/yuliao/model/PushBean.java index 1a0705f..dc077fd 100644 --- a/app/src/main/java/com/hbl/lewan/model/PushBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/PushBean.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/QuesBean.java b/app/src/main/java/com/hbl/yuliao/model/QuesBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/QuesBean.java rename to app/src/main/java/com/hbl/yuliao/model/QuesBean.java index a1f3a0d..f7ff728 100644 --- a/app/src/main/java/com/hbl/lewan/model/QuesBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/QuesBean.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/QuesListBean.java b/app/src/main/java/com/hbl/yuliao/model/QuesListBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/QuesListBean.java rename to app/src/main/java/com/hbl/yuliao/model/QuesListBean.java index 5f48103..16ebb8a 100644 --- a/app/src/main/java/com/hbl/lewan/model/QuesListBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/QuesListBean.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/QuestionBean.java b/app/src/main/java/com/hbl/yuliao/model/QuestionBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/QuestionBean.java rename to app/src/main/java/com/hbl/yuliao/model/QuestionBean.java index 90d9b69..66af465 100644 --- a/app/src/main/java/com/hbl/lewan/model/QuestionBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/QuestionBean.java @@ -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 { diff --git a/app/src/main/java/com/hbl/lewan/model/QuoteMessageBean.java b/app/src/main/java/com/hbl/yuliao/model/QuoteMessageBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/QuoteMessageBean.java rename to app/src/main/java/com/hbl/yuliao/model/QuoteMessageBean.java index e7fa290..3937a8d 100644 --- a/app/src/main/java/com/hbl/lewan/model/QuoteMessageBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/QuoteMessageBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/ReadBean.java b/app/src/main/java/com/hbl/yuliao/model/ReadBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/ReadBean.java rename to app/src/main/java/com/hbl/yuliao/model/ReadBean.java index d8554e7..8c12d28 100644 --- a/app/src/main/java/com/hbl/lewan/model/ReadBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ReadBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; diff --git a/app/src/main/java/com/hbl/lewan/model/ReadMessageBean.java b/app/src/main/java/com/hbl/yuliao/model/ReadMessageBean.java similarity index 90% rename from app/src/main/java/com/hbl/lewan/model/ReadMessageBean.java rename to app/src/main/java/com/hbl/yuliao/model/ReadMessageBean.java index 0a295c7..5ff8d87 100644 --- a/app/src/main/java/com/hbl/lewan/model/ReadMessageBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ReadMessageBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/ReadRxBusBean.java b/app/src/main/java/com/hbl/yuliao/model/ReadRxBusBean.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/model/ReadRxBusBean.java rename to app/src/main/java/com/hbl/yuliao/model/ReadRxBusBean.java index 09f3c6f..f9e1de8 100644 --- a/app/src/main/java/com/hbl/lewan/model/ReadRxBusBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ReadRxBusBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class ReadRxBusBean { public int type; diff --git a/app/src/main/java/com/hbl/lewan/model/RebootMessageBean.java b/app/src/main/java/com/hbl/yuliao/model/RebootMessageBean.java similarity index 87% rename from app/src/main/java/com/hbl/lewan/model/RebootMessageBean.java rename to app/src/main/java/com/hbl/yuliao/model/RebootMessageBean.java index 30662ea..76b5441 100644 --- a/app/src/main/java/com/hbl/lewan/model/RebootMessageBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RebootMessageBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class RebootMessageBean { private String content; diff --git a/app/src/main/java/com/hbl/lewan/model/RedBean.java b/app/src/main/java/com/hbl/yuliao/model/RedBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/RedBean.java rename to app/src/main/java/com/hbl/yuliao/model/RedBean.java index c4397ae..1cd4da2 100644 --- a/app/src/main/java/com/hbl/lewan/model/RedBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RedBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; diff --git a/app/src/main/java/com/hbl/lewan/model/RedLogBean.java b/app/src/main/java/com/hbl/yuliao/model/RedLogBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/RedLogBean.java rename to app/src/main/java/com/hbl/yuliao/model/RedLogBean.java index 486280f..7059d3f 100644 --- a/app/src/main/java/com/hbl/lewan/model/RedLogBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RedLogBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/RefreshTokenBean.java b/app/src/main/java/com/hbl/yuliao/model/RefreshTokenBean.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/model/RefreshTokenBean.java rename to app/src/main/java/com/hbl/yuliao/model/RefreshTokenBean.java index b162d4a..83b7549 100644 --- a/app/src/main/java/com/hbl/lewan/model/RefreshTokenBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RefreshTokenBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class RefreshTokenBean { private String refreshToken; diff --git a/app/src/main/java/com/hbl/lewan/model/RegisteredBean.java b/app/src/main/java/com/hbl/yuliao/model/RegisteredBean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/RegisteredBean.java rename to app/src/main/java/com/hbl/yuliao/model/RegisteredBean.java index fe4f527..d4501e1 100644 --- a/app/src/main/java/com/hbl/lewan/model/RegisteredBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RegisteredBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class RegisteredBean { private boolean registered; diff --git a/app/src/main/java/com/hbl/lewan/model/ReportBean.java b/app/src/main/java/com/hbl/yuliao/model/ReportBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/ReportBean.java rename to app/src/main/java/com/hbl/yuliao/model/ReportBean.java index 99c8c04..2eb3e87 100644 --- a/app/src/main/java/com/hbl/lewan/model/ReportBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/ReportBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class ReportBean { private int index; diff --git a/app/src/main/java/com/hbl/lewan/model/RosterElementEntity.java b/app/src/main/java/com/hbl/yuliao/model/RosterElementEntity.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/RosterElementEntity.java rename to app/src/main/java/com/hbl/yuliao/model/RosterElementEntity.java index 7f65cf5..ac03349 100644 --- a/app/src/main/java/com/hbl/lewan/model/RosterElementEntity.java +++ b/app/src/main/java/com/hbl/yuliao/model/RosterElementEntity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/RtcTokenBean.java b/app/src/main/java/com/hbl/yuliao/model/RtcTokenBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/RtcTokenBean.java rename to app/src/main/java/com/hbl/yuliao/model/RtcTokenBean.java index 2b9ecdb..e7ec925 100644 --- a/app/src/main/java/com/hbl/lewan/model/RtcTokenBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RtcTokenBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class RtcTokenBean { private int role; diff --git a/app/src/main/java/com/hbl/lewan/model/RtcTokenResBean.java b/app/src/main/java/com/hbl/yuliao/model/RtcTokenResBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/RtcTokenResBean.java rename to app/src/main/java/com/hbl/yuliao/model/RtcTokenResBean.java index 71a1ad6..ad684f5 100644 --- a/app/src/main/java/com/hbl/lewan/model/RtcTokenResBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RtcTokenResBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class RtcTokenResBean { diff --git a/app/src/main/java/com/hbl/lewan/model/RxBusEditMessage.java b/app/src/main/java/com/hbl/yuliao/model/RxBusEditMessage.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/RxBusEditMessage.java rename to app/src/main/java/com/hbl/yuliao/model/RxBusEditMessage.java index b57eec9..ffc6b8d 100644 --- a/app/src/main/java/com/hbl/lewan/model/RxBusEditMessage.java +++ b/app/src/main/java/com/hbl/yuliao/model/RxBusEditMessage.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class RxBusEditMessage { private String toUid; diff --git a/app/src/main/java/com/hbl/lewan/model/RxBusLoadMoreListBean.java b/app/src/main/java/com/hbl/yuliao/model/RxBusLoadMoreListBean.java similarity index 89% rename from app/src/main/java/com/hbl/lewan/model/RxBusLoadMoreListBean.java rename to app/src/main/java/com/hbl/yuliao/model/RxBusLoadMoreListBean.java index 4f2ee8e..b58b448 100644 --- a/app/src/main/java/com/hbl/lewan/model/RxBusLoadMoreListBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RxBusLoadMoreListBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class RxBusLoadMoreListBean { private int type; diff --git a/app/src/main/java/com/hbl/lewan/model/RxCommLikeBean.java b/app/src/main/java/com/hbl/yuliao/model/RxCommLikeBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/RxCommLikeBean.java rename to app/src/main/java/com/hbl/yuliao/model/RxCommLikeBean.java index a6514aa..bd8a2cb 100644 --- a/app/src/main/java/com/hbl/lewan/model/RxCommLikeBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/RxCommLikeBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class RxCommLikeBean { private String postId; diff --git a/app/src/main/java/com/hbl/lewan/model/SearchBean.java b/app/src/main/java/com/hbl/yuliao/model/SearchBean.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/model/SearchBean.java rename to app/src/main/java/com/hbl/yuliao/model/SearchBean.java index e5ac0a4..a3c76f5 100644 --- a/app/src/main/java/com/hbl/lewan/model/SearchBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/SearchBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class SearchBean { public String searchText; diff --git a/app/src/main/java/com/hbl/lewan/model/SendOrderBean.java b/app/src/main/java/com/hbl/yuliao/model/SendOrderBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/SendOrderBean.java rename to app/src/main/java/com/hbl/yuliao/model/SendOrderBean.java index 7a97a42..fd854b7 100644 --- a/app/src/main/java/com/hbl/lewan/model/SendOrderBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/SendOrderBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/hbl/lewan/model/SeqBean.java b/app/src/main/java/com/hbl/yuliao/model/SeqBean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/SeqBean.java rename to app/src/main/java/com/hbl/yuliao/model/SeqBean.java index f93a1ca..eff87f9 100644 --- a/app/src/main/java/com/hbl/lewan/model/SeqBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/SeqBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; /** * ********************** diff --git a/app/src/main/java/com/hbl/lewan/model/SeqBeanTop.java b/app/src/main/java/com/hbl/yuliao/model/SeqBeanTop.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/model/SeqBeanTop.java rename to app/src/main/java/com/hbl/yuliao/model/SeqBeanTop.java index f0ca0e2..b04dd1e 100644 --- a/app/src/main/java/com/hbl/lewan/model/SeqBeanTop.java +++ b/app/src/main/java/com/hbl/yuliao/model/SeqBeanTop.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/SetUpdatesBean.java b/app/src/main/java/com/hbl/yuliao/model/SetUpdatesBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/SetUpdatesBean.java rename to app/src/main/java/com/hbl/yuliao/model/SetUpdatesBean.java index f1644fc..0c81c11 100644 --- a/app/src/main/java/com/hbl/lewan/model/SetUpdatesBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/SetUpdatesBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/StaffServiceIdBean.java b/app/src/main/java/com/hbl/yuliao/model/StaffServiceIdBean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/StaffServiceIdBean.java rename to app/src/main/java/com/hbl/yuliao/model/StaffServiceIdBean.java index bbbea57..c5946ee 100644 --- a/app/src/main/java/com/hbl/lewan/model/StaffServiceIdBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/StaffServiceIdBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class StaffServiceIdBean { diff --git a/app/src/main/java/com/hbl/lewan/model/StatisticsBean.java b/app/src/main/java/com/hbl/yuliao/model/StatisticsBean.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/model/StatisticsBean.java rename to app/src/main/java/com/hbl/yuliao/model/StatisticsBean.java index 6e1212f..c253614 100644 --- a/app/src/main/java/com/hbl/lewan/model/StatisticsBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/StatisticsBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class StatisticsBean { diff --git a/app/src/main/java/com/hbl/lewan/model/StsCredentialsBean.java b/app/src/main/java/com/hbl/yuliao/model/StsCredentialsBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/StsCredentialsBean.java rename to app/src/main/java/com/hbl/yuliao/model/StsCredentialsBean.java index 8280b3a..0ff2fa8 100644 --- a/app/src/main/java/com/hbl/lewan/model/StsCredentialsBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/StsCredentialsBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class StsCredentialsBean { diff --git a/app/src/main/java/com/hbl/lewan/model/SystemResultBean.java b/app/src/main/java/com/hbl/yuliao/model/SystemResultBean.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/SystemResultBean.java rename to app/src/main/java/com/hbl/yuliao/model/SystemResultBean.java index b6d0794..8c1ccae 100644 --- a/app/src/main/java/com/hbl/lewan/model/SystemResultBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/SystemResultBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class SystemResultBean { diff --git a/app/src/main/java/com/hbl/lewan/model/TaskBean.java b/app/src/main/java/com/hbl/yuliao/model/TaskBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/TaskBean.java rename to app/src/main/java/com/hbl/yuliao/model/TaskBean.java index 06c6834..150ffe5 100644 --- a/app/src/main/java/com/hbl/lewan/model/TaskBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TaskBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class TaskBean { diff --git a/app/src/main/java/com/hbl/lewan/model/TeamUpdateEvent.java b/app/src/main/java/com/hbl/yuliao/model/TeamUpdateEvent.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/model/TeamUpdateEvent.java rename to app/src/main/java/com/hbl/yuliao/model/TeamUpdateEvent.java index 99c9868..9d2e54f 100644 --- a/app/src/main/java/com/hbl/lewan/model/TeamUpdateEvent.java +++ b/app/src/main/java/com/hbl/yuliao/model/TeamUpdateEvent.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/hbl/lewan/model/TiXianConfBean.java b/app/src/main/java/com/hbl/yuliao/model/TiXianConfBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/TiXianConfBean.java rename to app/src/main/java/com/hbl/yuliao/model/TiXianConfBean.java index ffa056d..4867d7a 100644 --- a/app/src/main/java/com/hbl/lewan/model/TiXianConfBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TiXianConfBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; /** * ********************** diff --git a/app/src/main/java/com/hbl/lewan/model/TiXianLogBean.java b/app/src/main/java/com/hbl/yuliao/model/TiXianLogBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/TiXianLogBean.java rename to app/src/main/java/com/hbl/yuliao/model/TiXianLogBean.java index 5924585..2fd5738 100644 --- a/app/src/main/java/com/hbl/lewan/model/TiXianLogBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TiXianLogBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; /** * ********************** diff --git a/app/src/main/java/com/hbl/lewan/model/TimeBean.java b/app/src/main/java/com/hbl/yuliao/model/TimeBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/TimeBean.java rename to app/src/main/java/com/hbl/yuliao/model/TimeBean.java index 6b77411..a317491 100644 --- a/app/src/main/java/com/hbl/lewan/model/TimeBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TimeBean.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/TopBean.java b/app/src/main/java/com/hbl/yuliao/model/TopBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/TopBean.java rename to app/src/main/java/com/hbl/yuliao/model/TopBean.java index 2950d8e..3b28f14 100644 --- a/app/src/main/java/com/hbl/lewan/model/TopBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TopBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/TopOrderBean.java b/app/src/main/java/com/hbl/yuliao/model/TopOrderBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/TopOrderBean.java rename to app/src/main/java/com/hbl/yuliao/model/TopOrderBean.java index 8cd14f9..aa50332 100644 --- a/app/src/main/java/com/hbl/lewan/model/TopOrderBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TopOrderBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; diff --git a/app/src/main/java/com/hbl/lewan/model/TopUpBean.java b/app/src/main/java/com/hbl/yuliao/model/TopUpBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/TopUpBean.java rename to app/src/main/java/com/hbl/yuliao/model/TopUpBean.java index 26d35e1..e35919f 100644 --- a/app/src/main/java/com/hbl/lewan/model/TopUpBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TopUpBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class TopUpBean { diff --git a/app/src/main/java/com/hbl/lewan/model/TransferMoneyBean.java b/app/src/main/java/com/hbl/yuliao/model/TransferMoneyBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/TransferMoneyBean.java rename to app/src/main/java/com/hbl/yuliao/model/TransferMoneyBean.java index 17f4455..7a95e90 100644 --- a/app/src/main/java/com/hbl/lewan/model/TransferMoneyBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TransferMoneyBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; /** * 转账记录 diff --git a/app/src/main/java/com/hbl/lewan/model/TrcGroupBean.java b/app/src/main/java/com/hbl/yuliao/model/TrcGroupBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/TrcGroupBean.java rename to app/src/main/java/com/hbl/yuliao/model/TrcGroupBean.java index 43b1721..f5cf6d1 100644 --- a/app/src/main/java/com/hbl/lewan/model/TrcGroupBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TrcGroupBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class TrcGroupBean { private int rtcType; diff --git a/app/src/main/java/com/hbl/lewan/model/TypeBean.java b/app/src/main/java/com/hbl/yuliao/model/TypeBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/TypeBean.java rename to app/src/main/java/com/hbl/yuliao/model/TypeBean.java index 27ba2b6..223c92a 100644 --- a/app/src/main/java/com/hbl/lewan/model/TypeBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/TypeBean.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/UserAlbumBean.java b/app/src/main/java/com/hbl/yuliao/model/UserAlbumBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/UserAlbumBean.java rename to app/src/main/java/com/hbl/yuliao/model/UserAlbumBean.java index 65f6663..56aba25 100644 --- a/app/src/main/java/com/hbl/lewan/model/UserAlbumBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/UserAlbumBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/hbl/lewan/model/UserRankBean.java b/app/src/main/java/com/hbl/yuliao/model/UserRankBean.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/model/UserRankBean.java rename to app/src/main/java/com/hbl/yuliao/model/UserRankBean.java index f687f0c..7dde54b 100644 --- a/app/src/main/java/com/hbl/lewan/model/UserRankBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/UserRankBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class UserRankBean { diff --git a/app/src/main/java/com/hbl/lewan/model/UserShareBean.java b/app/src/main/java/com/hbl/yuliao/model/UserShareBean.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/model/UserShareBean.java rename to app/src/main/java/com/hbl/yuliao/model/UserShareBean.java index 2bfd241..c09da85 100644 --- a/app/src/main/java/com/hbl/lewan/model/UserShareBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/UserShareBean.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/model/UserUpdateEvent.java b/app/src/main/java/com/hbl/yuliao/model/UserUpdateEvent.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/model/UserUpdateEvent.java rename to app/src/main/java/com/hbl/yuliao/model/UserUpdateEvent.java index cf0097f..70e2515 100644 --- a/app/src/main/java/com/hbl/lewan/model/UserUpdateEvent.java +++ b/app/src/main/java/com/hbl/yuliao/model/UserUpdateEvent.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/hbl/lewan/model/UsersExistBean.java b/app/src/main/java/com/hbl/yuliao/model/UsersExistBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/UsersExistBean.java rename to app/src/main/java/com/hbl/yuliao/model/UsersExistBean.java index 001e1cd..43cb6ce 100644 --- a/app/src/main/java/com/hbl/lewan/model/UsersExistBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/UsersExistBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class UsersExistBean { diff --git a/app/src/main/java/com/hbl/lewan/model/VersionBean.java b/app/src/main/java/com/hbl/yuliao/model/VersionBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/VersionBean.java rename to app/src/main/java/com/hbl/yuliao/model/VersionBean.java index aa55d3a..515a9ce 100644 --- a/app/src/main/java/com/hbl/lewan/model/VersionBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/VersionBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class VersionBean { diff --git a/app/src/main/java/com/hbl/lewan/model/WalletBean.java b/app/src/main/java/com/hbl/yuliao/model/WalletBean.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/model/WalletBean.java rename to app/src/main/java/com/hbl/yuliao/model/WalletBean.java index fd8632c..788f46c 100644 --- a/app/src/main/java/com/hbl/lewan/model/WalletBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/WalletBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class WalletBean { diff --git a/app/src/main/java/com/hbl/lewan/model/WithCashBean.java b/app/src/main/java/com/hbl/yuliao/model/WithCashBean.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/model/WithCashBean.java rename to app/src/main/java/com/hbl/yuliao/model/WithCashBean.java index 67414ac..c8e6b9b 100644 --- a/app/src/main/java/com/hbl/lewan/model/WithCashBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/WithCashBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class WithCashBean { diff --git a/app/src/main/java/com/hbl/lewan/model/WithdrawCashBean.java b/app/src/main/java/com/hbl/yuliao/model/WithdrawCashBean.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/model/WithdrawCashBean.java rename to app/src/main/java/com/hbl/yuliao/model/WithdrawCashBean.java index 5df9079..044f72e 100644 --- a/app/src/main/java/com/hbl/lewan/model/WithdrawCashBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/WithdrawCashBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class WithdrawCashBean { diff --git a/app/src/main/java/com/hbl/lewan/model/WorldChatBean.java b/app/src/main/java/com/hbl/yuliao/model/WorldChatBean.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/model/WorldChatBean.java rename to app/src/main/java/com/hbl/yuliao/model/WorldChatBean.java index 109534b..deada08 100644 --- a/app/src/main/java/com/hbl/lewan/model/WorldChatBean.java +++ b/app/src/main/java/com/hbl/yuliao/model/WorldChatBean.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.model; +package com.hbl.yuliao.model; public class WorldChatBean { diff --git a/app/src/main/java/com/hbl/lewan/network/Api.java b/app/src/main/java/com/hbl/yuliao/network/Api.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/network/Api.java rename to app/src/main/java/com/hbl/yuliao/network/Api.java index 33d10af..f7f282e 100644 --- a/app/src/main/java/com/hbl/lewan/network/Api.java +++ b/app/src/main/java/com/hbl/yuliao/network/Api.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/network/ApiService.java b/app/src/main/java/com/hbl/yuliao/network/ApiService.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/network/ApiService.java rename to app/src/main/java/com/hbl/yuliao/network/ApiService.java index 9bd45ef..c0f9f8a 100644 --- a/app/src/main/java/com/hbl/lewan/network/ApiService.java +++ b/app/src/main/java/com/hbl/yuliao/network/ApiService.java @@ -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>> unclaimed(@Path("userId") String userId, @Query("page") int page, @Query("size") int size, @Query("groupId") String groupId); + + + } diff --git a/app/src/main/java/com/hbl/lewan/network/BaseApi.java b/app/src/main/java/com/hbl/yuliao/network/BaseApi.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/network/BaseApi.java rename to app/src/main/java/com/hbl/yuliao/network/BaseApi.java index d2fd253..a9b69ab 100644 --- a/app/src/main/java/com/hbl/lewan/network/BaseApi.java +++ b/app/src/main/java/com/hbl/yuliao/network/BaseApi.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.network; +package com.hbl.yuliao.network; import okhttp3.OkHttpClient; import retrofit2.Retrofit; diff --git a/app/src/main/java/com/hbl/lewan/network/BaseObserver.java b/app/src/main/java/com/hbl/yuliao/network/BaseObserver.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/network/BaseObserver.java rename to app/src/main/java/com/hbl/yuliao/network/BaseObserver.java index 84e65e4..865bd4a 100644 --- a/app/src/main/java/com/hbl/lewan/network/BaseObserver.java +++ b/app/src/main/java/com/hbl/yuliao/network/BaseObserver.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/network/BaseObserver1.java b/app/src/main/java/com/hbl/yuliao/network/BaseObserver1.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/network/BaseObserver1.java rename to app/src/main/java/com/hbl/yuliao/network/BaseObserver1.java index 72aaed6..67addce 100644 --- a/app/src/main/java/com/hbl/lewan/network/BaseObserver1.java +++ b/app/src/main/java/com/hbl/yuliao/network/BaseObserver1.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.network; +package com.hbl.yuliao.network; import com.google.gson.JsonParseException; diff --git a/app/src/main/java/com/hbl/lewan/network/BaseObserverNew.java b/app/src/main/java/com/hbl/yuliao/network/BaseObserverNew.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/network/BaseObserverNew.java rename to app/src/main/java/com/hbl/yuliao/network/BaseObserverNew.java index 996e198..5275048 100644 --- a/app/src/main/java/com/hbl/lewan/network/BaseObserverNew.java +++ b/app/src/main/java/com/hbl/yuliao/network/BaseObserverNew.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/network/HeaderInterceptor.java b/app/src/main/java/com/hbl/yuliao/network/HeaderInterceptor.java similarity index 63% rename from app/src/main/java/com/hbl/lewan/network/HeaderInterceptor.java rename to app/src/main/java/com/hbl/yuliao/network/HeaderInterceptor.java index 4989123..a4ddf8c 100644 --- a/app/src/main/java/com/hbl/lewan/network/HeaderInterceptor.java +++ b/app/src/main/java/com/hbl/yuliao/network/HeaderInterceptor.java @@ -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(); diff --git a/app/src/main/java/com/hbl/lewan/network/Result.java b/app/src/main/java/com/hbl/yuliao/network/Result.java similarity index 87% rename from app/src/main/java/com/hbl/lewan/network/Result.java rename to app/src/main/java/com/hbl/yuliao/network/Result.java index 3783207..9dea96a 100644 --- a/app/src/main/java/com/hbl/lewan/network/Result.java +++ b/app/src/main/java/com/hbl/yuliao/network/Result.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/network/ResultNew.java b/app/src/main/java/com/hbl/yuliao/network/ResultNew.java similarity index 86% rename from app/src/main/java/com/hbl/lewan/network/ResultNew.java rename to app/src/main/java/com/hbl/yuliao/network/ResultNew.java index 99a0896..00b5eb5 100644 --- a/app/src/main/java/com/hbl/lewan/network/ResultNew.java +++ b/app/src/main/java/com/hbl/yuliao/network/ResultNew.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/pay/CollectionActivity.java b/app/src/main/java/com/hbl/yuliao/pay/CollectionActivity.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/pay/CollectionActivity.java rename to app/src/main/java/com/hbl/yuliao/pay/CollectionActivity.java index 7968b6b..17c6ba2 100644 --- a/app/src/main/java/com/hbl/lewan/pay/CollectionActivity.java +++ b/app/src/main/java/com/hbl/yuliao/pay/CollectionActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/pay/CollectionAndPaymentActivity.java b/app/src/main/java/com/hbl/yuliao/pay/CollectionAndPaymentActivity.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/pay/CollectionAndPaymentActivity.java rename to app/src/main/java/com/hbl/yuliao/pay/CollectionAndPaymentActivity.java index 1af6afa..6d276fd 100644 --- a/app/src/main/java/com/hbl/lewan/pay/CollectionAndPaymentActivity.java +++ b/app/src/main/java/com/hbl/yuliao/pay/CollectionAndPaymentActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanActivity.java b/app/src/main/java/com/hbl/yuliao/pay/LipinDuiHuanActivity.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanActivity.java rename to app/src/main/java/com/hbl/yuliao/pay/LipinDuiHuanActivity.java index 55a0585..eecdf83 100644 --- a/app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanActivity.java +++ b/app/src/main/java/com/hbl/yuliao/pay/LipinDuiHuanActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanSuccessActivity.java b/app/src/main/java/com/hbl/yuliao/pay/LipinDuiHuanSuccessActivity.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanSuccessActivity.java rename to app/src/main/java/com/hbl/yuliao/pay/LipinDuiHuanSuccessActivity.java index 3f731ed..ad43e7f 100644 --- a/app/src/main/java/com/hbl/lewan/pay/LipinDuiHuanSuccessActivity.java +++ b/app/src/main/java/com/hbl/yuliao/pay/LipinDuiHuanSuccessActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/pay/NfcReaderActivity.java b/app/src/main/java/com/hbl/yuliao/pay/NfcReaderActivity.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/pay/NfcReaderActivity.java rename to app/src/main/java/com/hbl/yuliao/pay/NfcReaderActivity.java index dc39ae6..d589433 100644 --- a/app/src/main/java/com/hbl/lewan/pay/NfcReaderActivity.java +++ b/app/src/main/java/com/hbl/yuliao/pay/NfcReaderActivity.java @@ -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); diff --git a/app/src/main/java/com/hbl/lewan/pay/PaymentActivity.java b/app/src/main/java/com/hbl/yuliao/pay/PaymentActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/pay/PaymentActivity.java rename to app/src/main/java/com/hbl/yuliao/pay/PaymentActivity.java index efff8f9..83d21b8 100644 --- a/app/src/main/java/com/hbl/lewan/pay/PaymentActivity.java +++ b/app/src/main/java/com/hbl/yuliao/pay/PaymentActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java b/app/src/main/java/com/hbl/yuliao/pay/PaymentActivity1.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java rename to app/src/main/java/com/hbl/yuliao/pay/PaymentActivity1.java index 65e4b33..4c8392e 100644 --- a/app/src/main/java/com/hbl/lewan/pay/PaymentActivity1.java +++ b/app/src/main/java/com/hbl/yuliao/pay/PaymentActivity1.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/pay/PaymentSuccessActivity.java b/app/src/main/java/com/hbl/yuliao/pay/PaymentSuccessActivity.java similarity index 93% rename from app/src/main/java/com/hbl/lewan/pay/PaymentSuccessActivity.java rename to app/src/main/java/com/hbl/yuliao/pay/PaymentSuccessActivity.java index feb22c1..aae6cd3 100644 --- a/app/src/main/java/com/hbl/lewan/pay/PaymentSuccessActivity.java +++ b/app/src/main/java/com/hbl/yuliao/pay/PaymentSuccessActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/push/HWPushMessageService.java b/app/src/main/java/com/hbl/yuliao/push/HWPushMessageService.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/push/HWPushMessageService.java rename to app/src/main/java/com/hbl/yuliao/push/HWPushMessageService.java index 7106aac..ab5b964 100644 --- a/app/src/main/java/com/hbl/lewan/push/HWPushMessageService.java +++ b/app/src/main/java/com/hbl/yuliao/push/HWPushMessageService.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/push/PushMessageHandler.java b/app/src/main/java/com/hbl/yuliao/push/PushMessageHandler.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/push/PushMessageHandler.java rename to app/src/main/java/com/hbl/yuliao/push/PushMessageHandler.java index 45e8a9f..78fa554 100644 --- a/app/src/main/java/com/hbl/lewan/push/PushMessageHandler.java +++ b/app/src/main/java/com/hbl/yuliao/push/PushMessageHandler.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/push/PushUserInfoProvider.java b/app/src/main/java/com/hbl/yuliao/push/PushUserInfoProvider.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/push/PushUserInfoProvider.java rename to app/src/main/java/com/hbl/yuliao/push/PushUserInfoProvider.java index 885c98c..9fa50a1 100644 --- a/app/src/main/java/com/hbl/lewan/push/PushUserInfoProvider.java +++ b/app/src/main/java/com/hbl/yuliao/push/PushUserInfoProvider.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java b/app/src/main/java/com/hbl/yuliao/redpack/ReceiveRedPacketActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java rename to app/src/main/java/com/hbl/yuliao/redpack/ReceiveRedPacketActivity.java index 5961179..fc50d8a 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java +++ b/app/src/main/java/com/hbl/yuliao/redpack/ReceiveRedPacketActivity.java @@ -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(ReceiveRedPacketActivity.this, R.layout.item_red_list, titles) { diff --git a/app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java b/app/src/main/java/com/hbl/yuliao/redpack/SendGiftRedPacketActivity.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java rename to app/src/main/java/com/hbl/yuliao/redpack/SendGiftRedPacketActivity.java index d4ea8d8..c011ff3 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java +++ b/app/src/main/java/com/hbl/yuliao/redpack/SendGiftRedPacketActivity.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java b/app/src/main/java/com/hbl/yuliao/redpack/SendRedPacketActivity.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java rename to app/src/main/java/com/hbl/yuliao/redpack/SendRedPacketActivity.java index 027a1fe..883ab82 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java +++ b/app/src/main/java/com/hbl/yuliao/redpack/SendRedPacketActivity.java @@ -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, diff --git a/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java b/app/src/main/java/com/hbl/yuliao/redpack/TransferAccountsActivity.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java rename to app/src/main/java/com/hbl/yuliao/redpack/TransferAccountsActivity.java index 09712cf..9c14722 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java +++ b/app/src/main/java/com/hbl/yuliao/redpack/TransferAccountsActivity.java @@ -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>() { @Override public void onSuccess(Result 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>() { + .subscribe(new BaseObserver<>() { @Override public void onSuccess(Result 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>() { + .subscribe(new BaseObserver<>() { @Override public void onSuccess(Result feedbackResp) { diff --git a/app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java b/app/src/main/java/com/hbl/yuliao/redpack/TransferInfoActivity.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java rename to app/src/main/java/com/hbl/yuliao/redpack/TransferInfoActivity.java index 0970b2e..5fb8a82 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java +++ b/app/src/main/java/com/hbl/yuliao/redpack/TransferInfoActivity.java @@ -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); diff --git a/app/src/main/java/com/hbl/lewan/repository/LoginUserRepository.java b/app/src/main/java/com/hbl/yuliao/repository/LoginUserRepository.java similarity index 86% rename from app/src/main/java/com/hbl/lewan/repository/LoginUserRepository.java rename to app/src/main/java/com/hbl/yuliao/repository/LoginUserRepository.java index e940a1f..b34801a 100644 --- a/app/src/main/java/com/hbl/lewan/repository/LoginUserRepository.java +++ b/app/src/main/java/com/hbl/yuliao/repository/LoginUserRepository.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/utils/AdaptScreenUtils.java b/app/src/main/java/com/hbl/yuliao/utils/AdaptScreenUtils.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/utils/AdaptScreenUtils.java rename to app/src/main/java/com/hbl/yuliao/utils/AdaptScreenUtils.java index 68b1c52..de52b8d 100644 --- a/app/src/main/java/com/hbl/lewan/utils/AdaptScreenUtils.java +++ b/app/src/main/java/com/hbl/yuliao/utils/AdaptScreenUtils.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/utils/AnimUtil.java b/app/src/main/java/com/hbl/yuliao/utils/AnimUtil.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/utils/AnimUtil.java rename to app/src/main/java/com/hbl/yuliao/utils/AnimUtil.java index 923ffb0..03c7aa8 100644 --- a/app/src/main/java/com/hbl/lewan/utils/AnimUtil.java +++ b/app/src/main/java/com/hbl/yuliao/utils/AnimUtil.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import android.view.View; diff --git a/app/src/main/java/com/hbl/lewan/utils/AppUtils.java b/app/src/main/java/com/hbl/yuliao/utils/AppUtils.java similarity index 91% rename from app/src/main/java/com/hbl/lewan/utils/AppUtils.java rename to app/src/main/java/com/hbl/yuliao/utils/AppUtils.java index 14eb52c..35f175b 100644 --- a/app/src/main/java/com/hbl/lewan/utils/AppUtils.java +++ b/app/src/main/java/com/hbl/yuliao/utils/AppUtils.java @@ -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); - } +// } } /** diff --git a/app/src/main/java/com/hbl/lewan/utils/CharInputFilter.java b/app/src/main/java/com/hbl/yuliao/utils/CharInputFilter.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/utils/CharInputFilter.java rename to app/src/main/java/com/hbl/yuliao/utils/CharInputFilter.java index 34f5198..ae847a9 100644 --- a/app/src/main/java/com/hbl/lewan/utils/CharInputFilter.java +++ b/app/src/main/java/com/hbl/yuliao/utils/CharInputFilter.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import android.text.InputFilter; import android.text.Spanned; diff --git a/app/src/main/java/com/hbl/lewan/utils/CommonUtils.java b/app/src/main/java/com/hbl/yuliao/utils/CommonUtils.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/utils/CommonUtils.java rename to app/src/main/java/com/hbl/yuliao/utils/CommonUtils.java index a71806c..a6d2020 100644 --- a/app/src/main/java/com/hbl/lewan/utils/CommonUtils.java +++ b/app/src/main/java/com/hbl/yuliao/utils/CommonUtils.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import java.lang.reflect.Method; import java.math.BigDecimal; diff --git a/app/src/main/java/com/hbl/lewan/utils/Constant.java b/app/src/main/java/com/hbl/yuliao/utils/Constant.java similarity index 97% rename from app/src/main/java/com/hbl/lewan/utils/Constant.java rename to app/src/main/java/com/hbl/yuliao/utils/Constant.java index dba5e7e..68ccefe 100644 --- a/app/src/main/java/com/hbl/lewan/utils/Constant.java +++ b/app/src/main/java/com/hbl/yuliao/utils/Constant.java @@ -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 { diff --git a/app/src/main/java/com/hbl/lewan/utils/DataUtils.java b/app/src/main/java/com/hbl/yuliao/utils/DataUtils.java similarity index 95% rename from app/src/main/java/com/hbl/lewan/utils/DataUtils.java rename to app/src/main/java/com/hbl/yuliao/utils/DataUtils.java index c5ee2cc..dbadb19 100644 --- a/app/src/main/java/com/hbl/lewan/utils/DataUtils.java +++ b/app/src/main/java/com/hbl/yuliao/utils/DataUtils.java @@ -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; + } + + } /** * 实现文本复制功能 diff --git a/app/src/main/java/com/hbl/lewan/utils/DateUtil.java b/app/src/main/java/com/hbl/yuliao/utils/DateUtil.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/utils/DateUtil.java rename to app/src/main/java/com/hbl/yuliao/utils/DateUtil.java index 3f4fcb6..7310ff5 100644 --- a/app/src/main/java/com/hbl/lewan/utils/DateUtil.java +++ b/app/src/main/java/com/hbl/yuliao/utils/DateUtil.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/hbl/lewan/utils/FileUtils.java b/app/src/main/java/com/hbl/yuliao/utils/FileUtils.java similarity index 96% rename from app/src/main/java/com/hbl/lewan/utils/FileUtils.java rename to app/src/main/java/com/hbl/yuliao/utils/FileUtils.java index 29c37c9..39378a0 100644 --- a/app/src/main/java/com/hbl/lewan/utils/FileUtils.java +++ b/app/src/main/java/com/hbl/yuliao/utils/FileUtils.java @@ -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; diff --git a/app/src/main/java/com/hbl/lewan/utils/GetAndroidUniqueMark.java b/app/src/main/java/com/hbl/yuliao/utils/GetAndroidUniqueMark.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/utils/GetAndroidUniqueMark.java rename to app/src/main/java/com/hbl/yuliao/utils/GetAndroidUniqueMark.java index b9e755a..36943cb 100644 --- a/app/src/main/java/com/hbl/lewan/utils/GetAndroidUniqueMark.java +++ b/app/src/main/java/com/hbl/yuliao/utils/GetAndroidUniqueMark.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/hbl/lewan/utils/GsonUtils.java b/app/src/main/java/com/hbl/yuliao/utils/GsonUtils.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/utils/GsonUtils.java rename to app/src/main/java/com/hbl/yuliao/utils/GsonUtils.java index 7629038..9f1e040 100644 --- a/app/src/main/java/com/hbl/lewan/utils/GsonUtils.java +++ b/app/src/main/java/com/hbl/yuliao/utils/GsonUtils.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/hbl/lewan/utils/ImageCacheLoader.java b/app/src/main/java/com/hbl/yuliao/utils/ImageCacheLoader.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/utils/ImageCacheLoader.java rename to app/src/main/java/com/hbl/yuliao/utils/ImageCacheLoader.java index b860180..ca1968a 100644 --- a/app/src/main/java/com/hbl/lewan/utils/ImageCacheLoader.java +++ b/app/src/main/java/com/hbl/yuliao/utils/ImageCacheLoader.java @@ -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; /** diff --git a/app/src/main/java/com/hbl/lewan/utils/ImageLoader.java b/app/src/main/java/com/hbl/yuliao/utils/ImageLoader.java similarity index 92% rename from app/src/main/java/com/hbl/lewan/utils/ImageLoader.java rename to app/src/main/java/com/hbl/yuliao/utils/ImageLoader.java index 8378060..4b27c43 100644 --- a/app/src/main/java/com/hbl/lewan/utils/ImageLoader.java +++ b/app/src/main/java/com/hbl/yuliao/utils/ImageLoader.java @@ -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. diff --git a/app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelper.java b/app/src/main/java/com/hbl/yuliao/utils/ItemDragTouchHelper.java similarity index 94% rename from app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelper.java rename to app/src/main/java/com/hbl/yuliao/utils/ItemDragTouchHelper.java index bfbd418..8035be8 100644 --- a/app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelper.java +++ b/app/src/main/java/com/hbl/yuliao/utils/ItemDragTouchHelper.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelperCallback.java b/app/src/main/java/com/hbl/yuliao/utils/ItemDragTouchHelperCallback.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelperCallback.java rename to app/src/main/java/com/hbl/yuliao/utils/ItemDragTouchHelperCallback.java index ddcb269..54597b1 100644 --- a/app/src/main/java/com/hbl/lewan/utils/ItemDragTouchHelperCallback.java +++ b/app/src/main/java/com/hbl/yuliao/utils/ItemDragTouchHelperCallback.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/hbl/lewan/utils/KeyboardUtil.java b/app/src/main/java/com/hbl/yuliao/utils/KeyboardUtil.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/utils/KeyboardUtil.java rename to app/src/main/java/com/hbl/yuliao/utils/KeyboardUtil.java index f9cd4e8..0d73565 100644 --- a/app/src/main/java/com/hbl/lewan/utils/KeyboardUtil.java +++ b/app/src/main/java/com/hbl/yuliao/utils/KeyboardUtil.java @@ -1,4 +1,4 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/hbl/lewan/utils/LogUtils.java b/app/src/main/java/com/hbl/yuliao/utils/LogUtils.java similarity index 98% rename from app/src/main/java/com/hbl/lewan/utils/LogUtils.java rename to app/src/main/java/com/hbl/yuliao/utils/LogUtils.java index 01dd50e..f713704 100644 --- a/app/src/main/java/com/hbl/lewan/utils/LogUtils.java +++ b/app/src/main/java/com/hbl/yuliao/utils/LogUtils.java @@ -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; /** diff --git a/app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java b/app/src/main/java/com/hbl/yuliao/utils/QRCodeScheme.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java rename to app/src/main/java/com/hbl/yuliao/utils/QRCodeScheme.java index 00f6b66..14b119c 100644 --- a/app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java +++ b/app/src/main/java/com/hbl/yuliao/utils/QRCodeScheme.java @@ -1,5 +1,5 @@ -package com.hbl.lewan.utils; +package com.hbl.yuliao.utils; import android.util.Log; diff --git a/app/src/main/java/com/hbl/lewan/utils/ScreenUtils.java b/app/src/main/java/com/hbl/yuliao/utils/ScreenUtils.java similarity index 99% rename from app/src/main/java/com/hbl/lewan/utils/ScreenUtils.java rename to app/src/main/java/com/hbl/yuliao/utils/ScreenUtils.java index cfdc9dd..5d6cad2 100644 --- a/app/src/main/java/com/hbl/lewan/utils/ScreenUtils.java +++ b/app/src/main/java/com/hbl/yuliao/utils/ScreenUtils.java @@ -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; /** * 
diff --git a/app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java b/app/src/main/java/com/hbl/yuliao/utils/ShareDateUtils.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java
rename to app/src/main/java/com/hbl/yuliao/utils/ShareDateUtils.java
index ae23106..452dcb1 100644
--- a/app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java
+++ b/app/src/main/java/com/hbl/yuliao/utils/ShareDateUtils.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/utils/SoftHideKeyBoardUtil.java b/app/src/main/java/com/hbl/yuliao/utils/SoftHideKeyBoardUtil.java
similarity index 99%
rename from app/src/main/java/com/hbl/lewan/utils/SoftHideKeyBoardUtil.java
rename to app/src/main/java/com/hbl/yuliao/utils/SoftHideKeyBoardUtil.java
index 9db84ae..e84773e 100644
--- a/app/src/main/java/com/hbl/lewan/utils/SoftHideKeyBoardUtil.java
+++ b/app/src/main/java/com/hbl/yuliao/utils/SoftHideKeyBoardUtil.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.utils;
+package com.hbl.yuliao.utils;
 
 import android.app.Activity;
 import android.graphics.Rect;
diff --git a/app/src/main/java/com/hbl/lewan/utils/StickyTopicScroller.java b/app/src/main/java/com/hbl/yuliao/utils/StickyTopicScroller.java
similarity index 96%
rename from app/src/main/java/com/hbl/lewan/utils/StickyTopicScroller.java
rename to app/src/main/java/com/hbl/yuliao/utils/StickyTopicScroller.java
index 1d21743..38ca745 100644
--- a/app/src/main/java/com/hbl/lewan/utils/StickyTopicScroller.java
+++ b/app/src/main/java/com/hbl/yuliao/utils/StickyTopicScroller.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.utils;
+package com.hbl.yuliao.utils;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
diff --git a/app/src/main/java/com/hbl/lewan/utils/TaiWanIDCardUtils.java b/app/src/main/java/com/hbl/yuliao/utils/TaiWanIDCardUtils.java
similarity index 98%
rename from app/src/main/java/com/hbl/lewan/utils/TaiWanIDCardUtils.java
rename to app/src/main/java/com/hbl/yuliao/utils/TaiWanIDCardUtils.java
index 3cdad07..94d96ba 100644
--- a/app/src/main/java/com/hbl/lewan/utils/TaiWanIDCardUtils.java
+++ b/app/src/main/java/com/hbl/yuliao/utils/TaiWanIDCardUtils.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.utils;
+package com.hbl.yuliao.utils;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/hbl/lewan/utils/ToolKits.java b/app/src/main/java/com/hbl/yuliao/utils/ToolKits.java
similarity index 99%
rename from app/src/main/java/com/hbl/lewan/utils/ToolKits.java
rename to app/src/main/java/com/hbl/yuliao/utils/ToolKits.java
index 8367af9..7e4dbde 100644
--- a/app/src/main/java/com/hbl/lewan/utils/ToolKits.java
+++ b/app/src/main/java/com/hbl/yuliao/utils/ToolKits.java
@@ -1,5 +1,5 @@
 
-package com.hbl.lewan.utils;
+package com.hbl.yuliao.utils;
 
 import android.app.Activity;
 import android.content.ClipData;
diff --git a/app/src/main/java/com/hbl/lewan/utils/play/AmountBean.java b/app/src/main/java/com/hbl/yuliao/utils/play/AmountBean.java
similarity index 93%
rename from app/src/main/java/com/hbl/lewan/utils/play/AmountBean.java
rename to app/src/main/java/com/hbl/yuliao/utils/play/AmountBean.java
index 39329c6..a656101 100644
--- a/app/src/main/java/com/hbl/lewan/utils/play/AmountBean.java
+++ b/app/src/main/java/com/hbl/yuliao/utils/play/AmountBean.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.utils.play;
+package com.hbl.yuliao.utils.play;
 
 public class AmountBean {
 
diff --git a/app/src/main/java/com/hbl/lewan/utils/play/PlaySound.java b/app/src/main/java/com/hbl/yuliao/utils/play/PlaySound.java
similarity index 99%
rename from app/src/main/java/com/hbl/lewan/utils/play/PlaySound.java
rename to app/src/main/java/com/hbl/yuliao/utils/play/PlaySound.java
index 86ba62a..0efd75c 100644
--- a/app/src/main/java/com/hbl/lewan/utils/play/PlaySound.java
+++ b/app/src/main/java/com/hbl/yuliao/utils/play/PlaySound.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.utils.play;
+package com.hbl.yuliao.utils.play;
 
 
 public class PlaySound {
diff --git a/app/src/main/java/com/hbl/lewan/utils/play/VoiceUtils.java b/app/src/main/java/com/hbl/yuliao/utils/play/VoiceUtils.java
similarity index 98%
rename from app/src/main/java/com/hbl/lewan/utils/play/VoiceUtils.java
rename to app/src/main/java/com/hbl/yuliao/utils/play/VoiceUtils.java
index 31cd910..9b74af5 100644
--- a/app/src/main/java/com/hbl/lewan/utils/play/VoiceUtils.java
+++ b/app/src/main/java/com/hbl/yuliao/utils/play/VoiceUtils.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/CircleFragment.java b/app/src/main/java/com/hbl/yuliao/voom/CircleFragment.java
similarity index 96%
rename from app/src/main/java/com/hbl/lewan/voom/CircleFragment.java
rename to app/src/main/java/com/hbl/yuliao/voom/CircleFragment.java
index f4e389d..50ce35e 100644
--- a/app/src/main/java/com/hbl/lewan/voom/CircleFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/CircleFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/CirclePicFragment.java b/app/src/main/java/com/hbl/yuliao/voom/CirclePicFragment.java
similarity index 93%
rename from app/src/main/java/com/hbl/lewan/voom/CirclePicFragment.java
rename to app/src/main/java/com/hbl/yuliao/voom/CirclePicFragment.java
index 9b8b049..8a0ff5c 100644
--- a/app/src/main/java/com/hbl/lewan/voom/CirclePicFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/CirclePicFragment.java
@@ -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;
 
diff --git a/app/src/main/java/com/hbl/lewan/voom/CommentFragment.java b/app/src/main/java/com/hbl/yuliao/voom/CommentFragment.java
similarity index 95%
rename from app/src/main/java/com/hbl/lewan/voom/CommentFragment.java
rename to app/src/main/java/com/hbl/yuliao/voom/CommentFragment.java
index 7d6273d..b36ef0f 100644
--- a/app/src/main/java/com/hbl/lewan/voom/CommentFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/CommentFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/LikeFragment.java b/app/src/main/java/com/hbl/yuliao/voom/LikeFragment.java
similarity index 92%
rename from app/src/main/java/com/hbl/lewan/voom/LikeFragment.java
rename to app/src/main/java/com/hbl/yuliao/voom/LikeFragment.java
index 1d9346c..4284ada 100644
--- a/app/src/main/java/com/hbl/lewan/voom/LikeFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/LikeFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/MessageActivity.java b/app/src/main/java/com/hbl/yuliao/voom/MessageActivity.java
similarity index 95%
rename from app/src/main/java/com/hbl/lewan/voom/MessageActivity.java
rename to app/src/main/java/com/hbl/yuliao/voom/MessageActivity.java
index 721f776..ad6a074 100644
--- a/app/src/main/java/com/hbl/lewan/voom/MessageActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/MessageActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/PushActivity.java b/app/src/main/java/com/hbl/yuliao/voom/PushActivity.java
similarity index 98%
rename from app/src/main/java/com/hbl/lewan/voom/PushActivity.java
rename to app/src/main/java/com/hbl/yuliao/voom/PushActivity.java
index 6e17cf6..c47a441 100644
--- a/app/src/main/java/com/hbl/lewan/voom/PushActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/PushActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/TiktoInfokActivity.java b/app/src/main/java/com/hbl/yuliao/voom/TiktoInfokActivity.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/voom/TiktoInfokActivity.java
rename to app/src/main/java/com/hbl/yuliao/voom/TiktoInfokActivity.java
index 8ade97a..7c7b854 100644
--- a/app/src/main/java/com/hbl/lewan/voom/TiktoInfokActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/TiktoInfokActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/TiktokActivity.java b/app/src/main/java/com/hbl/yuliao/voom/TiktokActivity.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/voom/TiktokActivity.java
rename to app/src/main/java/com/hbl/yuliao/voom/TiktokActivity.java
index 8b39423..c17caec 100644
--- a/app/src/main/java/com/hbl/lewan/voom/TiktokActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/TiktokActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/TiktokActivityMe.java b/app/src/main/java/com/hbl/yuliao/voom/TiktokActivityMe.java
similarity index 96%
rename from app/src/main/java/com/hbl/lewan/voom/TiktokActivityMe.java
rename to app/src/main/java/com/hbl/yuliao/voom/TiktokActivityMe.java
index 763bf26..1dda917 100644
--- a/app/src/main/java/com/hbl/lewan/voom/TiktokActivityMe.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/TiktokActivityMe.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/VoomFragment.java b/app/src/main/java/com/hbl/yuliao/voom/VoomFragment.java
similarity index 89%
rename from app/src/main/java/com/hbl/lewan/voom/VoomFragment.java
rename to app/src/main/java/com/hbl/yuliao/voom/VoomFragment.java
index aca117a..ec5a202 100644
--- a/app/src/main/java/com/hbl/lewan/voom/VoomFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/VoomFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment1.java b/app/src/main/java/com/hbl/yuliao/voom/comm/CircleFragment1.java
similarity index 95%
rename from app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment1.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/CircleFragment1.java
index 14969b9..4810dc8 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment1.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/CircleFragment1.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment2.java b/app/src/main/java/com/hbl/yuliao/voom/comm/CircleFragment2.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment2.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/CircleFragment2.java
index 7d34719..22d2698 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment2.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/CircleFragment2.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/CusVideoView.java b/app/src/main/java/com/hbl/yuliao/voom/comm/CusVideoView.java
similarity index 96%
rename from app/src/main/java/com/hbl/lewan/voom/comm/CusVideoView.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/CusVideoView.java
index a222064..29469a9 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/CusVideoView.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/CusVideoView.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.voom.comm;
+package com.hbl.yuliao.voom.comm;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/CustomLayoutManager.java b/app/src/main/java/com/hbl/yuliao/voom/comm/CustomLayoutManager.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/voom/comm/CustomLayoutManager.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/CustomLayoutManager.java
index e119937..e1f6faa 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/CustomLayoutManager.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/CustomLayoutManager.java
@@ -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
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/OnPageSlideListener.java b/app/src/main/java/com/hbl/yuliao/voom/comm/OnPageSlideListener.java
similarity index 91%
rename from app/src/main/java/com/hbl/lewan/voom/comm/OnPageSlideListener.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/OnPageSlideListener.java
index 9c4ffb9..eb73a04 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/OnPageSlideListener.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/OnPageSlideListener.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.voom.comm;
+package com.hbl.yuliao.voom.comm;
 
 /**
  * 作者：created by Jarchie
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/OnViewPagerListener.java b/app/src/main/java/com/hbl/yuliao/voom/comm/OnViewPagerListener.java
similarity index 92%
rename from app/src/main/java/com/hbl/lewan/voom/comm/OnViewPagerListener.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/OnViewPagerListener.java
index e04deea..2fbe171 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/OnViewPagerListener.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/OnViewPagerListener.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.voom.comm;
+package com.hbl.yuliao.voom.comm;
 
 /**
  * Created by 钉某人
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapter.java b/app/src/main/java/com/hbl/yuliao/voom/comm/TiktokAdapter.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapter.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/TiktokAdapter.java
index 17465c9..ca477ea 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapter.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/TiktokAdapter.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapterMe.java b/app/src/main/java/com/hbl/yuliao/voom/comm/TiktokAdapterMe.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapterMe.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/TiktokAdapterMe.java
index b4e104a..38390d0 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapterMe.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/TiktokAdapterMe.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/voom/comm/ViewPagerLayoutManager.java b/app/src/main/java/com/hbl/yuliao/voom/comm/ViewPagerLayoutManager.java
similarity index 99%
rename from app/src/main/java/com/hbl/lewan/voom/comm/ViewPagerLayoutManager.java
rename to app/src/main/java/com/hbl/yuliao/voom/comm/ViewPagerLayoutManager.java
index d66dd17..ec246e3 100644
--- a/app/src/main/java/com/hbl/lewan/voom/comm/ViewPagerLayoutManager.java
+++ b/app/src/main/java/com/hbl/yuliao/voom/comm/ViewPagerLayoutManager.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.voom.comm;
+package com.hbl.yuliao.voom.comm;
 
 import android.content.Context;
 import android.view.View;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/AddBankActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/AddBankActivity.java
similarity index 83%
rename from app/src/main/java/com/hbl/lewan/wallet/AddBankActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/AddBankActivity.java
index f000746..0d4a319 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/AddBankActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/AddBankActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/AddOrChangeUSDTActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/AddOrChangeUSDTActivity.java
similarity index 96%
rename from app/src/main/java/com/hbl/lewan/wallet/AddOrChangeUSDTActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/AddOrChangeUSDTActivity.java
index 8807e35..d5a6b6b 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/AddOrChangeUSDTActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/AddOrChangeUSDTActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/BankListActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/BankListActivity.java
similarity index 84%
rename from app/src/main/java/com/hbl/lewan/wallet/BankListActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/BankListActivity.java
index db3614f..5275e08 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/BankListActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/BankListActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/BindWeChatOrAliPayActivity.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/BindWeChatOrAliPayActivity.java
index 9a77f07..8c4b72f 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/BindWeChatOrAliPayActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/ChongZhiLogActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/ChongZhiLogActivity.java
similarity index 92%
rename from app/src/main/java/com/hbl/lewan/wallet/ChongZhiLogActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/ChongZhiLogActivity.java
index e73a78a..aa54b28 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/ChongZhiLogActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/ChongZhiLogActivity.java
@@ -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 {
diff --git a/app/src/main/java/com/hbl/lewan/wallet/GiftInfoActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/GiftInfoActivity.java
similarity index 88%
rename from app/src/main/java/com/hbl/lewan/wallet/GiftInfoActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/GiftInfoActivity.java
index 887bb95..61b0cd1 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/GiftInfoActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/GiftInfoActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/GiftInfoFragment.java b/app/src/main/java/com/hbl/yuliao/wallet/GiftInfoFragment.java
similarity index 92%
rename from app/src/main/java/com/hbl/lewan/wallet/GiftInfoFragment.java
rename to app/src/main/java/com/hbl/yuliao/wallet/GiftInfoFragment.java
index 5de5fee..520b2f9 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/GiftInfoFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/GiftInfoFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/MyWalletActivity.java
similarity index 92%
rename from app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/MyWalletActivity.java
index ab07368..8a48fa4 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/MyWalletActivity.java
@@ -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();
 
     }
 
diff --git a/app/src/main/java/com/hbl/lewan/wallet/PayPasswordActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/PayPasswordActivity.java
similarity index 92%
rename from app/src/main/java/com/hbl/lewan/wallet/PayPasswordActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/PayPasswordActivity.java
index 85c6788..a946922 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/PayPasswordActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/PayPasswordActivity.java
@@ -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());
 
diff --git a/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/PaySettingActivity.java
similarity index 92%
rename from app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/PaySettingActivity.java
index 7457222..ada6387 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/PaySettingActivity.java
@@ -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;
             }
diff --git a/app/src/main/java/com/hbl/lewan/wallet/SetPayPasswordActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/SetPayPasswordActivity.java
similarity index 86%
rename from app/src/main/java/com/hbl/lewan/wallet/SetPayPasswordActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/SetPayPasswordActivity.java
index 8b70fb2..fcc5c6a 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/SetPayPasswordActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/SetPayPasswordActivity.java
@@ -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 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 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);
diff --git a/app/src/main/java/com/hbl/lewan/wallet/ShiMingActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/ShiMingActivity.java
similarity index 85%
rename from app/src/main/java/com/hbl/lewan/wallet/ShiMingActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/ShiMingActivity.java
index 23a3f3e..82f55b4 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/ShiMingActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/ShiMingActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/yuliao/wallet/SumbitUsdtActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/SumbitUsdtActivity.java
new file mode 100644
index 0000000..9b5e6a8
--- /dev/null
+++ b/app/src/main/java/com/hbl/yuliao/wallet/SumbitUsdtActivity.java
@@ -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 uris = new ArrayList<>();
+    List uriStrings = new ArrayList<>();
+    CommonAdapter  commonAdapter;
+    List localMedias = new ArrayList<>();
+    List 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 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 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 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() {
+                    @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 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 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 getList(List 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);
+    }
+}
diff --git a/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/TiXianActivity.java
similarity index 93%
rename from app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/TiXianActivity.java
index 9f79bec..54203f2 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/TiXianActivity.java
@@ -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);
     }
 
 
diff --git a/app/src/main/java/com/hbl/lewan/wallet/TiXianLogActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/TiXianLogActivity.java
similarity index 92%
rename from app/src/main/java/com/hbl/lewan/wallet/TiXianLogActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/TiXianLogActivity.java
index 54838c9..c4c02cc 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/TiXianLogActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/TiXianLogActivity.java
@@ -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 {
diff --git a/app/src/main/java/com/hbl/lewan/wallet/ToBindWeChatOrAliPayActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/ToBindWeChatOrAliPayActivity.java
similarity index 87%
rename from app/src/main/java/com/hbl/lewan/wallet/ToBindWeChatOrAliPayActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/ToBindWeChatOrAliPayActivity.java
index 111670e..1fa6091 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/ToBindWeChatOrAliPayActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/ToBindWeChatOrAliPayActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/TopUpActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/TopUpActivity.java
similarity index 63%
rename from app/src/main/java/com/hbl/lewan/wallet/TopUpActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/TopUpActivity.java
index a263940..d5d8dbb 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/TopUpActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/TopUpActivity.java
@@ -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 globalAmountList = new ArrayList<>();
     private List 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 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> 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 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 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(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();
diff --git a/app/src/main/java/com/hbl/lewan/wallet/TopUpReusltActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/TopUpReusltActivity.java
similarity index 89%
rename from app/src/main/java/com/hbl/lewan/wallet/TopUpReusltActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/TopUpReusltActivity.java
index b6edbbe..bdcc59c 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/TopUpReusltActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/TopUpReusltActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletFragment.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletFragment.java
similarity index 86%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletFragment.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletFragment.java
index f737f04..b30319f 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletFragmentBf.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletFragmentBf.java
similarity index 91%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletFragmentBf.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletFragmentBf.java
index 6061060..3b7879e 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletFragmentBf.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletFragmentBf.java
@@ -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;
 
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoActivity.java
similarity index 91%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletInfoActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletInfoActivity.java
index db66bb8..92c6252 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoFragment.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletInfoFragment.java
index be1eeb1..536072b 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment1.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoFragment1.java
similarity index 80%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment1.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletInfoFragment1.java
index 8d62117..619d059 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment1.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoFragment1.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoNewActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoNewActivity.java
similarity index 90%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletInfoNewActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletInfoNewActivity.java
index a0bfe29..2948c87 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoNewActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoNewActivity.java
@@ -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;
 
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoRedActivity.java
similarity index 85%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletInfoRedActivity.java
index b557e5e..8df3f0f 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoRedActivity.java
@@ -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("累计收到 "+(redPkgCount==null?0:redPkgCount)+" 个红包"));
+
         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("累计发出 "+(redPkgCount==null?0:redPkgCount)+" 个红包"));
+
         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);
 
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoRedFragment.java
similarity index 95%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletInfoRedFragment.java
index a6fcd63..6336d4e 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoRedFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoRedFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoTongBiActivity.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoTongBiActivity.java
similarity index 84%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletInfoTongBiActivity.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletInfoTongBiActivity.java
index 9858ea3..c214b4a 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfoTongBiActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfoTongBiActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfologFragment.java
similarity index 95%
rename from app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java
rename to app/src/main/java/com/hbl/yuliao/wallet/WalletInfologFragment.java
index 04d3508..e7cd212 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/WalletInfologFragment.java
+++ b/app/src/main/java/com/hbl/yuliao/wallet/WalletInfologFragment.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/welcome/ServerActivity.java b/app/src/main/java/com/hbl/yuliao/welcome/ServerActivity.java
similarity index 93%
rename from app/src/main/java/com/hbl/lewan/welcome/ServerActivity.java
rename to app/src/main/java/com/hbl/yuliao/welcome/ServerActivity.java
index 3db1f84..21450c0 100644
--- a/app/src/main/java/com/hbl/lewan/welcome/ServerActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/welcome/ServerActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/welcome/WelcomeActivity.java b/app/src/main/java/com/hbl/yuliao/welcome/WelcomeActivity.java
similarity index 93%
rename from app/src/main/java/com/hbl/lewan/welcome/WelcomeActivity.java
rename to app/src/main/java/com/hbl/yuliao/welcome/WelcomeActivity.java
index 1eb2eeb..7ac1e0d 100644
--- a/app/src/main/java/com/hbl/lewan/welcome/WelcomeActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/welcome/WelcomeActivity.java
@@ -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);
diff --git a/app/src/main/java/com/hbl/lewan/widget/BezierCircleHeader.java b/app/src/main/java/com/hbl/yuliao/widget/BezierCircleHeader.java
similarity index 99%
rename from app/src/main/java/com/hbl/lewan/widget/BezierCircleHeader.java
rename to app/src/main/java/com/hbl/yuliao/widget/BezierCircleHeader.java
index 9a99459..0cfddb8 100644
--- a/app/src/main/java/com/hbl/lewan/widget/BezierCircleHeader.java
+++ b/app/src/main/java/com/hbl/yuliao/widget/BezierCircleHeader.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.widget;
+package com.hbl.yuliao.widget;
 
 
 import android.animation.ValueAnimator;
diff --git a/app/src/main/java/com/hbl/lewan/widget/CircleImageView.java b/app/src/main/java/com/hbl/yuliao/widget/CircleImageView.java
similarity index 99%
rename from app/src/main/java/com/hbl/lewan/widget/CircleImageView.java
rename to app/src/main/java/com/hbl/yuliao/widget/CircleImageView.java
index c565cc3..656353c 100644
--- a/app/src/main/java/com/hbl/lewan/widget/CircleImageView.java
+++ b/app/src/main/java/com/hbl/yuliao/widget/CircleImageView.java
@@ -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 {
diff --git a/app/src/main/java/com/hbl/lewan/widget/GridItemDecoration.java b/app/src/main/java/com/hbl/yuliao/widget/GridItemDecoration.java
similarity index 98%
rename from app/src/main/java/com/hbl/lewan/widget/GridItemDecoration.java
rename to app/src/main/java/com/hbl/yuliao/widget/GridItemDecoration.java
index b29fc9d..ba638db 100644
--- a/app/src/main/java/com/hbl/lewan/widget/GridItemDecoration.java
+++ b/app/src/main/java/com/hbl/yuliao/widget/GridItemDecoration.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.widget;
+package com.hbl.yuliao.widget;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/app/src/main/java/com/hbl/lewan/widget/StatusLayout.java b/app/src/main/java/com/hbl/yuliao/widget/StatusLayout.java
similarity index 97%
rename from app/src/main/java/com/hbl/lewan/widget/StatusLayout.java
rename to app/src/main/java/com/hbl/yuliao/widget/StatusLayout.java
index 758bce6..fbbccad 100644
--- a/app/src/main/java/com/hbl/lewan/widget/StatusLayout.java
+++ b/app/src/main/java/com/hbl/yuliao/widget/StatusLayout.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.widget;
+package com.hbl.yuliao.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java b/app/src/main/java/com/hbl/yuliao/wxapi/WXEntryActivity.java
similarity index 94%
rename from app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java
rename to app/src/main/java/com/hbl/yuliao/wxapi/WXEntryActivity.java
index 23e7437..96c03ef 100644
--- a/app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wxapi/WXEntryActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wxapi/WXPayEntryActivity.java b/app/src/main/java/com/hbl/yuliao/wxapi/WXPayEntryActivity.java
similarity index 93%
rename from app/src/main/java/com/hbl/lewan/wxapi/WXPayEntryActivity.java
rename to app/src/main/java/com/hbl/yuliao/wxapi/WXPayEntryActivity.java
index d357cb6..4aa7a12 100644
--- a/app/src/main/java/com/hbl/lewan/wxapi/WXPayEntryActivity.java
+++ b/app/src/main/java/com/hbl/yuliao/wxapi/WXPayEntryActivity.java
@@ -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;
diff --git a/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXin.java b/app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXin.java
similarity index 95%
rename from app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXin.java
rename to app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXin.java
index 3302cd5..472daa0 100644
--- a/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXin.java
+++ b/app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXin.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.wxapi.bean;
+package com.hbl.yuliao.wxapi.bean;
 
 /**
  * @create time 2017-09-14
diff --git a/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinInfo.java b/app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXinInfo.java
similarity index 98%
rename from app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinInfo.java
rename to app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXinInfo.java
index 48e8e16..977ebfc 100644
--- a/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinInfo.java
+++ b/app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXinInfo.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.wxapi.bean;
+package com.hbl.yuliao.wxapi.bean;
 
 /**
  * @create time 2017-09-14
diff --git a/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinToken.java b/app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXinToken.java
similarity index 98%
rename from app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinToken.java
rename to app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXinToken.java
index fe741a4..6980435 100644
--- a/app/src/main/java/com/hbl/lewan/wxapi/bean/WeiXinToken.java
+++ b/app/src/main/java/com/hbl/yuliao/wxapi/bean/WeiXinToken.java
@@ -1,4 +1,4 @@
-package com.hbl.lewan.wxapi.bean;
+package com.hbl.yuliao.wxapi.bean;
 
 /**
  * Created by xx on 16/6/25.
diff --git a/app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java b/app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java
index 11e79b0..f056371 100644
--- a/app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java
+++ b/app/src/main/java/com/huawei/hms/hmsscankit/HtmlScanKitActivity.java
@@ -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;
diff --git a/app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java b/app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java
index 494761f..b6ff955 100644
--- a/app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java
+++ b/app/src/main/java/com/huawei/hms/hmsscankit/MyScanKitActivity.java
@@ -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})
diff --git a/app/src/main/java/io/agora/onetoone/Pure1v1LivingActivity.kt b/app/src/main/java/io/agora/onetoone/Pure1v1LivingActivity.kt
new file mode 100644
index 0000000..877d2e2
--- /dev/null
+++ b/app/src/main/java/io/agora/onetoone/Pure1v1LivingActivity.kt
@@ -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 {
+//            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 {
+//            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
+//    ) {
+//        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): 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)
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bank_bg1.xml b/app/src/main/res/drawable/bank_bg1.xml
index 667c7ff..0f5893d 100644
--- a/app/src/main/res/drawable/bank_bg1.xml
+++ b/app/src/main/res/drawable/bank_bg1.xml
@@ -7,5 +7,5 @@
 
     
-    
+    
 
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bank_bg2.xml b/app/src/main/res/drawable/bank_bg2.xml
index de42403..ceba470 100644
--- a/app/src/main/res/drawable/bank_bg2.xml
+++ b/app/src/main/res/drawable/bank_bg2.xml
@@ -7,5 +7,5 @@
 
     
-    
+    
 
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bank_bg3.xml b/app/src/main/res/drawable/bank_bg3.xml
index 07cb5c8..035e74d 100644
--- a/app/src/main/res/drawable/bank_bg3.xml
+++ b/app/src/main/res/drawable/bank_bg3.xml
@@ -7,5 +7,5 @@
 
     
-    
+    
 
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_true_bg1.xml b/app/src/main/res/drawable/button_true_bg1.xml
index f63884e..461284e 100644
--- a/app/src/main/res/drawable/button_true_bg1.xml
+++ b/app/src/main/res/drawable/button_true_bg1.xml
@@ -9,7 +9,7 @@
                 android:type="linear"
                 />
         
-            
+            
         
 
     
diff --git a/app/src/main/res/drawable/cornor_f4f4f4_6dp.xml b/app/src/main/res/drawable/cornor_f4f4f4_6dp.xml
index ed70b71..2325198 100644
--- a/app/src/main/res/drawable/cornor_f4f4f4_6dp.xml
+++ b/app/src/main/res/drawable/cornor_f4f4f4_6dp.xml
@@ -1,6 +1,6 @@
 
 
-    
+    
 
-    
+    
 
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cornor_stroke_thempink_12dp.xml b/app/src/main/res/drawable/cornor_stroke_thempink_12dp.xml
index 62b80bf..8b9c564 100644
--- a/app/src/main/res/drawable/cornor_stroke_thempink_12dp.xml
+++ b/app/src/main/res/drawable/cornor_stroke_thempink_12dp.xml
@@ -1,6 +1,6 @@
 
 
-    
+    
 
     
+
+    
+
+    
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cornor_thempink_12dp.xml b/app/src/main/res/drawable/cornor_thempink_12dp.xml
index 227844d..81b3db0 100644
--- a/app/src/main/res/drawable/cornor_thempink_12dp.xml
+++ b/app/src/main/res/drawable/cornor_thempink_12dp.xml
@@ -1,6 +1,6 @@
 
 
-    
+    
 
     
 
diff --git a/app/src/main/res/drawable/ic_frame_mine_right_arrow.xml b/app/src/main/res/drawable/ic_frame_mine_right_arrow.xml
index 39221d2..ce223fb 100644
--- a/app/src/main/res/drawable/ic_frame_mine_right_arrow.xml
+++ b/app/src/main/res/drawable/ic_frame_mine_right_arrow.xml
@@ -14,5 +14,5 @@
       android:fillColor="#00000000"/>
   
+      android:fillColor="#17254E"/>
 
diff --git a/app/src/main/res/drawable/ic_launche_foreground.xml b/app/src/main/res/drawable/ic_launche_foreground.xml
new file mode 100644
index 0000000..feccb29
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launche_foreground.xml
@@ -0,0 +1,18 @@
+
+
+  
+    
+      
+      
+    
+  
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/index_user_bg33.xml b/app/src/main/res/drawable/index_user_bg33.xml
new file mode 100644
index 0000000..5ea9ff9
--- /dev/null
+++ b/app/src/main/res/drawable/index_user_bg33.xml
@@ -0,0 +1,38 @@
+
+
+    
+        
+            
+            
+        
+    
+    
+    
+        
+            
+            
+            #4d363636
+            0
+            2
+        
+    
+
+
diff --git a/app/src/main/res/drawable/logout_btn_main2_new.xml b/app/src/main/res/drawable/logout_btn_main2_new.xml
new file mode 100644
index 0000000..471a191
--- /dev/null
+++ b/app/src/main/res/drawable/logout_btn_main2_new.xml
@@ -0,0 +1,25 @@
+
+
+    
+        
+            
+            
+        
+    
+    
+    
+        
+            
+            
+            
+        
+    
+
+
diff --git a/app/src/main/res/drawable/nan_bg_t.xml b/app/src/main/res/drawable/nan_bg_t.xml
new file mode 100644
index 0000000..0841aa4
--- /dev/null
+++ b/app/src/main/res/drawable/nan_bg_t.xml
@@ -0,0 +1,19 @@
+
+
+
+
+    
+
+    
+
+    
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/nv_bg_t.xml b/app/src/main/res/drawable/nv_bg_t.xml
new file mode 100644
index 0000000..9407f20
--- /dev/null
+++ b/app/src/main/res/drawable/nv_bg_t.xml
@@ -0,0 +1,19 @@
+
+
+
+
+    
+
+    
+
+    
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/password_button_bg_s.xml b/app/src/main/res/drawable/password_button_bg_s.xml
index 683a7c3..02fcbda 100644
--- a/app/src/main/res/drawable/password_button_bg_s.xml
+++ b/app/src/main/res/drawable/password_button_bg_s.xml
@@ -12,8 +12,8 @@
         
             
             
+
+
+
+
+    
+
+    
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_dialog_bg2.xml b/app/src/main/res/drawable/shape_dialog_bg2.xml
index ebe8a69..f667361 100644
--- a/app/src/main/res/drawable/shape_dialog_bg2.xml
+++ b/app/src/main/res/drawable/shape_dialog_bg2.xml
@@ -2,5 +2,5 @@
 
     
-    
+    
 
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shengri_item_bg.xml b/app/src/main/res/drawable/shengri_item_bg.xml
index f32fe2d..646bf55 100644
--- a/app/src/main/res/drawable/shengri_item_bg.xml
+++ b/app/src/main/res/drawable/shengri_item_bg.xml
@@ -3,13 +3,13 @@
 
     
         
-            
         
-            
+            
         
 
     
diff --git a/app/src/main/res/drawable/statistic_bg.xml b/app/src/main/res/drawable/statistic_bg.xml
new file mode 100644
index 0000000..d0beb82
--- /dev/null
+++ b/app/src/main/res/drawable/statistic_bg.xml
@@ -0,0 +1,6 @@
+
+
+    
+    
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/switch_thumb_on.xml b/app/src/main/res/drawable/switch_thumb_on.xml
index f7eb60f..f4771e2 100644
--- a/app/src/main/res/drawable/switch_thumb_on.xml
+++ b/app/src/main/res/drawable/switch_thumb_on.xml
@@ -12,6 +12,6 @@
         android:height="@dimen/dimen_24_dp" />
 
     
-    
+    
 
 
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_background.xml b/app/src/main/res/drawable/tab_background.xml
new file mode 100644
index 0000000..1427f26
--- /dev/null
+++ b/app/src/main/res/drawable/tab_background.xml
@@ -0,0 +1,18 @@
+
+
+    
+    
+        
+            
+            
+            
+        
+    
+    
+    
+
+
diff --git a/app/src/main/res/drawable/usdt_qr_bg_new.xml b/app/src/main/res/drawable/usdt_qr_bg_new.xml
new file mode 100644
index 0000000..3e950d6
--- /dev/null
+++ b/app/src/main/res/drawable/usdt_qr_bg_new.xml
@@ -0,0 +1,25 @@
+
+
+    
+        
+            
+            
+        
+    
+    
+    
+        
+            
+            
+            
+        
+    
+
+
diff --git a/app/src/main/res/drawable/user_true.xml b/app/src/main/res/drawable/user_true.xml
new file mode 100644
index 0000000..f7573cc
--- /dev/null
+++ b/app/src/main/res/drawable/user_true.xml
@@ -0,0 +1,25 @@
+
+
+    
+        
+            
+            
+        
+    
+    
+    
+        
+            
+
+        
+
+    
+
+
diff --git a/app/src/main/res/drawable/user_true1.xml b/app/src/main/res/drawable/user_true1.xml
new file mode 100644
index 0000000..c9e16fa
--- /dev/null
+++ b/app/src/main/res/drawable/user_true1.xml
@@ -0,0 +1,25 @@
+
+
+    
+        
+            
+            
+        
+    
+    
+    
+        
+            
+
+        
+
+    
+
+
diff --git a/app/src/main/res/drawable/xinbie_f.xml b/app/src/main/res/drawable/xinbie_f.xml
new file mode 100644
index 0000000..7cb2548
--- /dev/null
+++ b/app/src/main/res/drawable/xinbie_f.xml
@@ -0,0 +1,19 @@
+
+
+
+
+    
+
+    
+
+    
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_bank.xml b/app/src/main/res/layout/activity_add_bank.xml
index f47a5ca..7f91fc5 100644
--- a/app/src/main/res/layout/activity_add_bank.xml
+++ b/app/src/main/res/layout/activity_add_bank.xml
@@ -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" />
 
     
     
     
         
 
         
-        
+
         
         
-        
+
 
         
         
-        
+
         
-