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

第一次提交

Browse Source
This commit is contained in:
xuhuixiang
2025-04-22 14:27:38 +08:00
parent 425bc1475e
commit 0ad9ee980a
1011 changed files with 8929 additions and 8657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
app/build.gradle.kts
View File

@@ -40,27 +40,29 @@ android {
checkReleaseBuilds = false
}
compileSdk = 34
compileSdk = 33
defaultConfig {
manifestPlaceholders += mapOf()
applicationId = "com.dskj.rbchat"
applicationId = "com.hbl.lewan"
minSdk = 24
targetSdk = 34
versionCode = 203
versionName = "2.0.3"
targetSdk = 33
versionCode = 214
versionName = "2.1.4"
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式
manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" //测试
manifestPlaceholders["IMAPPKEY"] = "cc831439977fc063bb56eea1109639cd" //正式
// manifestPlaceholders["IMAPPKEY"] = "502a1d045bb802c75dd14a005a731256" //测试
manifestPlaceholders["JPUSH_PKGNAME"] = "com.dskj.rbchat"
manifestPlaceholders["JPUSH_PKGNAME"] = "com.hbl.lewan"
manifestPlaceholders["JPUSH_APPKEY"] = "9041bc22de91e3d9af3cfd23"
manifestPlaceholders["JPUSH_CHANNEL"] = "developer-default"
ndk {
abiFilters += listOf("armeabi-v7a", "arm64-v8a")
// abiFilters += listOf("x86","x86_64","armeabi","armeabi-v7a","arm64-v8a")
}
}
// flavorDimensions += "version"
// productFlavors {
@@ -87,25 +89,25 @@ android {
)
signingConfig = signingConfigs.getByName("release")
isDebuggable = false;
// buildConfigField(
// "String",
// "HTTPS_BASE_URL",
// "\"https://api.letschat2023.com/\""
// )
buildConfigField(
"String",
"APIKEY",
"\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\""
)
buildConfigField(
"String",
"AREA_CODE",
"\"+86\""
)
manifestPlaceholders["APPICON"] = "@mipmap/ic_launche" //正式
manifestPlaceholders["APPICON_ROUND"] = "@mipmap/ic_launche_round" //正式
//正式服
// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式
manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
manifestPlaceholders["IMAPPKEY"] = "cc831439977fc063bb56eea1109639cd" //正式
}
getByName("debug") {
isMinifyEnabled = false
proguardFiles(
@@ -115,19 +117,22 @@ android {
signingConfig = signingConfigs.getByName("release")
isDebuggable = true
// buildConfigField(
// "String",
// "HTTPS_BASE_URL",
// "\"https://api-test.letschat2023.com/\""
// )
buildConfigField(
"String",
"APIKEY",
"\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\""
)
//测试APPKEY
manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a"
// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f"
buildConfigField(
"String",
"AREA_CODE",
"\"+86\""
)
manifestPlaceholders["APPICON"] = "@mipmap/ic_launche" //正式
manifestPlaceholders["APPICON_ROUND"] = "@mipmap/ic_launche_round" //正式
// 测试APPKEY
// manifestPlaceholders["IMAPPKEY"] = "502a1d045bb802c75dd14a005a731256"
manifestPlaceholders["IMAPPKEY"] = "cc831439977fc063bb56eea1109639cd"
}
@@ -151,8 +156,10 @@ android {
packagingOptions {
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")
}
namespace = "com.dskj.rbchat"
namespace = "com.hbl.lewan"
// applicationVariants.all {
@@ -174,7 +181,6 @@ android {
dependencies {
val room_version = "2.4.3"
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.8.0")
@@ -185,18 +191,13 @@ dependencies {
implementation(project(":conversationkit-ui"))
implementation(project(":teamkit-ui"))
implementation(project(":chatkit-ui"))
implementation(project(":locationkit"))
// implementation(project(":locationkit"))
implementation(project(":fingermanager"))
// implementation(project(":citypickerview"))
// implementation("com.netease.yunxin.kit.contact:contactkit-ui:9.6.2")
// implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:9.6.2")
// implementation("com.netease.yunxin.kit.team:teamkit-ui:9.6.2")
// implementation("com.netease.yunxin.kit.chat:chatkit-ui:9.6.2")
// implementation("com.netease.yunxin.kit.locationkit:locationkit:9.6.2")
implementation("com.netease.yunxin.kit.call:call-ui:1.8.2") //呼叫组件 UI 包
api("com.netease.nimlib:avsignalling:9.11.0") //呼叫组件 依赖信令包
// 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
implementation("com.airbnb.android:lottie:5.0.3")
// api("com.netease.nimlib:push:9.19.11")
// implementation("com.airbnb.android:lottie:5.0.3")
implementation("com.github.bumptech.glide:glide:4.13.1")
implementation("jp.wasabeef:glide-transformations:4.3.0")
//retrofit2
@@ -204,13 +205,19 @@ dependencies {
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.squareup.retrofit2:converter-scalars:2.9.0")
//
// implementation ("com.qiniu:qiniu-java-sdk:7.16.0") {
// exclude(group = "com.squareup.okhttp3", module = "okhttp")
// }
implementation("com.squareup.okhttp3:okhttp:4.9.3")
implementation("com.huawei.hms:push:6.3.0.302") {
exclude(group = "com.huawei.hms", module = "update") // com.huawei.hms:update
exclude(group = "com.huawei.hms", module = "availableupdate") // com.huawei.hms:update
}
implementation("com.meizu.flyme.internet:push-internal:4.1.0")
implementation("com.huawei.agconnect:agconnect-core:1.6.5.300")
// implementation("com.huawei.hms:push:6.3.0.302") {
// exclude(group = "com.huawei.hms", module = "update") // com.huawei.hms:update
// exclude(group = "com.huawei.hms", module = "availableupdate") // com.huawei.hms:update
// }
// implementation("com.meizu.flyme.internet:push-internal:4.1.0")
// implementation("com.huawei.agconnect:agconnect-core:1.6.5.300")
// Hilt 对于ViewModel的支持
implementation("androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha02")
implementation("androidx.hilt:hilt-compiler:1.0.0-alpha02")
@@ -236,8 +243,8 @@ dependencies {
// implementation("com.google.firebase:firebase-analytics:20.0.0")
implementation(platform("com.google.firebase:firebase-bom:32.3.1"))
//skeleton
implementation("com.github.ethanhua:Skeleton:ff06517d4629e87328c41a1cce614c490ed7fb51")
implementation("io.supercharge:shimmerlayout:2.1.0")
// implementation("com.github.ethanhua:Skeleton:ff06517d4629e87328c41a1cce614c490ed7fb51")
// implementation("io.supercharge:shimmerlayout:2.1.0")
//jsbridge
implementation("com.github.lzyzsd:jsbridge:1.0.4")
implementation("com.smallbuer:jsbridge:1.0.7")
@@ -246,24 +253,24 @@ dependencies {
//华为scanplus
implementation("com.huawei.hms:scanplus:2.12.0.301")
implementation("com.tencent.mm.opensdk:wechat-sdk-android:6.8.0")
implementation("com.youth.banner:banner:1.4.9")
// implementation("com.tencent.mm.opensdk:wechat-sdk-android:6.8.0")
// implementation("com.youth.banner:banner:1.4.9")
implementation("com.github.iwgang:simplifyspan:2.1")
implementation("io.github.hariprasanths:bounceview-android:0.2.0")
// implementation("io.github.hariprasanths:bounceview-android:0.2.0")
// implementation("com.contrarywind:Android-PickerView:4.1.9")
implementation("com.aliyun.dpa:oss-android-sdk:2.9.13")
// implementation("com.aliyun.dpa:oss-android-sdk:2.9.13")
implementation("com.github.jenly1314:zxing-lite:2.1.1")
implementation("com.blankj:utilcodex:1.31.0")
implementation("com.github.jenly1314.AppUpdater:app-updater:1.1.3")
implementation("cn.jiguang.sdk:jpush:5.0.7") // 必选，此处以JPush 5.0.7 版本为例，注意：5.0.0 版本开始可以自动拉取 JCore 包，无需另外配置
implementation("cn.jiguang.sdk.plugin:fcm:5.0.7")
implementation("cn.jiguang.sdk:joperate:2.0.2") // 可选，集成极光分析SDK后，即可支持行为触发推送消息、推送转化率统计，用户行为分析和用户标签等功能
implementation("com.github.SherlockGougou:BigImageViewPager:androidx-7.2.5")
// implementation("cn.jiguang.sdk:jpush:5.0.7") // 必选，此处以JPush 5.0.7 版本为例，注意：5.0.0 版本开始可以自动拉取 JCore 包，无需另外配置
// implementation("cn.jiguang.sdk.plugin:fcm:5.0.7")
// implementation("cn.jiguang.sdk:joperate:2.0.2") // 可选，集成极光分析SDK后，即可支持行为触发推送消息、推送转化率统计，用户行为分析和用户标签等功能
implementation("com.github.SherlockGougou:BigImageViewPager:androidx-7.3.0")
annotationProcessor("com.github.bumptech.glide:compiler:4.11.0")
implementation("com.google.android.gms:play-services-location:21.0.1")
implementation("com.google.android.gms:play-services-maps:18.2.0")
// implementation("com.google.android.gms:play-services-location:21.0.1")
// implementation("com.google.android.gms:play-services-maps:18.2.0")
// implementation("com.gitee.sakaue:QSVideoPayer:2.2.9")
// implementation("tv.danmaku.ijk.media:ijkplayer-armv5:0.8.8")
// implementation("tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8")
@@ -279,4 +286,9 @@ dependencies {
implementation("com.airbnb.android:lottie:6.0.0") // lottie json动画
implementation ("com.qiniu:qiniu-android-sdk:8.6.0"){
exclude(group = "com.squareup.okhttp3", module = "okhttp")
}
}

9
app/google-services.json
View File

@@ -2,14 +2,14 @@
"project_info": {
"project_number": "989332659051",
"project_id": "comechat-d5578",
"storage_bucket": "comechat-d5578.appspot.com"
"storage_bucket": "comechat-d5578.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:989332659051:android:0786cc1d32916e1569ca2e",
"android_client_info": {
"package_name": "com.dskj.rbchat"
"package_name": "com.hbl.lewan"
}
},
"oauth_client": [
@@ -17,7 +17,7 @@
"client_id": "989332659051-s972adtvoscso4480ja4llhi73mbbog2.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.dskj.rbchat",
"package_name": "com.hbl.lewan",
"certificate_hash": "1d5a6262622999ac2f1c4a9f2fe5edf30dafebd2"
}
},
@@ -29,6 +29,9 @@
"api_key": [
{
"current_key": "AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8"
},
{
"current_key": "AIzaSyCedxqJxfYFInN2gEdyBSEAwdMaRAd6PKE"
}
],
"services": {

BIN
app/libs/SparkChain.aar
View File

Binary file not shown.

10
app/proguard-rules.pro vendored
View File

@@ -171,8 +171,8 @@
-dontwarn com.dskj.rbchat.**
-keep class com.dskj.rbchat.** {*;}
-dontwarn com.hbl.lewan.**
-keep class com.hbl.lewan.** {*;}
# NIM SDK的类，如果集成IM时已经添加，请忽略
-dontwarn com.netease.nim.**
@@ -196,3 +196,9 @@
-keep class com.netease.yunxin.kit.** {*;}
-keep public class * extends com.netease.yunxin.kit.corekit.XKitInitOptions
-keep class * implements com.netease.yunxin.kit.corekit.XKitService {*;}
-keep class com.qiniu.**{*;}
-keep class com.qiniu.**{public <init>();}
-ignorewarnings

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

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto">
<!-- replace package com.dskj.rbchat with your package name -->
<!-- replace package com.hbl.lewan with your package name -->
<!-- add uses-permission into your AndroidManifest -->
<!-- NFC所需权限-->
<uses-permission android:name="android.permission.NFC" />
@@ -13,23 +13,24 @@
android:required="false" />
<permission
android:name="com.dskj.rbchat.permission.RECEIVE_MSG"
android:name="com.hbl.lewan.permission.RECEIVE_MSG"
android:protectionLevel="signature"
tools:ignore="UniquePermission" />
<!-- receive SDK broadcast， replace package com.dskj.rbchat with your package name -->
<uses-permission android:name="com.dskj.rbchat.permission.RECEIVE_MSG" />
<!-- receive SDK broadcast， replace package com.hbl.lewan with your package name -->
<uses-permission android:name="com.hbl.lewan.permission.RECEIVE_MSG" />
<!-- <uses-permission-->
<!-- android:name="android.permission.QUERY_ALL_PACKAGES"-->
<!-- tools:ignore="QueryAllPackagesPermission" />-->
<uses-permission android:name="android.permission.LAUNCH_APP" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<!-- xiaomi push -->
<permission
android:name="com.dskj.rbchat.permission.MIPUSH_RECEIVE"
android:name="com.hbl.lewan.permission.MIPUSH_RECEIVE"
android:protectionLevel="signature" />
<uses-permission android:name="com.dskj.rbchat.permission.MIPUSH_RECEIVE" />
<uses-permission android:name="com.hbl.lewan.permission.MIPUSH_RECEIVE" />
<uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
<uses-feature
@@ -39,10 +40,10 @@
<!-- down Flyme5 version -->
<uses-permission android:name="com.meizu.flyme.push.permission.RECEIVE" />
<permission
android:name="com.dskj.rbchat.push.permission.MESSAGE"
android:name="com.hbl.lewan.push.permission.MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="com.dskj.rbchat.push.permission.MESSAGE" />
<uses-permission android:name="com.hbl.lewan.push.permission.MESSAGE" />
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
<!--去掉-->
<uses-permission
@@ -65,9 +66,9 @@
<!-- Flyme3 -->
<uses-permission android:name="com.meizu.c2dm.permission.RECEIVE" />
<permission
android:name="com.dskj.rbchat.permission.C2D_MESSAGE"
android:name="com.hbl.lewan.permission.C2D_MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="com.dskj.rbchat.permission.C2D_MESSAGE" />
<uses-permission android:name="com.hbl.lewan.permission.C2D_MESSAGE" />
<!-- oppo push-->
<uses-permission android:name="com.coloros.mcs.permission.RECIEVE_MCS_MESSAGE" />
@@ -90,8 +91,9 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"
tools:ignore="UniquePermission" />
<permission android:name="com.netease.nim.demo.permission.RECEIVE_MSG" />
@@ -105,11 +107,11 @@
android:name=".IMApplication"
android:allowBackup="true"
android:allowNativeHeapPointerTagging="false"
android:icon="@mipmap/ic_launcher"
android:icon="${APPICON}"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="${APPICON_ROUND}"
android:supportsRtl="true"
android:theme="@style/Theme.Xkit">
<meta-data
@@ -146,7 +148,7 @@
</intent-filter>
<intent-filter>
<data
android:host="time_go_chat"
android:host="time_go_mm"
android:path="/add_user"
android:scheme="timego" />
@@ -157,7 +159,7 @@
</intent-filter>
<intent-filter>
<data
android:host="time_go_chat"
android:host="time_go_mm"
android:path="/join_group"
android:scheme="timego" />
@@ -169,7 +171,7 @@
<intent-filter>
<data
android:host="time_go_chat"
android:host="time_go_mm"
android:path="/scan_score"
android:scheme="timego" />
@@ -229,7 +231,7 @@
</activity>
<activity
android:name="com.dskj.rbchat.map.LocationPageActivity1"
android:name="com.hbl.lewan.map.LocationPageActivity1"
android:finishOnTaskLaunch="true"
android:screenOrientation="portrait"
android:theme="@style/TransTheme"
@@ -406,10 +408,10 @@
android:exported="true"
android:screenOrientation="portrait" />
<activity
<!-- <activity
android:name=".main.index.AiChatActivity"
android:exported="true"
android:screenOrientation="portrait" />
android:screenOrientation="portrait" />-->
<activity
android:name=".redpack.TransferAccountsActivity"
@@ -488,6 +490,12 @@
android:name=".imkit.team.TeamManagerActivity"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".imkit.team.TeamMembersJinYanActivity"
android:exported="true"
android:screenOrientation="portrait" />
<activity
android:name=".imkit.team.TeamAddManagerActivity"
android:exported="true"
@@ -731,13 +739,13 @@
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".wxapi.WXEntryActivity"
android:exported="true" />
<activity
<!-- <activity-->
<!-- android:name=".wxapi.WXEntryActivity"-->
<!-- android:exported="true" />-->
<!-- <activity-->
android:name=".wxapi.WXPayEntryActivity"
android:exported="true" />
<!-- android:name=".wxapi.WXPayEntryActivity"-->
<!-- android:exported="true" />-->
<activity
android:name=".welcome.ServerActivity"
android:exported="false"
@@ -746,12 +754,12 @@
<!-- 云信 NIM SDK 进程间通信provider-->
<provider
android:name="com.netease.nimlib.ipc.NIMContentProvider"
android:authorities="com.dskj.rbchat.ipc.provider"
android:authorities="com.hbl.lewan.ipc.provider"
android:exported="false"
android:process=":core" />
<provider
android:name="com.netease.nimlib.ipc.cp.provider.PreferenceContentProvider"
android:authorities="com.dskj.rbchat.ipc.provider.preference"
android:authorities="com.hbl.lewan.ipc.provider.preference"
android:exported="false" />
<!-- 小米推送配置 -->
@@ -834,7 +842,7 @@
<!--设置收到 fcm 通知展示的图标和颜色-->
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@mipmap/ic_launcher" />
android:resource="@mipmap/ic_launche" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/color_6b3689" />
@@ -910,9 +918,9 @@
</service> <!--兼容Q版本-->
<!-- 高德地图定位 -->
<service
android:name="com.amap.api.location.APSService"
android:exported="true"></service>
<!-- <service-->
<!-- android:name="com.amap.api.location.APSService"-->
<!-- android:exported="true"></service>-->
<service
@@ -936,36 +944,44 @@
</service>
<!-- <provider-->
<!-- android:name="cn.jpush.android.service.InitProvider"-->
<!-- android:authorities="${applicationId}.jiguang.InitProvider"-->
<!-- android:exported="false"-->
<!-- tools:node="remove"></provider>-->
<!-- &lt;!&ndash; Since JCore2.0.0 Required SDK核心功能&ndash;&gt;-->
<!-- &lt;!&ndash; 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false &ndash;&gt;-->
<!-- &lt;!&ndash; 这个是自定义Service，要继承极光JCommonService，可以在更多手机平台上使得推送通道保持的更稳定 &ndash;&gt;-->
<!-- <service-->
<!-- android:name="cn.jpush.android.service.JCommonService"-->
<!-- android:enabled="true"-->
<!-- android:exported="false"-->
<!-- android:process=":pushcore">-->
<!-- <intent-filter>-->
<!-- <action android:name="cn.jiguang.user.service.action" />-->
<!-- </intent-filter>-->
<!-- </service>-->
<!-- <receiver-->
<!-- android:name="com.hbl.lewan.jpush.PushMessageReceiver"-->
<!-- android:enabled="true"-->
<!-- android:exported="false">-->
<!-- <intent-filter>-->
<!-- <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />-->
<!-- <category android:name="${applicationId}" />-->
<!-- </intent-filter>-->
<!-- </receiver>-->
<provider
android:name="cn.jpush.android.service.InitProvider"
android:authorities="${applicationId}.jiguang.InitProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
tools:node="remove"></provider>
<!-- Since JCore2.0.0 Required SDK核心功能-->
<!-- 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false -->
<!-- 这个是自定义Service，要继承极光JCommonService，可以在更多手机平台上使得推送通道保持的更稳定 -->
<service
android:name="cn.jpush.android.service.JCommonService"
android:enabled="true"
android:exported="false"
android:process=":pushcore">
<intent-filter>
<action android:name="cn.jiguang.user.service.action" />
</intent-filter>
</service>
<receiver
android:name="com.dskj.rbchat.jpush.PushMessageReceiver"
android:enabled="true"
android:exported="false">
<intent-filter>
<action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
<category android:name="${applicationId}" />
</intent-filter>
</receiver>
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>
</manifest>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 186 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

187
app/src/main/java/com/dskj/rbchat/jpush/PushMessageReceiver.java
View File

@@ -1,187 +0,0 @@
package com.dskj.rbchat.jpush;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.message.NotifyActMessageActivity;
import com.dskj.rbchat.main.message.NotifyMessageDetailsActivity;
import com.dskj.rbchat.model.NotifyExtraBean;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.play.VoiceUtils;
import com.dskj.rbchat.voom.MessageActivity;
import com.dskj.rbchat.welcome.WelcomeActivity;
import com.google.gson.JsonObject;
import cn.jpush.android.api.CmdMessage;
import cn.jpush.android.api.CustomMessage;
import cn.jpush.android.api.JPushInterface;
import cn.jpush.android.api.JPushMessage;
import cn.jpush.android.api.NotificationMessage;
import cn.jpush.android.service.JPushMessageReceiver;
public class PushMessageReceiver extends JPushMessageReceiver {
private static final String TAG = "PushMessageReceiver";
public static final String MESSAGE_RECEIVED_ACTION = "com.example.jpushdemo.MESSAGE_RECEIVED_ACTION";
public static final String KEY_MESSAGE = "message";
public static final String KEY_EXTRAS = "extras";
@Override
public void onMessage(Context context, CustomMessage customMessage) {
Log.e(TAG, "[onMessage] " + customMessage);
processCustomMessage(context, customMessage);
}
@Override
public void onNotifyMessageOpened(Context context, NotificationMessage message) {
Log.e(TAG, "[onNotifyMessageOpened] " + message);
try {
//打开自定义的Activity
if (!TextUtils.isEmpty(message.notificationExtras)) {
NotifyExtraBean bean = GsonUtils.getObjFromJSON(message.notificationExtras, NotifyExtraBean.class);
if (bean != null && (bean.getType() == 40 || bean.getType() == 41)) {
Intent i = new Intent(context, NotifyMessageDetailsActivity.class);
i.putExtra("id", bean.getPostId());
i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
context.startActivity(i);
return;
}
}
Intent i = new Intent(context, MainActivity.class);
// Bundle bundle = new Bundle();
// bundle.putString(JPushInterface.EXTRA_NOTIFICATION_TITLE,message.notificationTitle);
// bundle.putString(JPushInterface.EXTRA_ALERT,message.notificationContent);
// i.putExtras(bundle);
//i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
context.startActivity(i);
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
@Override
public void onMultiActionClicked(Context context, Intent intent) {
Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
//开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
if (nActionExtra == null) {
Log.d(TAG, "ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null");
return;
}
if (nActionExtra.equals("my_extra1")) {
Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
} else if (nActionExtra.equals("my_extra2")) {
Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
} else if (nActionExtra.equals("my_extra3")) {
Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
} else {
Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
}
}
@Override
public void onNotifyMessageArrived(Context context, NotificationMessage message) {
Log.e(TAG, "[onNotifyMessageArrived] " + message + " json==" + message.notificationTargetEvent);
String extra = message.notificationExtras;
if (!TextUtils.isEmpty(extra)) {
NotifyExtraBean bean = GsonUtils.getObjFromJSON(extra, NotifyExtraBean.class);
if (bean != null) {
switch (bean.getType()) {
case 30:
case 34: //cash
VoiceUtils.with(context).Play(bean.getPostId(), 0);
break;
case 35: //礼品积分
VoiceUtils.with(context).Play(bean.getPostId(), 1);
break;
}
}
}
}
@Override
public void onNotifyMessageDismiss(Context context, NotificationMessage message) {
Log.e(TAG, "[onNotifyMessageDismiss] " + message);
}
@Override
public void onRegister(Context context, String registrationId) {
Log.e(TAG, "[onRegister] " + registrationId);
}
@Override
public void onConnected(Context context, boolean isConnected) {
Log.e(TAG, "[onConnected] " + isConnected);
}
@Override
public void onCommandResult(Context context, CmdMessage cmdMessage) {
Log.e(TAG, "[onCommandResult] " + cmdMessage);
}
@Override
public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
TagAliasOperatorHelper.getInstance().onTagOperatorResult(context, jPushMessage);
super.onTagOperatorResult(context, jPushMessage);
}
@Override
public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage) {
TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context, jPushMessage);
super.onCheckTagOperatorResult(context, jPushMessage);
}
@Override
public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context, jPushMessage);
super.onAliasOperatorResult(context, jPushMessage);
}
@Override
public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context, jPushMessage);
super.onMobileNumberOperatorResult(context, jPushMessage);
}
//send msg to MainActivity
private void processCustomMessage(Context context, CustomMessage customMessage) {
/*if (MainActivity.isForeground) {
String message = customMessage.message;
String extras = customMessage.extra;
Intent msgIntent = new Intent(MESSAGE_RECEIVED_ACTION);
msgIntent.putExtra(KEY_MESSAGE, message);
if (!Utils.isEmpty(extras)) {
try {
JSONObject extraJson = new JSONObject(extras);
if (extraJson.length() > 0) {
msgIntent.putExtra(KEY_EXTRAS, extras);
}
} catch (JSONException e) {
}
}
LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
}*/
}
@Override
public void onNotificationSettingsCheck(Context context, boolean isOn, int source) {
super.onNotificationSettingsCheck(context, isOn, source);
Log.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
}
public void playSound() {
}
}

339
app/src/main/java/com/dskj/rbchat/jpush/TagAliasOperatorHelper.java
View File

@@ -1,339 +0,0 @@
package com.dskj.rbchat.jpush;
import android.content.Context;
import android.os.Handler;
import android.os.Message;
import android.util.SparseArray;
import java.util.Locale;
import java.util.Set;
import cn.jpush.android.api.JPushInterface;
import cn.jpush.android.api.JPushMessage;
import cn.jpush.android.helper.Logger;
/**
* 处理tagalias相关的逻辑
* */
public class TagAliasOperatorHelper {
private static final String TAG = "JIGUANG-TagAliasHelper";
public static int sequence = 1;
/**增加*/
public static final int ACTION_ADD = 1;
/**覆盖*/
public static final int ACTION_SET = 2;
/**删除部分*/
public static final int ACTION_DELETE = 3;
/**删除所有*/
public static final int ACTION_CLEAN = 4;
/**查询*/
public static final int ACTION_GET = 5;
public static final int ACTION_CHECK = 6;
public static final int DELAY_SEND_ACTION = 1;
public static final int DELAY_SET_MOBILE_NUMBER_ACTION = 2;
private Context context;
private static TagAliasOperatorHelper mInstance;
private TagAliasOperatorHelper(){
}
public static TagAliasOperatorHelper getInstance(){
if(mInstance == null){
synchronized (TagAliasOperatorHelper.class){
if(mInstance == null){
mInstance = new TagAliasOperatorHelper();
}
}
}
return mInstance;
}
public void init(Context context){
if(context != null) {
this.context = context.getApplicationContext();
}
}
private SparseArray<Object> setActionCache = new SparseArray<Object>();
public Object get(int sequence){
return setActionCache.get(sequence);
}
public Object remove(int sequence){
return setActionCache.get(sequence);
}
public void put(int sequence,Object tagAliasBean){
setActionCache.put(sequence,tagAliasBean);
}
private Handler delaySendHandler = new Handler(){
@Override
public void handleMessage(Message msg) {
switch (msg.what){
case DELAY_SEND_ACTION:
if(msg.obj !=null && msg.obj instanceof TagAliasBean){
Logger.i(TAG,"on delay time");
sequence++;
TagAliasBean tagAliasBean = (TagAliasBean) msg.obj;
setActionCache.put(sequence, tagAliasBean);
if(context!=null) {
handleAction(context, sequence, tagAliasBean);
}else{
Logger.e(TAG,"#unexcepted - context was null");
}
}else{
Logger.w(TAG,"#unexcepted - msg obj was incorrect");
}
break;
case DELAY_SET_MOBILE_NUMBER_ACTION:
if(msg.obj !=null && msg.obj instanceof String) {
Logger.i(TAG, "retry set mobile number");
sequence++;
String mobileNumber = (String) msg.obj;
setActionCache.put(sequence, mobileNumber);
if(context !=null) {
handleAction(context, sequence, mobileNumber);
}else {
Logger.e(TAG, "#unexcepted - context was null");
}
}else{
Logger.w(TAG,"#unexcepted - msg obj was incorrect");
}
break;
}
}
};
public void handleAction(Context context,int sequence,String mobileNumber){
put(sequence,mobileNumber);
Logger.d(TAG,"sequence:"+sequence+",mobileNumber:"+mobileNumber);
JPushInterface.setMobileNumber(context,sequence,mobileNumber);
}
/**
* 处理设置tag
* */
public void handleAction(Context context,int sequence, TagAliasBean tagAliasBean){
init(context);
if(tagAliasBean == null){
Logger.w(TAG,"tagAliasBean was null");
return;
}
put(sequence,tagAliasBean);
if(tagAliasBean.isAliasAction){
switch (tagAliasBean.action){
case ACTION_GET:
JPushInterface.getAlias(context,sequence);
break;
case ACTION_DELETE:
JPushInterface.deleteAlias(context,sequence);
break;
case ACTION_SET:
JPushInterface.setAlias(context,sequence,tagAliasBean.alias);
break;
default:
Logger.w(TAG,"unsupport alias action type");
return;
}
}else {
switch (tagAliasBean.action) {
case ACTION_ADD:
JPushInterface.addTags(context, sequence, tagAliasBean.tags);
break;
case ACTION_SET:
JPushInterface.setTags(context, sequence, tagAliasBean.tags);
break;
case ACTION_DELETE:
JPushInterface.deleteTags(context, sequence, tagAliasBean.tags);
break;
case ACTION_CHECK:
//一次只能check一个tag
String tag = (String)tagAliasBean.tags.toArray()[0];
JPushInterface.checkTagBindState(context,sequence,tag);
break;
case ACTION_GET:
JPushInterface.getAllTags(context, sequence);
break;
case ACTION_CLEAN:
JPushInterface.cleanTags(context, sequence);
break;
default:
Logger.w(TAG,"unsupport tag action type");
return;
}
}
}
private boolean RetryActionIfNeeded(int errorCode,TagAliasBean tagAliasBean){
if(!Utils.isConnected(context)){
Logger.w(TAG,"no network");
return false;
}
//返回的错误码为6002 超时,6014 服务器繁忙,都建议延迟重试
if(errorCode == 6002 || errorCode == 6014){
Logger.d(TAG,"need retry");
if(tagAliasBean!=null){
Message message = new Message();
message.what = DELAY_SEND_ACTION;
message.obj = tagAliasBean;
delaySendHandler.sendMessageDelayed(message,1000*60);
String logs =getRetryStr(tagAliasBean.isAliasAction, tagAliasBean.action,errorCode);
Utils.showToast(logs, context);
return true;
}
}
return false;
}
private boolean RetrySetMObileNumberActionIfNeeded(int errorCode,String mobileNumber){
if(!Utils.isConnected(context)){
Logger.w(TAG,"no network");
return false;
}
//返回的错误码为6002 超时,6024 服务器内部错误,建议稍后重试
if(errorCode == 6002 || errorCode == 6024){
Logger.d(TAG,"need retry");
Message message = new Message();
message.what = DELAY_SET_MOBILE_NUMBER_ACTION;
message.obj = mobileNumber;
delaySendHandler.sendMessageDelayed(message,1000*60);
String str = "Failed to set mobile number due to %s. Try again after 60s.";
str = String.format(Locale.ENGLISH,str,(errorCode == 6002 ? "timeout" : "server internal error”"));
Utils.showToast(str, context);
return true;
}
return false;
}
private String getRetryStr(boolean isAliasAction,int actionType,int errorCode){
String str = "Failed to %s %s due to %s. Try again after 60s.";
str = String.format(Locale.ENGLISH,str,getActionStr(actionType),(isAliasAction? "alias" : " tags") ,(errorCode == 6002 ? "timeout" : "server too busy"));
return str;
}
private String getActionStr(int actionType){
switch (actionType){
case ACTION_ADD:
return "add";
case ACTION_SET:
return "set";
case ACTION_DELETE:
return "delete";
case ACTION_GET:
return "get";
case ACTION_CLEAN:
return "clean";
case ACTION_CHECK:
return "check";
}
return "unkonw operation";
}
public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
int sequence = jPushMessage.getSequence();
Logger.i(TAG,"action - onTagOperatorResult, sequence:"+sequence+",tags:"+jPushMessage.getTags());
Logger.i(TAG,"tags size:"+jPushMessage.getTags().size());
init(context);
//根据sequence从之前操作缓存中获取缓存记录
TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
if(tagAliasBean == null){
// Utils.showToast("获取缓存记录失败", context);
return;
}
if(jPushMessage.getErrorCode() == 0){
Logger.i(TAG,"action - modify tag Success,sequence:"+sequence);
setActionCache.remove(sequence);
String logs = getActionStr(tagAliasBean.action)+" tags success";
Logger.i(TAG,logs);
Utils.showToast(logs, context);
}else{
String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags";
if(jPushMessage.getErrorCode() == 6018){
//tag数量超过限制,需要先清除一部分再add
logs += ", tags is exceed limit need to clean";
}
logs += ", errorCode:" + jPushMessage.getErrorCode();
Logger.e(TAG, logs);
if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
Utils.showToast(logs, context);
}
}
}
public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
int sequence = jPushMessage.getSequence();
Logger.i(TAG,"action - onCheckTagOperatorResult, sequence:"+sequence+",checktag:"+jPushMessage.getCheckTag());
init(context);
//根据sequence从之前操作缓存中获取缓存记录
TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
if(tagAliasBean == null){
// Utils.showToast("获取缓存记录失败", context);
return;
}
if(jPushMessage.getErrorCode() == 0){
Logger.i(TAG,"tagBean:"+tagAliasBean);
setActionCache.remove(sequence);
String logs = getActionStr(tagAliasBean.action)+" tag "+jPushMessage.getCheckTag() + " bind state success,state:"+jPushMessage.getTagCheckStateResult();
Logger.i(TAG,logs);
Utils.showToast(logs, context);
}else{
String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags, errorCode:" + jPushMessage.getErrorCode();
Logger.e(TAG, logs);
if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
Utils.showToast(logs, context);
}
}
}
public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
int sequence = jPushMessage.getSequence();
Logger.i(TAG,"action - onAliasOperatorResult, sequence:"+sequence+",alias:"+jPushMessage.getAlias());
init(context);
//根据sequence从之前操作缓存中获取缓存记录
TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
if(tagAliasBean == null){
// Utils.showToast("获取缓存记录失败", context);
return;
}
if(jPushMessage.getErrorCode() == 0){
Logger.i(TAG,"action - modify alias Success,sequence:"+sequence);
setActionCache.remove(sequence);
String logs = getActionStr(tagAliasBean.action)+" alias success";
Logger.i(TAG,logs);
Utils.showToast(logs, context);
}else{
String logs = "Failed to " + getActionStr(tagAliasBean.action)+" alias, errorCode:" + jPushMessage.getErrorCode();
Logger.e(TAG, logs);
if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
Utils.showToast(logs, context);
}
}
}
//设置手机号码回调
public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
int sequence = jPushMessage.getSequence();
Logger.i(TAG,"action - onMobileNumberOperatorResult, sequence:"+sequence+",mobileNumber:"+jPushMessage.getMobileNumber());
init(context);
if(jPushMessage.getErrorCode() == 0){
Logger.i(TAG,"action - set mobile number Success,sequence:"+sequence);
setActionCache.remove(sequence);
}else{
String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode();
Logger.e(TAG, logs);
if(!RetrySetMObileNumberActionIfNeeded(jPushMessage.getErrorCode(),jPushMessage.getMobileNumber())){
Utils.showToast(logs, context);
}
}
}
public static class TagAliasBean{
int action;
Set<String> tags;
String alias;
boolean isAliasAction;
@Override
public String toString() {
return "TagAliasBean{" +
"action=" + action +
", tags=" + tags +
", alias='" + alias + '\'' +
", isAliasAction=" + isAliasAction +
'}';
}
}
}

1054
app/src/main/java/com/dskj/rbchat/login/RegisterActivityBf.java
View File

@@ -1,1054 +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.dskj.rbchat.login;
import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Handler;
import android.text.Html;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityRegisterBfBinding;
import com.dskj.rbchat.databinding.ActivityRegisterBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.SelectCountryDialog;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.PassWordLoginBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GetAndroidUniqueMark;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.TaiWanIDCardUtils;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.engine.CropFileEngine;
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.luck.picture.lib.utils.StyleUtils;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.netease.yunxin.kit.alog.ALog;
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.activities.BrowseActivity;
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.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
import com.yalantis.ucrop.UCrop;
import com.yalantis.ucrop.UCropImageEngine;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import cn.iwgang.simplifyspan.customspan.CustomClickableSpan;
import cn.iwgang.simplifyspan.other.CustomLinkMovementMethod;
import cn.iwgang.simplifyspan.unit.SpecialClickableUnit;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* Welcome Page is launch page
*/
@Deprecated
public class RegisterActivityBf extends BaseActivity {
protected ActivityResultLauncher<String[]> permissionLauncher;
String passwordCode = null;
private static final String TAG = "WelcomeActivity";
private ActivityRegisterBfBinding activityWelcomeBinding;
int step = 1;
int sexType = 1;
CountryBean countryBean;
String avater = null;
long lastTime =0;
PermissionExplainDialog permissionExplainDialog;
@RequiresApi(api = Build.VERSION_CODES.M)
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().setStatusBarColor(getResources().getColor(R.color.color_white));
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
ALog.d(Constant.PROJECT_TAG, TAG, "onCreateView");
IMApplication.setColdStart(true);
activityWelcomeBinding = ActivityRegisterBfBinding.inflate(getLayoutInflater());
setContentView(activityWelcomeBinding.getRoot());
myCountDownTimer = new MyCountDownTimer(60000, 1000);
activityWelcomeBinding.aboutTitleBar.setOnBackIconClickListener(v -> {
onBackPressed();
});
setPrivacyContent(activityWelcomeBinding.mobileTipsTv);
countryBean = DataUtils.getLocCountry(RegisterActivityBf.this);
changeArea();
activityWelcomeBinding.areaTv.setOnClickListener(v -> {
SelectCountryDialog selectCountryDialog = new SelectCountryDialog(RegisterActivityBf.this);
selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() {
@Override
public void toType(CountryBean type) {
countryBean = type;
changeArea();
DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName());
}
});
selectCountryDialog.show();
});
activityWelcomeBinding.nextIv.setOnClickListener(v -> {
if(lastTime>0){
if(System.currentTimeMillis()-lastTime<2000){
return;
}
}
lastTime = System.currentTimeMillis();
if (step < 5) {
if (step == 1) {
if (TextUtils.isEmpty(activityWelcomeBinding.phoneEt.getText().toString().trim())) {
ToastX.showShortToast(R.string.sjhbnwk_txt);
return;
}
checkPhone();
} else if (step == 2) {
if (TextUtils.isEmpty(passwordCode)||passwordCode.length()!=4) {
ToastX.showShortToast(R.string.dxyzmbnwk_txt);
return;
}
checkVerfyCode();
} else if (step == 3) {
if (TextUtils.isEmpty(activityWelcomeBinding.passwordEt.getText().toString().trim())) {
ToastX.showShortToast(R.string.mimabunengweikong_txt);
return;
}
if(!DataUtils.checkPassword(activityWelcomeBinding.passwordEt.getText().toString().trim())){
ToastX.showShortToast(R.string.qjcmmgs_txt);
return;
}
if(activityWelcomeBinding.passwordEt.getText().toString().trim().length()<8){
ToastX.showShortToast(R.string.qjcmmgs_txt1);
return;
}
if (TextUtils.isEmpty(activityWelcomeBinding.passwordEt1.getText().toString().trim())) {
ToastX.showShortToast(R.string.qrmmbnwk_txt);
return;
}
if (!activityWelcomeBinding.passwordEt.getText().toString().trim().equals(activityWelcomeBinding.passwordEt1.getText().toString().trim())) {
ToastX.showShortToast(R.string.mimaquernemimabuyizhi_txt);
return;
}
hideSoftInput(this);
new Handler().postDelayed(() -> {
step += 1;
changeStep();
}, 500);
}else if (step == 4) {
if (TextUtils.isEmpty(activityWelcomeBinding.nicknameEt.getText().toString().trim())) {
ToastX.showShortToast(R.string.nichengbunengweik_txt);
return;
}
hideSoftInput(this);
new Handler().postDelayed(() -> {
step += 1;
changeStep();
}, 500);
}
} else {
if (TextUtils.isEmpty(activityWelcomeBinding.trueNameEt.getText().toString().trim())) {
ToastX.showShortToast(R.string.zhenshixingmingbunengweik_txt);
return;
}
if (TextUtils.isEmpty(activityWelcomeBinding.cardNumberEt.getText().toString().trim())) {
ToastX.showShortToast(R.string.shenfenzbunengwiek_txt);
return;
}
if(!TaiWanIDCardUtils.checkTaiWanIdCardNumber(activityWelcomeBinding.cardNumberEt.getText().toString().trim())){
ToastX.showShortToast(R.string.qsrzqsfzh_txt);
return ;
}
hideSoftInput(this);
phoneRegister();
// loginIM(account, token);
}
});
activityWelcomeBinding.changeSmsCodeTv.setOnClickListener(v -> {
step = 3;
changeStep();
});
activityWelcomeBinding.changePassTv.setOnClickListener(v -> {
step = 2;
changeStep();
});
activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
passwordCode = code;
});
activityWelcomeBinding.sendSmsTv.setOnClickListener(v -> {
toStep2();
});
activityWelcomeBinding.headRy.setOnClickListener(v -> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
if (PermissionUtils.hasPermissions(
RegisterActivityBf.this, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)) {
startPickMedia();
} else {
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});
}
} else {
if (PermissionUtils.hasPermissions(
RegisterActivityBf.this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
startPickMedia();
} else {
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_EXTERNAL_STORAGE});
}
}
});
activityWelcomeBinding.nanIv.setOnClickListener(v -> changeSex(1));
activityWelcomeBinding.nanTv.setOnClickListener(v -> changeSex(1));
activityWelcomeBinding.nvIv.setOnClickListener(v -> changeSex(0));
activityWelcomeBinding.nvTv.setOnClickListener(v -> changeSex(0));
AnimUtil.setAnimViews(activityWelcomeBinding.sendSmsTv, activityWelcomeBinding.changePassTv,
activityWelcomeBinding.nextIv, activityWelcomeBinding.changeSmsCodeTv, activityWelcomeBinding.areaTv,
activityWelcomeBinding.headRy, activityWelcomeBinding.nanIv, activityWelcomeBinding.nvIv);
permissionLauncher =
registerForActivityResult(
new ActivityResultContracts.RequestMultiplePermissions(),
result -> {
if (result != null) {
for (Map.Entry<String, Boolean> entry : result.entrySet()) {
String permission = entry.getKey().toString();
boolean grant = (Boolean) entry.getValue();
if (grant) {
if (TextUtils.equals(
permission, Manifest.permission.READ_EXTERNAL_STORAGE) || TextUtils.equals(
permission, Manifest.permission.READ_MEDIA_IMAGES) || TextUtils.equals(
permission, Manifest.permission.READ_MEDIA_VIDEO)) {
startPickMedia();
}
} else {
if (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();
}
});
}
private void checkVerfyCode() {
Map<String, Object> maps = new HashMap<>();
maps.put("verifyCode", passwordCode);
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
maps.put("areaCode", countryBean.getAreaCodeName());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
Api.getInstance().preCheckVerifyCode(maps)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<RegisteredBean>>() {
@Override
public void onSuccess(Result<RegisteredBean> feedbackResp) {
// dimessLoadingDialog();
if (feedbackResp.data.isCorrect()) {
new Handler().postDelayed(() -> {
step += 1;
changeStep();
}, 500);
} else {
ToastX.showShortToast(R.string.yzmbzq_txt);
}
}
@Override
public void onError(int code, String msg) {
// dimessLoadingDialog();
LogUtils.i("获取到的错误:" + code + "" + msg);
ToastX.showShortToast( msg);
}
});
}
private void checkPhone() {
hideSoftInput(RegisterActivityBf.this);
Map<String, Object> maps = new HashMap<>();
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
maps.put("areaCode", countryBean.getAreaCodeName());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
Api.getInstance().registered(maps)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<RegisteredBean>>() {
@Override
public void onSuccess(Result<RegisteredBean> feedbackResp) {
if (!feedbackResp.data.isRegistered()) {
// checkVerfyCode();
new Handler().postDelayed(() -> {
step += 1;
changeStep();
}, 500);
} else {
ToastX.showShortToast(R.string.yzczjdl_txt);
}
}
@Override
public void onError(int code, String msg) {
LogUtils.i("获取到的错误:" + code + "" + msg);
ToastX.showShortToast(msg);
}
});
}
private void phoneRegister() {
Map<String, Object> maps = new HashMap<>();
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
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);
if (!TextUtils.isEmpty(avater)) {
maps.put("avatar", avater);
}
maps.put("sex", sexType);
maps.put("realName", activityWelcomeBinding.trueNameEt.getText().toString().trim());
maps.put("idCard", activityWelcomeBinding.cardNumberEt.getText().toString().trim());
if(!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
Api.getInstance().phoneRegister(maps)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<String> feedbackResp) {
doLogin();
}
@Override
public void onError(int code, String msg) {
LogUtils.i("获取到的错误:" + code + "" + msg);
ToastX.showShortToast(msg);
}
});
}
/**
* 实施登录的方法.
* <p>
* 本方法中将判断登录用名和密码的字面合法性（比如不能为空等），然后执行真正的异步登录处理.
*
*/
private void doLogin() {
String uidOrMail = String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim().toLowerCase();
String loginPsw = String.valueOf(activityWelcomeBinding.passwordEt.getText()).trim();
PassWordLoginBean passWordLoginBean = new PassWordLoginBean(uidOrMail, loginPsw, countryBean.getAreaCodeName(), 0,
GetAndroidUniqueMark.getUniqueId(RegisterActivityBf.this),IMUIKitConfig.SUBSTATIONID);
if(TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)){
passWordLoginBean = new PassWordLoginBean(uidOrMail, loginPsw, countryBean.getAreaCodeName(), 0,
GetAndroidUniqueMark.getUniqueId(RegisterActivityBf.this));
}
Api.getInstance().passwordLogin(passWordLoginBean)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<LoginBean> feedbackResp) {
if(TextUtils.isEmpty(feedbackResp.data.getUser().getChatToken())){
ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(RegisterActivityBf.this, getString(R.string.zhbhf_jqsb_txt), false);
actionConfirmDialog.show();
return;
}
DataUtils.set(RegisterActivityBf.this,"login_bean", GsonUtils.beanToJSONString(feedbackResp.data));
loginIM(feedbackResp.data.getUser_uid(),feedbackResp.data.getUser().getChatToken());
}
@Override
public void onError(int code, String msg) {
// dimessLoadingDialog();
LogUtils.i("获取到的错误:" + code + "" + msg);
ToastX.showShortToast( msg);
}
});
}
//
// AvaterBean avaterBean = null;
//
// private void updateImage(File file) {
// RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
// MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("file", file.getName(), imageBody);
// Api.getInstance().uploadUserAvatar(imageBodyPart)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result<AvaterBean>>() {
//
// @Override
// public void onSuccess(Result<AvaterBean> feedbackResp) {
// avaterBean = feedbackResp.data;
// }
//
// @Override
// public void onError(int code, String msg) {
// }
// });
// }
private void toStep2() {
hideSoftInput(RegisterActivityBf.this);
Map<String, String> maps = new HashMap<>();
maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
maps.put("areaCode", countryBean.getAreaCodeName());
if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
Api.getInstance().sendSmsForRegister(maps)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<String>>() {
@Override
public void onSuccess(Result<String> feedbackResp) {
myCountDownTimer.start();
ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(RegisterActivityBf.this, getString(R.string.yzmyfs_txt), false);
actionConfirmDialog.show();
activityWelcomeBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt1),
countryBean.getAreaCodeName()+" "+activityWelcomeBinding.phoneEt.getText().toString().trim())));
}
@Override
public void onError(int code, String msg) {
LogUtils.i("获取到的错误:" + code + "" + msg);
ToastX.showShortToast(msg);
}
});
}
MyCountDownTimer myCountDownTimer;
//倒计时函数
private class MyCountDownTimer extends CountDownTimer {
public MyCountDownTimer(long millisInFuture, long countDownInterval) {
super(millisInFuture, countDownInterval);
}
//计时过程
@Override
public void onTick(long l) {
//防止计时过程中重复点击
activityWelcomeBinding.sendSmsTv.setClickable(false);
// getcodeTv.setTextColor(getResources().getColor(R.color.color_adb5bd));
activityWelcomeBinding.sendSmsTv.setText(String.format(getString(R.string.get_code1_txt), (l / 1000)));
}
//计时完毕的方法
@Override
public void onFinish() {
//重新给Button设置文字
activityWelcomeBinding.sendSmsTv.setText(R.string.get_code_txt);
//设置可点击
activityWelcomeBinding.sendSmsTv.setClickable(true);
// getcodeTv.setTextColor(getResources().getColor(R.color.colorAccent));
}
}
/**
* 隐藏软键盘
*/
public void hideSoftInput(Activity activity) {
InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
if (getCurrentFocus() != null && null != imm) {
imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
}
// View view = activity.getCurrentFocus();
//
// if (view != null) {
//
// InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
//
// inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
//
// }
}
private void changeSex(int i) {
sexType = i;
activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_f);
activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_f);
if (i == 1) {
activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_t);
} else {
activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_t);
}
}
@Override
public void onBackPressed() {
if (step == 1) {
super.onBackPressed();
} else {
step -= 1;
changeStep();
}
}
private void changeStep() {
switch (step) {
case 1:
activityWelcomeBinding.step1Ly.setVisibility(View.VISIBLE);
activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
break;
case 2:
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
activityWelcomeBinding.step3Ly.setVisibility(View.VISIBLE);
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
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.step5Ly.setVisibility(View.GONE);
break;
case 3:
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
activityWelcomeBinding.step2Ly.setVisibility(View.VISIBLE);
activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
break;
case 4:
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
activityWelcomeBinding.step4Ly.setVisibility(View.VISIBLE);
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
break;
case 5:
activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
activityWelcomeBinding.step5Ly.setVisibility(View.VISIBLE);
break;
}
}
PictureSelectorStyle selectorStyle;
LocalMedia localMedia = null;
protected void startPickMedia() {
// pickMediaLauncher.launch("image/*;video/*");
TitleBarStyle whiteTitleBarStyle = new TitleBarStyle();
whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(RegisterActivityBf.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(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_black));
whiteTitleBarStyle.setTitleCancelTextColor(ContextCompat.getColor(RegisterActivityBf.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(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
whiteBottomNavBarStyle.setBottomPreviewNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
whiteBottomNavBarStyle.setCompleteCountTips(false);
whiteBottomNavBarStyle.setBottomEditorTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
whiteBottomNavBarStyle.setBottomOriginalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
SelectMainStyle selectMainStyle = new SelectMainStyle();
selectMainStyle.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
selectMainStyle.setDarkStatusBarBlack(true);
selectMainStyle.setSelectNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
selectMainStyle.setSelectTextColor(ContextCompat.getColor(RegisterActivityBf.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(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
selectorStyle = new PictureSelectorStyle();
selectorStyle.setTitleBarStyle(whiteTitleBarStyle);
selectorStyle.setBottomBarStyle(whiteBottomNavBarStyle);
selectorStyle.setSelectMainStyle(selectMainStyle);
PictureSelector.create(this)
.openGallery(SelectMimeType.ofImage())
.setImageEngine(GlideEngine.createGlideEngine())
.setCropEngine(new ImageFileCropEngine())
.setMaxSelectNum(1)
.setSelectorUIStyle(selectorStyle)
.forResult(new OnResultCallbackListener<>() {
@Override
public void onResult(ArrayList<LocalMedia> result) {
if (result.size() > 0) {
Glide.with(RegisterActivityBf.this)
.load(result.get(0).getAvailablePath())
.apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
.into(activityWelcomeBinding.headIv);
localMedia = result.get(0);
toShangchuanAli(new File(result.get(0).getAvailablePath()));
// updateImage(new File(result.get(0).getAvailablePath()));
}
}
@Override
public void onCancel() {
}
});
}
/**
* 自定义裁剪
*/
private class ImageFileCropEngine implements CropFileEngine {
@Override
public void onStartCrop(Fragment fragment, Uri srcUri, Uri destinationUri, ArrayList<String> dataSource, int requestCode) {
UCrop.Options options = buildOptions();
UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource);
uCrop.withOptions(options);
uCrop.setImageEngine(new UCropImageEngine() {
@Override
public void loadImage(Context context, String url, ImageView imageView) {
if (!AppUtils.assertValidRequest(context)) {
return;
}
Glide.with(context).load(url).override(180, 180).into(imageView);
}
@Override
public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener<Bitmap> call) {
Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
if (call != null) {
call.onCall(resource);
}
}
@Override
public void onLoadCleared(@Nullable Drawable placeholder) {
if (call != null) {
call.onCall(null);
}
}
});
}
});
uCrop.start(fragment.requireActivity(), fragment, requestCode);
}
}
/**
* 配制UCrop，可根据需求自我扩展
*
* @return
*/
private UCrop.Options buildOptions() {
UCrop.Options options = new UCrop.Options();
options.setHideBottomControls(false);
options.setFreeStyleCropEnabled(true);
options.setShowCropFrame(true);
options.setShowCropGrid(true);
options.setCircleDimmedLayer(false);
options.withAspectRatio(1, 1);
options.setCropOutputPathDir(getSandboxPath());
options.isCropDragSmoothToCenter(false);
options.setSkipCropMimeType(new String[]{PictureMimeType.ofGIF(), PictureMimeType.ofWEBP()});
options.isForbidCropGifWebp(true);
options.isForbidSkipMultipleCrop(true);
options.setMaxScaleMultiplier(100);
if (selectorStyle != null && selectorStyle.getSelectMainStyle().getStatusBarColor() != 0) {
SelectMainStyle mainStyle = selectorStyle.getSelectMainStyle();
boolean isDarkStatusBarBlack = mainStyle.isDarkStatusBarBlack();
int statusBarColor = mainStyle.getStatusBarColor();
options.isDarkStatusBarBlack(isDarkStatusBarBlack);
if (StyleUtils.checkStyleValidity(statusBarColor)) {
options.setStatusBarColor(statusBarColor);
options.setToolbarColor(statusBarColor);
} else {
options.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
options.setToolbarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
}
TitleBarStyle titleBarStyle = selectorStyle.getTitleBarStyle();
if (StyleUtils.checkStyleValidity(titleBarStyle.getTitleTextColor())) {
options.setToolbarWidgetColor(titleBarStyle.getTitleTextColor());
} else {
options.setToolbarWidgetColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_white));
}
} else {
options.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
options.setToolbarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
options.setToolbarWidgetColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_white));
}
return options;
}
/**
* 创建自定义输出目录
*
* @return
*/
private String getSandboxPath() {
File externalFilesDir = getExternalFilesDir("");
File customFile = new File(externalFilesDir.getAbsolutePath(), "Sandbox");
if (!customFile.exists()) {
customFile.mkdirs();
}
return customFile.getAbsolutePath() + File.separator;
}
private void changeArea() {
activityWelcomeBinding.areaTv.setText(countryBean.getCountryName() + countryBean.getAreaCodeName());
}
private void showMainActivityAndFinish() {
ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
Intent intent = new Intent();
intent.setClass(this, MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
this.startActivity(intent);
finish();
}
private void loginIM(String account, String token) {
ALog.d(Constant.PROJECT_TAG, TAG, "loginIM");
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
LoginInfo loginInfo =
LoginInfo.LoginInfoBuilder.loginInfoDefault(account, token)
.withAppKey(DataUtils.readAppKey(this))
.build();
IMKitClient.loginIM(
loginInfo,
new LoginCallback<LoginInfo>() {
@Override
public void onError(int errorCode, @NonNull String errorMsg) {
ToastX.showShortToast(
String.format(getResources().getString(R.string.login_fail), errorCode));
}
@Override
public void onSuccess(@Nullable LoginInfo data) {
DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOGIN_TOKEN, token);
showMainActivityAndFinish();
}
});
}
private void setPrivacyContent(TextView contentView) {
SpannableStringBuilder stringBuilder = new SpannableStringBuilder(getString(R.string.denglujitongyi_txt));
int len = stringBuilder.length();
stringBuilder.append(getString(R.string.fuwuxieyi_txt));
SpecialClickableUnit unit = new SpecialClickableUnit(contentView,
(tv, clickableSpan) -> {
BrowseActivity.Companion.launch(
RegisterActivityBf.this, getString(R.string.fuwuxieyi_txt), IMUIKitConfig.RBCHAT_SERVICE_CN_URL);
});
unit.setNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
unit.setPressTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
unit.showUnderline();
CustomClickableSpan customClickableSpan = new CustomClickableSpan(unit);
stringBuilder.setSpan(customClickableSpan, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
stringBuilder.append(getString(R.string.yiji_txt));
len = stringBuilder.length();
stringBuilder.append(getString(R.string.yinsizhengche_txt));
SpecialClickableUnit unit1 = new SpecialClickableUnit(contentView,
(tv, clickableSpan) -> {
BrowseActivity.Companion.launch(
RegisterActivityBf.this, getString(R.string.yinsizhengche_txt), IMUIKitConfig.RBCHAT_PRIVACY_CN_URL);
});
unit1.setNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
unit1.setPressTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
unit1.showUnderline();
CustomClickableSpan customClickableSpan1 = new CustomClickableSpan(unit1);
stringBuilder.setSpan(customClickableSpan1, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
contentView.setText(stringBuilder);
contentView.setClickable(false);
contentView.setMovementMethod(CustomLinkMovementMethod.getInstance());//不设置 没有点击事件
contentView.setHighlightColor(Color.TRANSPARENT); //设置点击后的颜色为透明
contentView.setMovementMethod(LinkMovementMethod.getInstance());//不设置点击会失效
}
StsCredentialsBean stsCredentialsBean;
private void toShangchuanAli(File file ) {
showLoadingDialog();
Api.getInstance().stsCredentials()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
@Override
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
toAliYunOss(file);
}
@Override
public void onError(int code, String msg) {
dimessLoadingDialog();
}
});
}
private void toAliYunOss(File file ) {
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, file);
}
public static Handler handler = new Handler();
//
private void toUpdateOss(String bucketName, int i, OSSClient oss, File file ) {
LogUtils.i("1111111111111111111");
String updatePathPicHead = "userAvatarFileName";
LogUtils.i("22222222222222222");
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
LogUtils.i("文件地址是啥1：" + file.getPath());
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
put.setProgressCallback((request, currentSize, totalSize) -> {
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
});
LogUtils.i("55555555555555");
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
@Override
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
LogUtils.i("PutObject", "UploadSuccess");
LogUtils.i("ETag", result.getETag());
LogUtils.i("RequestId", result.getRequestId());
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
handler.post(() -> {
dimessLoadingDialog();
avater = IMUIKitConfig.OSS_URL+"media/" + updatePathPicHead + "/" + fileName;
});
}
@Override
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
dimessLoadingDialog();
LogUtils.i("ErrorCode", clientExcepion.getMessage());
// 请求异常。
if (clientExcepion != null) {
// 本地异常，如网络异常等。
clientExcepion.printStackTrace();
}
if (serviceException != null) {
// 服务异常。
LogUtils.i("ErrorCode", serviceException.getErrorCode());
LogUtils.i("RequestId", serviceException.getRequestId());
LogUtils.i("HostId", serviceException.getHostId());
LogUtils.i("RawMessage", serviceException.getRawMessage());
}
}
});
// }
}
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();
}
}
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);
}
}

131
app/src/main/java/com/dskj/rbchat/main/CustomCallOrderHelper.java
View File

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

390
app/src/main/java/com/dskj/rbchat/main/index/AiChatActivity.java
View File

@@ -1,390 +0,0 @@
package com.dskj.rbchat.main.index;
import static android.widget.RelativeLayout.ALIGN_PARENT_END;
import static android.widget.RelativeLayout.ALIGN_PARENT_START;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.JsonWriter;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityAichatBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.AiConvertBean;
import com.dskj.rbchat.model.AiMessageBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionActivity;
import com.dskj.rbchat.utils.FileUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.google.android.gms.common.util.JsonUtils;
import com.google.android.gms.common.util.SharedPreferencesUtils;
import com.google.gson.JsonParser;
import com.iflytek.sparkchain.core.LLM;
import com.iflytek.sparkchain.core.LLMCallbacks;
import com.iflytek.sparkchain.core.LLMError;
import com.iflytek.sparkchain.core.LLMEvent;
import com.iflytek.sparkchain.core.LLMResult;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class AiChatActivity extends LllChatBaseActivity {
ActivityAichatBinding binding;
public LLM llm;
public CommonAdapter commonAdapter;
private StringBuilder stringBuilderContent = new StringBuilder();
private ArrayList<AiMessageBean> chatMessageBeans = new ArrayList<>();
private boolean isAichat = false;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityAichatBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
llm = IMApplication.getInstance().llm;
if (llm != null) {
llm.registerLLMCallbacks(new LLMCallbacks() {
@Override
public void onLLMResult(LLMResult llmResult, Object o) {
stringBuilderContent.append(llmResult.getContent());
int status = llmResult.getStatus(); //status 为2
if (status == 2) {
AiChatEnd();
}
}
@Override
public void onLLMEvent(LLMEvent llmEvent, Object o) {
}
@Override
public void onLLMError(LLMError llmError, Object o) {
}
});
}
initView();
}
@Override
public int initNavigationBarColor() {
return 0;
}
@Override
public int initStatusBarColor() {
return 0;
}
public void AiChatEnd() {
//結束了對話
// dismissLoading();
if (!TextUtils.isEmpty(stringBuilderContent.toString())) {
runOnUiThread(() -> {
// AiMessageBean bean = new AiMessageBean(replaceContent(stringBuilderContent.toString()), true);
int size = commonAdapter.getDates().size();
AiMessageBean bean = (AiMessageBean) commonAdapter.getDates().get(size - 1);
if (!bean.isAi()) {
String value = replaceContent(stringBuilderContent.toString());
convertContent(value, new CallbackListener() {
@Override
public void setResult(String value) {
AiMessageBean bean = new AiMessageBean(value, true);
commonAdapter.addItems(commonAdapter.getDates().size(), bean);
}
});
} else {
String value = replaceContent(replaceContent(stringBuilderContent.toString()));
AiMessageBean finalBean = bean;
convertContent(value, new CallbackListener() {
@Override
public void setResult(String value) {
finalBean.setMessage(value);
commonAdapter.notifyDataSetChanged();
FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
stringBuilderContent.delete(0, stringBuilderContent.toString().length());
scrollbottom();
binding.editInputchat.setFocusable(true);
binding.editInputchat.setFocusableInTouchMode(true);
isAichat = false;
}
});
}
});
}
}
public void scrollbottom() {
int count = commonAdapter.getItemCount();
binding.recyclerChat.post(() -> binding.recyclerChat.scrollToPosition(count > 0 ? count - 1 : 0));
}
public String replaceContent(String content) {
if (content.contains("您好，我是科大讯飞研发的认知智能大模型，我的名字叫讯飞星火认知大模型。我可以和人类进行自然交流，解答问题，高效完成各领域认知智能需求。")) {
content = getString(R.string.aiintroduct_zh_txt);
return content;
}
if (content.contains("Hello, I am iFLYTEK Spark developed by iFLYTEK, and myHello, I am iFLYTEK Spark developed by iFLYTEK, and my name is iFLYTEK Spark. I can communicate with human beings naturally, answer questions, and efficiently complete the needs of cognitive intelligence in various fields.")) {
content = getString(R.string.aiintroduct_en_txt);
return content;
}
content = content.replace("科大讯飞", "小夢");
content = content.replace("讯飞", "小夢");
content = content.replace("讯飞", "小夢");
content = content.replace("科大", "小夢");
content = content.replace("iFLYTEK Spark", "XiaoMeng");
return content;
}
private void initView() {
binding.titlebarAichat.setActionTextColor(getResources().getColor(R.color.color_themeblue));
binding.titlebarAichat.setActionText(getString(R.string.aihistory_clean));
binding.titlebarAichat.setActionListener(view -> {
if (!isAichat) {
ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(this, getString(R.string.aihistory_title), true);
actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
@Override
public void toSumbit() {
commonAdapter.getDates().clear();
chatMessageBeans.clear();
FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
commonAdapter.notifyDataSetChanged();
}
@Override
public void toCancel() {
}
});
actionConfirmDialog.show();
}
});
binding.titlebarAichat.setOnBackIconClickListener(view -> onBackPressed());
binding.titlebarAichat.setTitle(getString(R.string.ainame_txt));
binding.editInputchat.setOnEditorActionListener(
(v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEND) {
sendText();
}
return true;
});
binding.recyclerChat.setLayoutManager(new LinearLayoutManager(this));
commonAdapter = new CommonAdapter<AiMessageBean>(this, R.layout.item_chatai, chatMessageBeans) {
private TextView tvContent;
@Override
public void convert(ViewHolder holder, AiMessageBean s, int index) {
tvContent = holder.getView(R.id.tv_chatcontent);
tvContent.setText(s.message);
RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
if (s.isAi) {
params.addRule(ALIGN_PARENT_START);
params.setMargins(20, 20, 100, 20);
tvContent.setBackgroundResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.fun_message_receive_bg);
tvContent.setTextColor(mContext.getResources().getColor(R.color.color_333333));
} else {
params.addRule(ALIGN_PARENT_END);
params.setMargins(100, 20, 20, 20);
tvContent.setBackgroundResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.fun_message_send_bg);
tvContent.setTextColor(mContext.getResources().getColor(android.R.color.black));
}
tvContent.setLayoutParams(params);
}
};
String value = FileUtils.getChatData(AiChatActivity.this);
if (!TextUtils.isEmpty(value)) {
List<AiMessageBean> aiMessageBean = GsonUtils.getListFromJSON(value, AiMessageBean.class);
LogUtils.i("aimessagebean-" + aiMessageBean.size());
if (aiMessageBean.size() == 0) {
sendHello();
}
chatMessageBeans.addAll(aiMessageBean);
} else {
sendHello();
}
binding.recyclerChat.setAdapter(commonAdapter);
scrollbottom();
}
public void sendHello() {
AiMessageBean bean = new AiMessageBean(getString(R.string.aihint_txt), true);
commonAdapter.addItems(commonAdapter.getDates().size(), bean);
FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
}
public void sendText() {
String value = binding.editInputchat.getText().toString();
if (!TextUtils.isEmpty(value)) {
startChat(value);
binding.editInputchat.setFocusable(false);
binding.editInputchat.setFocusableInTouchMode(false);
} else {
isAichat = false;
ToastX.showShortToast("请输入聊天内容");
}
}
private void startChat(String content) {
if (llm == null) {
// Log.e(TAG, "startChat failed,please setLLMConfig before!");
return;
}
isAichat = true;
String usrInputText = content;
//Log.d(TAG, "用户输入：" + usrInputText);
// if (usrInputText.length() >= 1)
// binding.editInputchat.append("\n输入:\n " + usrInputText + "\n");
AiMessageBean bean = new AiMessageBean(content, false);
commonAdapter.addItems(commonAdapter.getDates().size(), bean);
FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
AiMessageBean bean2 = new AiMessageBean(getString(R.string.aianswer_txt), true);
commonAdapter.addItems(commonAdapter.getDates().size(), bean2);
scrollbottom();
KeyboardUtil.hideSoftInput(this);
String myContext = "myContext";
binding.editInputchat.setText("");
// showLoading();
int ret = llm.arun(usrInputText, myContext);
if (ret != 0) {
dismissLoading();
//Log.e(TAG, "SparkChain failed:\n" + ret);
return;
}
}
private void convertContent(String content, CallbackListener callbackListener) {
Api.getInstance().convertzh(1, content, "nxmfxsiggkcw1pbl", "p7UncBBNfLmq1aoajsHB2qnfiznmiMHs")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<AiConvertBean> o) {
if (o.code == 1 && o.data != null) {
try {
String result = o.data.getConvertContent();
callbackListener.setResult(result);
} catch (Exception e) {
callbackListener.setResult(content);
}
} else {
callbackListener.setResult(content);
}
}
@Override
public void onError(int code, String msg) {
callbackListener.setResult(content);
}
});
}
public interface CallbackListener {
void setResult(String value);
}
// private void writeData() {
// try {
//// if (chatMessageBeans.size() > 100) { //只存100条
//// chatMessageBeans.remove(0);
//// }
// File file = new File(getFilesDir(), chatFileName);
// String jsonString = GsonUtils.beanToJSONString(chatMessageBeans);
// FileWriter fileWriter = new FileWriter(file, false);
// BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
// bufferedWriter.write(jsonString);
// bufferedWriter.close();
// } catch (IOException e) {
// LogUtils.i(e.getMessage());
// }
//
// }
// @Override
// public void onBackPressed() {
// Intent intent = new Intent();
// intent.putExtra("update", isUpdate);
// setResult(RESULT_OK, intent);
// finish();
//// super.onBackPressed();
// }
}

75
app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNewActivity.java
View File

@@ -1,75 +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.dskj.rbchat.main.mine.setting;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import com.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityMineSettingBinding;
import com.dskj.rbchat.databinding.ActivitySettingBinding;
import com.dskj.rbchat.main.mine.MineFragment;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapFragment;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MarkerOptions;
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;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
public class SettingNewActivity extends BaseActivity implements OnMapReadyCallback {
private ActivitySettingBinding viewBinding;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
getWindow().setStatusBarColor(getResources().getColor(R.color.color_white));
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
super.onCreate(savedInstanceState);
viewBinding = ActivitySettingBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
initView();
}
private void initView() {
viewBinding.settingTitleBar.getBackImageView().setOnClickListener(v -> finish());
MapFragment mapFragment = (MapFragment) getFragmentManager()
.findFragmentById(R.id.mapview);
mapFragment.getMapAsync(this);
}
@Override
public void onMapReady(@NonNull GoogleMap googleMap) {
LatLng sydney = new LatLng(-33.867, 151.206);
googleMap.setMyLocationEnabled(true);
googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 13));
googleMap.addMarker(new MarkerOptions()
.title("Sydney")
.snippet("The most populous city in Australia.")
.position(sydney));
}
}

62
app/src/main/java/com/dskj/rbchat/wxapi/WXEntryActivity.java
View File

@@ -1,62 +0,0 @@
package com.dskj.rbchat.wxapi;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.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;
import com.tencent.mm.opensdk.modelbase.BaseResp;
import com.tencent.mm.opensdk.modelmsg.SendAuth;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
/**
* 微信登陆分享回调Activity
* @create time 2015-05-25
*/
public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
private IWXAPI wxAPI;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID,true);
wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
wxAPI.handleIntent(getIntent(), this);
}
@Override
protected void onNewIntent(Intent intent){
super.onNewIntent(intent);
wxAPI.handleIntent(getIntent(),this);
Log.i("ansen","WXEntryActivity onNewIntent");
}
@Override
public void onReq(BaseReq arg0) {
Log.i("ansen","WXEntryActivity onReq:"+arg0);
}
@Override
public void onResp(BaseResp resp){
if(resp.getType()== ConstantsAPI.COMMAND_SENDMESSAGE_TO_WX){//分享
Log.i("ansen","微信分享操作.....");
WeiXin weiXin=new WeiXin(2,resp.errCode,"");
RxBus.getInstance().post(weiXin);
}else if(resp.getType()==ConstantsAPI.COMMAND_SENDAUTH){//登陆
Log.i("ansen", "微信登录操作.....");
SendAuth.Resp authResp = (SendAuth.Resp) resp;
WeiXin weiXin=new WeiXin(1,resp.errCode,authResp.code);
RxBus.getInstance().post(weiXin);
}
finish();
}
}

55
app/src/main/java/com/dskj/rbchat/wxapi/WXPayEntryActivity.java
View File

@@ -1,55 +0,0 @@
package com.dskj.rbchat.wxapi;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.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;
import com.tencent.mm.opensdk.modelbase.BaseResp;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
/**
* 微信支付回调Activity
* @create time 2017-09-15
*/
public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
private IWXAPI wxAPI;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID);
wxAPI.handleIntent(getIntent(), this);
}
@Override
protected void onNewIntent(Intent intent){
super.onNewIntent(intent);
setIntent(intent);
wxAPI.handleIntent(intent, this);
}
@Override
public void onReq(BaseReq baseReq) {}
@Override
public void onResp(BaseResp resp) {
Log.i("ansen", "微信支付回调 返回错误码:"+resp.errCode+" 错误名称:"+resp.errStr);
if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX){//微信支付
WeiXin weiXin=new WeiXin(3,resp.errCode,"");
RxBus.getInstance().post(weiXin);
}
finish();
}
}

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

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

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

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

132
app/src/main/java/com/dskj/rbchat/IMApplication.java → app/src/main/java/com/hbl/lewan/IMApplication.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat;
package com.hbl.lewan;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.PATH_FUN_TEAM_SETTING_PAGE;
@@ -17,9 +17,10 @@ import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import com.dskj.rbchat.imkit.team.TeamAnnouncementActivity;
import com.dskj.rbchat.map.LocationPageActivity1;
import com.dskj.rbchat.utils.GsonUtils;
import com.hbl.lewan.imkit.team.TeamAnnouncementActivity;
import com.hbl.lewan.map.LocationPageActivity1;
import com.hbl.lewan.utils.GsonUtils;
import com.heytap.msp.push.HeytapPushManager;
import com.netease.yunxin.kit.chatkit.model.IMMessageInfo;
import com.netease.yunxin.kit.chatkit.repo.ChatObserverRepo;
import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
@@ -34,32 +35,25 @@ import androidx.annotation.Nullable;
import androidx.multidex.MultiDexApplication;
import com.blankj.utilcode.util.LanguageUtils;
import com.dskj.rbchat.contact.ContactGroupSettingActivity;
import com.dskj.rbchat.contact.FunBlackListActivity;
import com.dskj.rbchat.imkit.person.PersonSettingActivity;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.imkit.team.TeamSettingActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.mine.MineInfoActivity;
import com.dskj.rbchat.contact.UserInfoActivity;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.push.PushMessageHandler;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.TiktoInfokActivity;
import com.dskj.rbchat.welcome.WelcomeActivity;
import com.heytap.msp.push.HeytapPushManager;
import com.huawei.hms.support.common.ActivityMgr;
import com.iflytek.sparkchain.core.LLM;
import com.iflytek.sparkchain.core.LLMConfig;
import com.iflytek.sparkchain.core.Memory;
import com.iflytek.sparkchain.core.SparkChain;
import com.iflytek.sparkchain.core.SparkChainConfig;
import com.netease.nimlib.sdk.NIMClient;
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.netease.nimlib.sdk.SDKOptions;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.netease.yunxin.kit.alog.ALog;
@@ -74,7 +68,7 @@ import com.netease.yunxin.kit.corekit.im.repo.SettingRepo;
import com.netease.yunxin.kit.corekit.im.utils.IMKitUtils;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
import com.netease.yunxin.kit.locationkit.LocationKitClient;
//import com.netease.yunxin.kit.locationkit.LocationKitClient;
import com.tencent.bugly.crashreport.CrashReport;
import com.vivo.push.PushClient;
import com.vivo.push.util.VivoPushException;
@@ -83,9 +77,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import cn.jiguang.api.JCoreInterface;
import cn.jiguang.api.utils.JCollectionAuth;
import cn.jpush.android.api.JPushInterface;
//import cn.jiguang.api.JCoreInterface;
//import cn.jiguang.api.utils.JCollectionAuth;
//import cn.jpush.android.api.JPushInterface;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -96,7 +90,7 @@ public class IMApplication extends MultiDexApplication {
public static final int LOGIN_PARENT_SCOPE = 2;
public static final int LOGIN_SCOPE = 7;
public static IMApplication AppContext;
public LLM llm;
// public LLM llm;
public static String schemeUserId = null;
public static String schemeTeamId = null;
public static String schemeSilverQrCode = null;
@@ -121,12 +115,12 @@ public class IMApplication extends MultiDexApplication {
CrashReport.initCrashReport(getApplicationContext(), "29ecb7c2d2", true);
initLang();
initAiSDK();
JPushInterface.setDebugMode(BuildConfig.DEBUG);
JPushInterface.init(this);
// JPushInterface.setDebugMode(BuildConfig.DEBUG);
// JPushInterface.init(this);
// JCoreInterface.testCountryCode(this, "us");
// String id = JPushInterface.getRegistrationID(this);
// LogUtils.d("id===" + id);
JCollectionAuth.setAuth(this, true); //如初始化被拦截过，将重试初始化过程
// JCollectionAuth.setAuth(this, true); //如初始化被拦截过，将重试初始化过程
RxBus.getInstance().toObservable(RxBusToVoom.class)
.subscribeOn(rx.schedulers.Schedulers.io())
.unsubscribeOn(rx.schedulers.Schedulers.io())
@@ -198,25 +192,25 @@ public class IMApplication extends MultiDexApplication {
public void initAiSDK() {
// 初始化SDK，Appid等信息在清单中配置
SparkChainConfig sparkChainConfig = SparkChainConfig.builder();
sparkChainConfig.appID(IMUIKitConfig.AI_APPID)
.apiKey(IMUIKitConfig.AI_APIKEY)
.apiSecret(IMUIKitConfig.AI_APISECRET)//应用申请的appid三元组
.logLevel(0);
int ret = SparkChain.getInst().init(getApplicationContext(), sparkChainConfig);
if (ret == 0) {
Log.d(TAG, "SDK初始化成功：" + ret);
LLMConfig llmConfig = LLMConfig.builder();
llmConfig.domain("generalv3");
// llmConfig.url("ws(s)://spark-api.xf-yun.com/v3.1/chat");
//memory有两种，windows_memory和tokens_memory，二选一即可
Memory window_memory = Memory.windowMemory(5);
llm = new LLM(llmConfig, window_memory);
// Memory tokens_memory = Memory.tokenMemory(8192);
// llm = new LLM(llmConfig,tokens_memory);
}
// SparkChainConfig sparkChainConfig = SparkChainConfig.builder();
// sparkChainConfig.appID(IMUIKitConfig.AI_APPID)
// .apiKey(IMUIKitConfig.AI_APIKEY)
// .apiSecret(IMUIKitConfig.AI_APISECRET)//应用申请的appid三元组
// .logLevel(0);
// int ret = SparkChain.getInst().init(getApplicationContext(), sparkChainConfig);
// if (ret == 0) {
// Log.d(TAG, "SDK初始化成功：" + ret);
// LLMConfig llmConfig = LLMConfig.builder();
// llmConfig.domain("generalv3");
//// llmConfig.url("ws(s)://spark-api.xf-yun.com/v3.1/chat");
// //memory有两种，windows_memory和tokens_memory，二选一即可
// Memory window_memory = Memory.windowMemory(5);
// llm = new LLM(llmConfig, window_memory);
//// Memory tokens_memory = Memory.tokenMemory(8192);
//// llm = new LLM(llmConfig,tokens_memory);
//
//
// }
}
@@ -287,14 +281,14 @@ public class IMApplication extends MultiDexApplication {
private void initUIKit() {
SDKOptions options = NimSDKOptionConfig.getSDKOptions(this, DataUtils.readAppKey(this));
IMKitClient.init(this, null, options);
IMKitClient.init(this, getLoginInfo(), options);
ALog.d(Constant.PROJECT_TAG, TAG, "initUIKit");
if (IMKitUtils.isMainProcess(this)) {
ALog.d(Constant.PROJECT_TAG, TAG, "initUIKit:isMainProcess");
LocationKitClient.init(this);
// LocationKitClient.init(this);
//huawei push
ActivityMgr.INST.init(this);
// ActivityMgr.INST.init(this);
//oppo push
HeytapPushManager.init(this, true);
try {
@@ -310,6 +304,22 @@ public class IMApplication extends MultiDexApplication {
}
}
public LoginInfo getLoginInfo() {
String account = DataUtils.get(IMApplication.getAppContext(), IMUIKitConfig.LOGIN_ACCOUNT, "");
String token = DataUtils.get(IMApplication.getAppContext(), IMUIKitConfig.LOGIN_TOKEN, "");
//填入你的 account and token
if (!TextUtils.isEmpty(account) && !TextUtils.isEmpty(token)) {
//每30天重新登录一次
if(System.currentTimeMillis()- DataUtils.get(IMApplication.getAppContext(),"last_login_time",0l)>(1000*60*60*24*30)){
return null;
}else {
return new LoginInfo(account, token);
}
} else {
return null;
}
}
// 如果返回值为 null，则全部使用默认参数。
private SDKOptions options() {
@@ -406,7 +416,7 @@ public class IMApplication extends MultiDexApplication {
@Override
public void onTerminate() {
SparkChain.getInst().unInit();
// SparkChain.getInst().unInit();
foregroundActCount = 0;
super.onTerminate();
}

45
app/src/main/java/com/dskj/rbchat/IMUIKitConfig.java → app/src/main/java/com/hbl/lewan/IMUIKitConfig.java
View File

@@ -1,7 +1,7 @@
// Copyright (c) 2022 NetEase, Inc. All rights reserved.
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat;
package com.hbl.lewan;
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 = "https://api.letschat2023.com/web/userAgreement.html?v=" + System.currentTimeMillis();
public static String RBCHAT_SERVICE_CN_URL = "https://api.letschat2023.com/web/serviceAgreement.html?v=" + System.currentTimeMillis(); //服务协议
public static String RBCHAT_PRIVACY_CN_URL = "https://download.hnsdl.com/userAgreement.html?v=" + System.currentTimeMillis();
public static String RBCHAT_SERVICE_CN_URL = "https://download.hnsdl.com/serviceAgreement.html?v=" + System.currentTimeMillis(); //服务协议
public static String MIANMI_AGREEMENT_CN_URL = "https://api.letschat2023.com/web/nopwdAgreement.html?v=" + System.currentTimeMillis(); //免密协议
public static String MIANMI_AGREEMENT_CN_URL = "https://download.hnsdl.com/nopwdAgreement.html?v=" + System.currentTimeMillis(); //免密协议
public static String SUBSTATIONID = ApiService.SUBSTATIONID;
@@ -36,24 +36,24 @@ public class IMUIKitConfig {
/**
* 支付地址
*/
public static String ONLINE_PAYMENT_URL = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://admin.letschat2023.com/#/appPay" : "https://admin-test.letschat2023.com/#/appPay";
// public static String ONLINE_PAYMENT_URL = "https://admin.letschat2023.com/#/appPay";
public static String ONLINE_PAYMENT_URL = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://admin.hnsdl.com/#/appPay" : "https://admin-test.hnsdl.com/#/appPay";
// public static String ONLINE_PAYMENT_URL = "https://admin.hnsdl.com/#/appPay";
/**
* 分享落地页行动码地址
*/
// public static String SHARE_INVCODE = "http://qtalk666.top/#/download?code=%s";
public static String SHARE_INVCODE = "https://admin.letschat2023.com/#/downLoad?code=%s&userId=%s";
public static String SHARE_INVCODEGROUP = "https://admin.letschat2023.com/#/downLoad?code=%s&teamId=%s";
public static String SHARE_INVCODEGROUP1 = "https://admin.letschat2023.com/#/downLoad?teamId=%s";
public static String SHARE_INVCODE = "https://admin.hnsdl.com/#/downLoad?code=%s&userId=%s";
public static String SHARE_INVCODEGROUP = "https://admin.hnsdl.com/#/downLoad?code=%s&teamId=%s";
public static String SHARE_INVCODEGROUP1 = "https://admin.hnsdl.com/#/downLoad?teamId=%s";
public static String SHARE_INVCODE1 = "https://admin.letschat2023.com/#/downLoad?userId=%s";
public static String SHARE_INVCODE_START = "https://admin.letschat2023.com/#/downLoad";
public static String SHARE_INVCODE1 = "https://admin.hnsdl.com/#/downLoad?userId=%s";
public static String SHARE_INVCODE_START = "https://admin.hnsdl.com/#/downLoad";
/***
* 分享用户ID 行动码
*/
// public static String SHARE_ADD_USER = "time_go_chat://add_user/%s";
// public static String SHARE_ADD_USER = "time_go_mm://add_user/%s";
/***
* 分享用户ID 行动码
@@ -63,24 +63,24 @@ public class IMUIKitConfig {
/**
* 分享群ID 行动码
*/
public static String SHARE_JOIN_GROUP = "time_go_chat://join_group/%s";
public static String SHARE_JOIN_GROUP = "time_go_mm://join_group/%s";
/**
* 收款码
*/
public static String SHARE_USER_PAYMENT_CODE = "time_go_chat://payment_code/%s";
public static String SHARE_USER_PAYMENT_CODE = "time_go_mm://payment_code/%s";
/**
* 储币机兑币
*/
public static String SHARE_ATM_SAVE_CODE = "time_go_chat://payment_atm/%s";
public static String SHARE_ATM_SAVE_CODE = "time_go_mm://payment_atm/%s";
public static String bucketName = "letschat";//shenqi777
public static String OSS_URL = "https://" + bucketName + ".oss-cn-hongkong.aliyuncs.com/";
public static String OSS_URL = "https://qn.hnsdl.com/";
public static String AVATAR_DOWNLOAD_CONTROLLER_URL_ROOT = OSS_URL + "%s";
@@ -126,7 +126,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.letschat2023.com/") ? "https://toy.letschat2023.com/#/" : "https://toy-test.letschat2023.com/#/";
public static String WAWAJ_PATH = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://toy.letschat2023.com/#/" : "https://toy-test.letschat2023.com/#/";
/**
* 银币商城
@@ -140,23 +140,26 @@ public class IMUIKitConfig {
/**
* 银币商城
*/
public static String YINBI_PATH = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://shop.letschat2023.com/#/" : "http://8.218.226.64:2396/";
public static String YINBI_PATH = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://shop.hnsdl.com/#/" : "https://shop.hnsdl.com/";
/**
* 商户管理
*/
public static String MERCHANT_URL = ApiService.URL.equals("https://api.letschat2023.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.hnsdl.com/") ? "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.letschat2023.com/") ? "https://biz.letschat2023.com/#/" : "https://biz-test.letschat2023.com/#/";
public static String MERCHANT_USER_URL = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://biz.letschat2023.com/#/" : "https://biz-test.letschat2023.com/#/";
/**
* 兑换积分
*/
public static String SILVER_URL = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://shop.letschat2023.com/#/pages/scanexchange/index?tagCode=" : "http://8.218.226.64:2396/#/pages/scanexchange/index?tagCode=";
public static String SILVER_URL = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://shop.hnsdl.com/#/pages/scanexchange/index?tagCode=" : "https://shop-test.hnsdl.com/#/pages/scanexchange/index?tagCode=";
// public static String SILVER_URL = "https://shop.hnsdl.com/#/pages/scanexchange/index?tagCode=";
// public static String SILVER_URL ="http://192.168.8.200:8080/#/pages/scanexchange/index?tagCode=" ;
/**
* 客服列表ids

16
app/src/main/java/com/dskj/rbchat/NimSDKOptionConfig.java → app/src/main/java/com/hbl/lewan/NimSDKOptionConfig.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat;
package com.hbl.lewan;
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.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.push.PushUserInfoProvider;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
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.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.dskj.rbchat/raw/xxmoren";
"android.resource://com.hbl.lewan/raw/xxmoren";
public static final int LED_ON_MS = 1000;
public static final int LED_OFF_MS = 1500;
@@ -179,7 +179,7 @@ public class NimSDKOptionConfig {
public static StatusBarNotificationConfig loadStatusBarNotificationConfig() {
StatusBarNotificationConfig config = new StatusBarNotificationConfig();
config.notificationEntrance = MainActivity.class;
config.notificationSmallIconId = R.mipmap.ic_launcher;
config.notificationSmallIconId = R.mipmap.ic_launche;
config.notificationColor = Color.parseColor("#3a9efb");
config.notificationSound = null;
config.notificationFoldStyle = NotificationFoldStyle.ALL;
@@ -193,7 +193,7 @@ public class NimSDKOptionConfig {
/**
* config app image/voice/file/log directory
* /storage/emulated/0/Android/data/com.dskj.rbchat/cache
* /storage/emulated/0/Android/data/com.hbl.lewan/cache
*/
static String getAppCacheDir(Context context) {
String storageRootPath = null;

6
app/src/main/java/com/dskj/rbchat/NotificationMsgService.java → app/src/main/java/com/hbl/lewan/NotificationMsgService.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat;
package com.hbl.lewan;
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.dskj.rbchat.utils.LogUtils;
import com.hbl.lewan.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;
@@ -97,7 +97,7 @@ public class NotificationMsgService extends Service {
}
}
NotificationCompat.Builder builder = new NotificationCompat.Builder(this, channelID)
.setSmallIcon(R.mipmap.ic_launcher)
.setSmallIcon(R.mipmap.ic_launche)
.setContentTitle(messageInfo.getFromNick())
.setContentText(content)
.setContentIntent(pendingIntent)

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

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

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

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

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

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

4
app/src/main/java/com/dskj/rbchat/base/LllChatBaseActivity.java → app/src/main/java/com/hbl/lewan/base/LllChatBaseActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.base;
package com.hbl.lewan.base;
import android.os.Bundle;
import android.view.MotionEvent;
@@ -6,7 +6,7 @@ import android.view.inputmethod.InputMethodManager;
import androidx.annotation.Nullable;
import com.dskj.rbchat.R;
import com.hbl.lewan.R;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
public abstract class LllChatBaseActivity extends BaseActivity {

6
app/src/main/java/com/dskj/rbchat/contact/ContactGroupSettingActivity.java → app/src/main/java/com/hbl/lewan/contact/ContactGroupSettingActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.contact;
package com.hbl.lewan.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;
@@ -23,8 +23,8 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.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;

2
app/src/main/java/com/dskj/rbchat/contact/FunBlackListActivity.java → app/src/main/java/com/hbl/lewan/contact/FunBlackListActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.contact;
package com.hbl.lewan.contact;
import android.graphics.Typeface;
import android.os.Bundle;

282
app/src/main/java/com/dskj/rbchat/contact/ReportActivity.java → app/src/main/java/com/hbl/lewan/contact/ReportActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.contact;
package com.hbl.lewan.contact;
import android.Manifest;
import android.content.Context;
@@ -30,36 +30,36 @@ import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityTransferInfoBinding;
import com.dskj.rbchat.databinding.ReportActivityBinding;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.GroupActionBean;
import com.dskj.rbchat.model.ReportBean;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
@@ -80,11 +80,18 @@ 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;
@@ -254,18 +261,36 @@ public class ReportActivity extends BaseActivity {
}
StsCredentialsBean stsCredentialsBean;
String stsCredentialsBean;
private void toShangchuanAli() {
showLoadingDialog();
Api.getInstance().stsCredentials()
// Api.getInstance().stsCredentials()
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<>() {
// @Override
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
// stsCredentialsBean = feedbackResp.data;
// toAliYunOss();
// }
//
// @Override
// public void onError(int code, String msg) {
// dimessLoadingDialog();
// }
// });
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
public void onSuccess(Result<String> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
toAliYunOss();
// toAliYunOss(file, isHead);
toUpdateOssNew(0);
}
@Override
@@ -275,83 +300,152 @@ public class ReportActivity extends BaseActivity {
});
}
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 toUpdateOss(String bucketName, int i, OSSClient oss) {
String updatePathPic = "report";
// Calendar calendar= Calendar.getInstance();
// String year = calendar.get(Calendar.YEAR)+"";
// String month = (calendar.get(Calendar.MONTH)+1)<10?"0"+(calendar.get(Calendar.MONTH)+1):(calendar.get(Calendar.MONTH)+1)+"";
// String d = calendar.get(Calendar.DATE)<10?"0"+calendar.get(Calendar.DAY_OF_MONTH):calendar.get(Calendar.DAY_OF_MONTH)+"";
String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
if (i < uris.size()) {
File file = new File(uriStrings.get(i));
String fileName = System.currentTimeMillis() + "_" + file.getName();
// 构造上传请求。
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + data + "/" + fileName + ".png", localMedias.get(i).getRealPath());
put.setProgressCallback((request, currentSize, totalSize) -> {
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
// if(isVideo){
// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
// 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 = "report";
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);
//OSSAsyncTask task =
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
@Override
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
LogUtils.i("PutObject", "UploadSuccess");
LogUtils.i("ETag", result.getETag());
LogUtils.i("RequestId", result.getRequestId());
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + updatePathPic + "/" + data + "/" + fileName + ".png");
if (i < uris.size()) {
File file = new File(uriStrings.get(i));
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath());
String files = "media/" + updatePathPic + "/" + fileName;
byte[] sss = convertFileToBytes(file);
LogUtils.i("结果是啥开始：" + sss);
uploadManager.put(sss, files, stsCredentialsBean, (key, info, response) -> {
// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info));
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
dimessLoadingDialog();
if (info != null && info.isOK()) {
// 上传成功
outputStrings.add(IMUIKitConfig.OSS_URL + files);
//https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
if (i == uris.size() - 1) {
sumbit();
} else {
toUpdateOss(bucketName, i + 1, oss);
toUpdateOssNew(i + 1);
}
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
}
}, options);
}
}
@Override
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
dimessLoadingDialog();
LogUtils.i("ErrorCode", clientExcepion.getMessage());
//
public static byte[] convertFileToBytes(File file) {
// 使用ByteArrayOutputStream来收集字节数据
FileInputStream fis = null;
try {
fis = new FileInputStream(file);
byte[] bytesArray = new byte[(int) file.length()];
fis.read(bytesArray);
fis.close();
return bytesArray;
} catch (FileNotFoundException e) {
// throw new RuntimeException(e);
return null;
} catch (IOException e) {
// throw new RuntimeException(e);
return null;
// 请求异常。
if (clientExcepion != null) {
// 本地异常，如网络异常等。
clientExcepion.printStackTrace();
}
if (serviceException != null) {
// 服务异常。
LogUtils.i("ErrorCode", serviceException.getErrorCode());
LogUtils.i("RequestId", serviceException.getRequestId());
LogUtils.i("HostId", serviceException.getHostId());
LogUtils.i("RawMessage", serviceException.getRawMessage());
}
}
});
}
}
}
//
// private void toUpdateOss(String bucketName, int i, OSSClient oss) {
// String updatePathPic = "report";
//// Calendar calendar= Calendar.getInstance();
//// String year = calendar.get(Calendar.YEAR)+"";
//// String month = (calendar.get(Calendar.MONTH)+1)<10?"0"+(calendar.get(Calendar.MONTH)+1):(calendar.get(Calendar.MONTH)+1)+"";
//// String d = calendar.get(Calendar.DATE)<10?"0"+calendar.get(Calendar.DAY_OF_MONTH):calendar.get(Calendar.DAY_OF_MONTH)+"";
//
// String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
// if (i < uris.size()) {
//
// File file = new File(uriStrings.get(i));
// String fileName = System.currentTimeMillis() + "_" + file.getName();
// // 构造上传请求。
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + data + "/" + fileName + ".png", localMedias.get(i).getRealPath());
//
//
// put.setProgressCallback((request, currentSize, totalSize) -> {
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
//// if(isVideo){
//// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
//// }
//
//
// });
//
// //OSSAsyncTask task =
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
// @Override
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
// LogUtils.i("PutObject", "UploadSuccess");
// LogUtils.i("ETag", result.getETag());
// LogUtils.i("RequestId", result.getRequestId());
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
// outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + updatePathPic + "/" + data + "/" + fileName + ".png");
// //https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
// if (i == uris.size() - 1) {
// sumbit();
// } else {
// toUpdateOss(bucketName, i + 1, oss);
// }
// }
//
// @Override
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
// dimessLoadingDialog();
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
//
// // 请求异常。
// if (clientExcepion != null) {
// // 本地异常，如网络异常等。
// clientExcepion.printStackTrace();
// }
// if (serviceException != null) {
// // 服务异常。
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
// LogUtils.i("RequestId", serviceException.getRequestId());
// LogUtils.i("HostId", serviceException.getHostId());
// LogUtils.i("RawMessage", serviceException.getRawMessage());
// }
// }
// });
// }
// }
//
//不带圆角，目前视频使用
public void loadImage1(Context context, String path, CircleImageView imageView) {
// RoundedCorners roundedCorners = new RoundedCorners(20);//数字为圆角度数

48
app/src/main/java/com/dskj/rbchat/contact/UserInfoActivity.java → app/src/main/java/com/hbl/lewan/contact/UserInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.contact;
package com.hbl.lewan.contact;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -28,27 +28,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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityUserInfoBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.main.mine.EditFriendUserInfoActivity;
import com.dskj.rbchat.main.mine.EditUserInfoActivity;
import com.dskj.rbchat.main.mine.photo.UserPhotoListActivity;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.TiktokActivityMe;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
@@ -994,8 +994,8 @@ public class UserInfoActivity extends BaseActivity {
try {
Glide.with(UserInfoActivity.this)
.load(url)
.error(R.color.color_themeblue)
.placeholder(R.color.color_themeblue)
.error(com.netease.yunxin.kit.chatkit.ui.R.color.color_6b3689)
.placeholder(com.netease.yunxin.kit.chatkit.ui.R.color.color_6b3689)
.into(viewBinding.forBgIv);
} catch (Exception e) {
e.printStackTrace();

38
app/src/main/java/com/dskj/rbchat/custom/ChatStickerViewHolder.java → app/src/main/java/com/hbl/lewan/custom/ChatStickerViewHolder.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.custom;
package com.hbl.lewan.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.dskj.rbchat.BuildConfig;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ChatMessageStickerViewBinding;
import com.dskj.rbchat.databinding.LinkImageBinding;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.CircleShareBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.TiktoInfokActivity;
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.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;
@@ -89,6 +89,7 @@ public class ChatStickerViewHolder extends FunChatBaseMessageViewHolder {
if(!TextUtils.isEmpty(attachment.getPicPath())) {
if (attachment.getPicPath().startsWith("http")) {
LogUtils.i("影音地址2："+attachment.getPicPath());
Glide.with(parent.getContext())
.load(attachment.getPicPath())
@@ -98,6 +99,8 @@ public class ChatStickerViewHolder extends FunChatBaseMessageViewHolder {
} else {
// imgs.add(ApiService.URL1 + dongtaiBean.getPicture1());
LogUtils.i("影音地址1："+attachment.getPicPath());
Glide.with(parent.getContext())
.load(ApiService.URL + attachment.getPicPath())
.error(com.netease.yunxin.kit.chatkit.ui.R.drawable.chat_zhanwei_img)
@@ -105,15 +108,16 @@ public class ChatStickerViewHolder extends FunChatBaseMessageViewHolder {
.into(binding.picIc);
}
}else if(!TextUtils.isEmpty(attachment.getVideoPath())){
LogUtils.i("影音地址："+attachment.getVideoPath());
if (!attachment.getVideoPath().startsWith("http")) {
Glide.with(parent.getContext())
.load(ApiService.URL + attachment.getVideoPath())
.load(ApiService.URL + attachment.getVideoPath()+"?vframe/jpg/offset/1")
.error(com.netease.yunxin.kit.chatkit.ui.R.drawable.chat_zhanwei_img)
.placeholder(com.netease.yunxin.kit.chatkit.ui.R.drawable.chat_zhanwei_img)
.into(binding.picIc);
binding.videoTag.setVisibility(View.GONE);
} else {
String picUrl = attachment.getVideoPath().replace("video_input", "video_output") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
String picUrl = attachment.getVideoPath()+"?vframe/jpg/offset/1";
Glide.with(parent.getContext())
.load(picUrl)
.error(com.netease.yunxin.kit.chatkit.ui.R.drawable.chat_zhanwei_img)

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.custom;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.utils.DataUtils;
import com.hbl.lewan.R;
import com.hbl.lewan.utils.DataUtils;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.CustomDatePicker;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.DateFormatUtils;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.PickerView;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.custom;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.hbl.lewan.R;
import java.util.ArrayList;
import java.util.List;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogActionConfirmBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogActionConfirmBinding;
/**
* 通用弹窗

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogActionConfirmBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogActionConfirmBinding;
/**
* 通用弹窗

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogActionConfirmBinding;
import com.dskj.rbchat.databinding.DialogActionInputconfirmBinding;
import com.dskj.rbchat.utils.CharInputFilter;
import com.dskj.rbchat.utils.LogUtils;
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 java.util.regex.Matcher;
import java.util.regex.Pattern;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogMianmiConfirmBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogMianmiConfirmBinding;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
/**

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogMianmiXieyiBinding;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogMianmiXieyiBinding;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
/**

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.DialogPayCashBinding;
import com.dskj.rbchat.login.ChongZhiActivity;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionActivity;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.PaySettingActivity;
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
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.netease.yunxin.kit.common.ui.utils.ToastX;
import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.databinding.DialogPayFingerBinding;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.utils.AppUtils;
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 java.util.ArrayList;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.DialogPayNewBinding;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
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.netease.yunxin.kit.common.ui.utils.ToastX;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.DialogSelectCountryBinding;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.utils.DataUtils;
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 java.util.ArrayList;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogSelectLangTypeBinding;
import com.dskj.rbchat.utils.DataUtils;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogSelectLangTypeBinding;
import com.hbl.lewan.utils.DataUtils;
import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import java.util.Locale;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogSelectPayTypeBinding;
import com.dskj.rbchat.model.WalletBean;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogSelectPayTypeBinding;
import com.hbl.lewan.model.WalletBean;
public class SelectPayTypeDialog extends Dialog {

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogSelectLangTypeBinding;
import com.dskj.rbchat.databinding.DialogSelectPhotoTypeBinding;
import com.dskj.rbchat.utils.DataUtils;
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.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import java.util.Locale;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.DialogSelectPhotoTypeBinding;
import com.dskj.rbchat.databinding.DialogSelectPhotosMoveBinding;
import com.dskj.rbchat.main.mine.photo.AddPhotoActivity;
import com.dskj.rbchat.main.mine.photo.UserPhotoListActivity;
import com.dskj.rbchat.model.UserAlbumBean;
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.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
import java.util.List;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogSelectPushTypeBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogSelectPushTypeBinding;
public class SelectPushTypeDialog extends Dialog {

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogSelectLangTypeBinding;
import com.dskj.rbchat.databinding.DialogSelectSexBinding;
import com.dskj.rbchat.utils.DataUtils;
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.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.DialogSelectTypeBinding;
import com.dskj.rbchat.model.TypeBean;
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 java.util.ArrayList;
import java.util.List;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.dialog;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.DialogActionVersionBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.DialogActionVersionBinding;
/**
* 版本弹窗

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

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

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

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

435
app/src/main/java/com/dskj/rbchat/game/JsBridgeActivity.java → app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.game;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.contact.UserInfoActivity;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.ActionConfirmDialog1;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.authorize.AuthorizeActivity;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.JsBridgeOrderBean;
import com.dskj.rbchat.model.LoginBean;
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 androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
@@ -78,37 +78,37 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.amap.api.location.AMapLocation;
import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityChangePaypasswordBinding;
import com.dskj.rbchat.databinding.ActivityJsbridgeBinding;
import com.dskj.rbchat.dialog.PayDialog;
import com.dskj.rbchat.model.AuthorizeBean;
import com.dskj.rbchat.model.H5ChangeTitle;
import com.dskj.rbchat.model.NewsBean;
import com.dskj.rbchat.model.StaffServiceIdBean;
import com.dskj.rbchat.model.TopUpBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.NfcReaderActivity;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.QRCodeScheme;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.SoftHideKeyBoardUtil;
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
import com.dskj.rbchat.welcome.WelcomeActivity;
import com.dskj.rbchat.widget.StatusLayout;
//import com.amap.api.location.AMapLocation;
//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.google.android.material.bottomsheet.BottomSheetDialog;
import com.huawei.hms.hmsscankit.ScanUtil;
import com.huawei.hms.hmsscankit.ScanUtilHtml;
@@ -155,8 +155,8 @@ 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.locationkit.MapNavigator;
import com.netease.yunxin.nertc.ui.CallKitUI;
//import com.netease.yunxin.kit.locationkit.MapNavigator;
//import com.netease.yunxin.nertc.ui.CallKitUI;
import com.smallbuer.jsbridge.core.BridgeHandler;
import com.smallbuer.jsbridge.core.BridgeWebView;
import com.smallbuer.jsbridge.core.CallBackFunction;
@@ -425,6 +425,8 @@ public class JsBridgeActivity extends BaseActivity {
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));
@@ -715,8 +717,9 @@ public class JsBridgeActivity extends BaseActivity {
@Override
public void handler(Context context, String s, CallBackFunction callBackFunction) {//充值
callBackFunctionLocation = callBackFunction;
callBackFunctionLocation.onCallBack("");
initLocation();
// initLocation();
}
});
@@ -807,7 +810,7 @@ public class JsBridgeActivity extends BaseActivity {
LogUtils.d("googleNavigation");
callBackFunction.onCallBack("");
MapNavigator.googleGuide(JsBridgeActivity.this, s);
// MapNavigator.googleGuide(JsBridgeActivity.this, s);
}
});
@@ -1152,7 +1155,7 @@ public class JsBridgeActivity extends BaseActivity {
if (isStart) {
tvTitle.setVisibility(View.VISIBLE);
tvCancel.setVisibility(View.VISIBLE);
tvStatus.setText(getString(com.dskj.rbchat.R.string.nfctitle_dialog_status));
tvStatus.setText(getString(com.hbl.lewan.R.string.nfctitle_dialog_status));
Glide.with(this).load(R.mipmap.nfc_read).into(ivStatus);
tvCancel.setOnClickListener(view -> {
nfcAdapter.disableReaderMode(this);
@@ -1414,183 +1417,183 @@ public class JsBridgeActivity extends BaseActivity {
}
AMapLocation aMapLocation;
//声明AMapLocationClientOption对象
public AMapLocationClientOption mLocationOption = null;
//声明AMapLocationClient类对象
public AMapLocationClient mLocationClient = null;
//声明定位回调监听器
public AMapLocationListener mLocationListener;
// AMapLocation aMapLocation;
// //声明AMapLocationClientOption对象
// public AMapLocationClientOption mLocationOption = null;
// //声明AMapLocationClient类对象
// public AMapLocationClient mLocationClient = null;
// //声明定位回调监听器
// public AMapLocationListener mLocationListener;
private void initLocation() {
if (aMapLocation == null) {
showLoc();
} else {
toLocation();
}
}
private void showLoc() {
int cameraPermission = ContextCompat.checkSelfPermission(JsBridgeActivity.this, Manifest.permission.ACCESS_COARSE_LOCATION);
if (cameraPermission == PackageManager.PERMISSION_GRANTED) {
int cameraPermission1 = ContextCompat.checkSelfPermission(JsBridgeActivity.this, Manifest.permission.ACCESS_FINE_LOCATION);
if (cameraPermission1 == PackageManager.PERMISSION_GRANTED) {
toLocation();
} else {
toShowNoPer();
}
// private void initLocation() {
// if (aMapLocation == null) {
// showLoc();
// } else {
// toLocation();
// }
// }
} else {
toShowNoPer();
}
}
// private void showLoc() {
// int cameraPermission = ContextCompat.checkSelfPermission(JsBridgeActivity.this, Manifest.permission.ACCESS_COARSE_LOCATION);
// if (cameraPermission == PackageManager.PERMISSION_GRANTED) {
// int cameraPermission1 = ContextCompat.checkSelfPermission(JsBridgeActivity.this, Manifest.permission.ACCESS_FINE_LOCATION);
// if (cameraPermission1 == PackageManager.PERMISSION_GRANTED) {
// toLocation();
// } else {
// toShowNoPer();
// }
//// toLocation();
//
// } else {
// toShowNoPer();
// }
//
//
// }
public PermissionExplainDialog permissionExplainDialog;
private void toShowNoPer() {
String[] permissions = {
Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION
};
permissionExplainDialog = new PermissionExplainDialog(JsBridgeActivity.this, getResources().getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_location_title), getResources().getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_location_content));
permissionExplainDialog.show();
Permission.requirePermissions(IMKitClient.getApplicationContext(), permissions)
.request(
new Permission.PermissionCallback() {
@Override
public void onGranted(List<String> permissionsGranted) {
toLocation();
permissionExplainDialog.dismiss();
}
@Override
public void onDenial(
List<String> permissionsDenial, List<String> permissionDenialForever) {
permissionExplainDialog.dismiss();
Map<String, Object> map1 = new HashMap<>();
map1.put("code", 0);
map1.put("error", "用户未授权");
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
}
@Override
public void onException(Exception exception) {
permissionExplainDialog.dismiss();
Toast.makeText(JsBridgeActivity.this, com.netease.yunxin.kit.chatkit.ui.R.string.permission_default, Toast.LENGTH_SHORT)
.show();
Map<String, Object> map1 = new HashMap<>();
map1.put("code", 0);
map1.put("error", "用户未授权");
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
}
});
}
// private void toShowNoPer() {
// String[] permissions = {
// Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION
// };
// permissionExplainDialog = new PermissionExplainDialog(JsBridgeActivity.this, getResources().getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_location_title), getResources().getString(com.netease.yunxin.kit.chatkit.ui.R.string.permission_location_content));
// permissionExplainDialog.show();
// Permission.requirePermissions(IMKitClient.getApplicationContext(), permissions)
// .request(
// new Permission.PermissionCallback() {
// @Override
// public void onGranted(List<String> permissionsGranted) {
// toLocation();
// permissionExplainDialog.dismiss();
// }
//
// @Override
// public void onDenial(
// List<String> permissionsDenial, List<String> permissionDenialForever) {
// permissionExplainDialog.dismiss();
// Map<String, Object> map1 = new HashMap<>();
// map1.put("code", 0);
// map1.put("error", "用户未授权");
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
// }
//
// @Override
// public void onException(Exception exception) {
// permissionExplainDialog.dismiss();
// Toast.makeText(JsBridgeActivity.this, com.netease.yunxin.kit.chatkit.ui.R.string.permission_default, Toast.LENGTH_SHORT)
// .show();
// Map<String, Object> map1 = new HashMap<>();
// map1.put("code", 0);
// map1.put("error", "用户未授权");
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
// }
// });
// }
private void toLocation() {
//设置定位回调监听
mLocationListener = amapLocation -> {
if (amapLocation != null) {
if (amapLocation.getErrorCode() == 0) {
if (aMapLocation == null) {
aMapLocation = amapLocation;
}
//可在其中解析amapLocation获取相应内容。
LogUtils.i("定位位置：" + amapLocation.getLatitude() + ";;" + amapLocation.getLongitude() + ";"
+ amapLocation.getAddress() + ";" + amapLocation.getCountry() + ";" + amapLocation.getCity() + ";" + amapLocation.getProvince());
toInfo(amapLocation);
} else {
//定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
Map<String, Object> map1 = new HashMap<>();
map1.put("code", 0);
map1.put("error", "定位失败");
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
}
} else {
Map<String, Object> map1 = new HashMap<>();
map1.put("code", 0);
map1.put("error", "定位数据为空");
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
}
};
//初始化AMapLocationClientOption对象
mLocationOption = new AMapLocationClientOption();
mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
mLocationOption.setOnceLocation(true);
mLocationOption.setOnceLocationLatest(true);
mLocationOption.setHttpTimeOut(20000);
mLocationOption.setLocationCacheEnable(false);
//初始化定位
try {
mLocationClient = new AMapLocationClient(JsBridgeActivity.this);
mLocationClient.setLocationOption(mLocationOption);
mLocationClient.setLocationListener(mLocationListener);
mLocationClient.startLocation();
} catch (Exception e) {
e.printStackTrace();
}
// mLocationListener = amapLocation -> {
// if (amapLocation != null) {
// if (amapLocation.getErrorCode() == 0) {
// if (aMapLocation == null) {
// aMapLocation = amapLocation;
// }
// //可在其中解析amapLocation获取相应内容。
// LogUtils.i("定位位置：" + amapLocation.getLatitude() + ";;" + amapLocation.getLongitude() + ";"
// + amapLocation.getAddress() + ";" + amapLocation.getCountry() + ";" + amapLocation.getCity() + ";" + amapLocation.getProvince());
//
// toInfo(amapLocation);
//
// } else {
// //定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
// Map<String, Object> map1 = new HashMap<>();
// map1.put("code", 0);
// map1.put("error", "定位失败");
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
//
// }
// } else {
// Map<String, Object> map1 = new HashMap<>();
// map1.put("code", 0);
// map1.put("error", "定位数据为空");
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(map1));
//
// }
// };
//
// //初始化AMapLocationClientOption对象
// mLocationOption = new AMapLocationClientOption();
// mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
// mLocationOption.setOnceLocation(true);
// mLocationOption.setOnceLocationLatest(true);
// mLocationOption.setHttpTimeOut(20000);
// mLocationOption.setLocationCacheEnable(false);
//
// //初始化定位
// try {
// mLocationClient = new AMapLocationClient(JsBridgeActivity.this);
// mLocationClient.setLocationOption(mLocationOption);
// mLocationClient.setLocationListener(mLocationListener);
// mLocationClient.startLocation();
// } catch (Exception e) {
// e.printStackTrace();
// }
}
private void toInfo(AMapLocation amapLocation) {
List<Address> addresses;
Geocoder geocoder = new Geocoder(JsBridgeActivity.this, Locale.TAIWAN);
String addStr = null;
try {
addresses = geocoder.getFromLocation(amapLocation.getLatitude(), amapLocation.getLongitude(), 1);
LogUtils.i("选择地址11111111111");
String address = addresses.get(0).getAddressLine(0);
String city = addresses.get(0).getLocality();
String state = addresses.get(0).getAdminArea();
String zipCode = addresses.get(0).getPostalCode();
String country = addresses.get(0).getCountryCode();
addStr = address + "," + city + "," + state + "," + zipCode + "," + country;
LogUtils.i("选择地址222222222222");
LogUtils.i("选择地址" + addStr);
Map<String, Object> maps = new HashMap<>();
maps.put("code", 1);
maps.put("longitude", amapLocation.getLongitude());
maps.put("latitude", amapLocation.getLatitude());
maps.put("address", address);
maps.put("country", country);
maps.put("province", state);
maps.put("city", city);
LogUtils.i("回调结构：" + GsonUtils.beanToJSONString(maps));
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(maps));
} catch (IOException e) {
e.printStackTrace();
LogUtils.i("选择地址333333333");
Map<String, Object> maps = new HashMap<>();
maps.put("code", 1);
maps.put("longitude", amapLocation.getLongitude());
maps.put("latitude", amapLocation.getLatitude());
maps.put("address", amapLocation.getAddress());
maps.put("country", amapLocation.getCountry());
maps.put("province", amapLocation.getProvince());
maps.put("city", amapLocation.getCity());
LogUtils.i("回调结构：" + GsonUtils.beanToJSONString(maps));
callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(maps));
}
}
// private void toInfo(AMapLocation amapLocation) {
//
//
// List<Address> addresses;
//
// Geocoder geocoder = new Geocoder(JsBridgeActivity.this, Locale.TAIWAN);
// String addStr = null;
// try {
// addresses = geocoder.getFromLocation(amapLocation.getLatitude(), amapLocation.getLongitude(), 1);
// LogUtils.i("选择地址11111111111");
//
// String address = addresses.get(0).getAddressLine(0);
// String city = addresses.get(0).getLocality();
// String state = addresses.get(0).getAdminArea();
// String zipCode = addresses.get(0).getPostalCode();
// String country = addresses.get(0).getCountryCode();
// addStr = address + "," + city + "," + state + "," + zipCode + "," + country;
// LogUtils.i("选择地址222222222222");
//
// LogUtils.i("选择地址" + addStr);
//
// Map<String, Object> maps = new HashMap<>();
// maps.put("code", 1);
// maps.put("longitude", amapLocation.getLongitude());
// maps.put("latitude", amapLocation.getLatitude());
// maps.put("address", address);
// maps.put("country", country);
// maps.put("province", state);
// maps.put("city", city);
// LogUtils.i("回调结构：" + GsonUtils.beanToJSONString(maps));
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(maps));
// } catch (IOException e) {
// e.printStackTrace();
// LogUtils.i("选择地址333333333");
//
// Map<String, Object> maps = new HashMap<>();
// maps.put("code", 1);
// maps.put("longitude", amapLocation.getLongitude());
// maps.put("latitude", amapLocation.getLatitude());
// maps.put("address", amapLocation.getAddress());
// maps.put("country", amapLocation.getCountry());
// maps.put("province", amapLocation.getProvince());
// maps.put("city", amapLocation.getCity());
// LogUtils.i("回调结构：" + GsonUtils.beanToJSONString(maps));
// callBackFunctionLocation.onCallBack(GsonUtils.beanToJSONString(maps));
//
// }
//
//
// }
/**
@@ -1639,18 +1642,18 @@ public class JsBridgeActivity extends BaseActivity {
String result1 = ((HmsScan) obj).getOriginalValue();
// LogUtils.i("回调数据："+result1);
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(result1);
// 2维码内容前缀（形如“time_go_chat://add_user/”）
// 2维码内容前缀（形如“time_go_mm://add_user/”）
LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
//{"scheme":"time_go_chat://payment_bead/","userId":"10","value":"388a762b474f944b"}
//{"scheme":"time_go_mm://payment_bead/","userId":"10","value":"388a762b474f944b"}
String scheme = qrData.getScheme();
if (scheme.startsWith("http")) {
if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) {
sendMachine(scheme);
}
}
if (scheme.equals("time_go_chat://payment_bead/")) {
if (scheme.equals("time_go_mm://payment_bead/")) {
if (bindBean != null) {
if (!bindBean.getPhoneBind()) {
showDialog();

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.add;
package com.hbl.lewan.imkit.add;
import android.os.Bundle;
import android.text.TextUtils;
@@ -11,20 +11,20 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.SelectCountryDialog;
import com.dskj.rbchat.login.PhoneLoginActivity;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.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;

27
app/src/main/java/com/dskj/rbchat/imkit/base/BaseSettingOtherActivity.java → app/src/main/java/com/hbl/lewan/imkit/base/BaseSettingOtherActivity.java
View File

@@ -2,33 +2,16 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.base;
package com.hbl.lewan.imkit.base;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.TypedValue;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.R;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityTeamothersettingBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.imkit.team.TeamHeadBgSettingActivity;
import com.dskj.rbchat.imkit.team.TeamMembersListActivity;
import com.dskj.rbchat.imkit.team.TeamSettingActivity;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.teamkit.ui.utils.viewmodel.TeamSettingViewModel;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.databinding.ActivityTeamothersettingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
/**

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.imkit.base.fragment;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentSetresoucePhotoBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.imkit.team.TeamMembersListActivity;
import com.dskj.rbchat.imkit.team.TeamSettingActivity;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.HisChatShowBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.ToolKits;
import com.dskj.rbchat.voom.TiktokActivity;
import com.dskj.rbchat.widget.CircleImageView;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;

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

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

32
app/src/main/java/com/dskj/rbchat/imkit/person/PersonSettingActivity.java → app/src/main/java/com/hbl/lewan/imkit/person/PersonSettingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.person;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.contact.ReportActivity;
import com.dskj.rbchat.databinding.ActivityBaseChatsettingBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.imkit.team.BaseTeamQrSettingActivity;
import com.dskj.rbchat.imkit.team.SettingResourceActivity;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.msg.MsgService;

8
app/src/main/java/com/dskj/rbchat/imkit/selector/FunContactSelectorActivity.java → app/src/main/java/com/hbl/lewan/imkit/selector/FunContactSelectorActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.selector;
package com.hbl.lewan.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;
@@ -34,8 +34,8 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.viewbinding.ViewBinding;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.hbl.lewan.model.UsersExistBean;
import com.hbl.lewan.utils.ShareDateUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamBeInviteModeEnum;
@@ -239,7 +239,7 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity {
titleBar
.setOnBackIconClickListener(v -> onBackPressed())
.setTitle(R.string.select)
.setActionText(type==1?getString(com.dskj.rbchat.R.string.chat_message_action_multi_select):getString(R.string.selector_sure_without_num))
.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))
.setActionListener(
v -> {

36
app/src/main/java/com/dskj/rbchat/imkit/team/BaseTeamQrSettingActivity.java → app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.imkit.team;
import static com.netease.nim.highavailable.HighAvailableObject.getContext;
import static com.netease.yunxin.kit.contactkit.ui.ContactConstant.REQUEST_CONTACT_SELECTOR_AVATAR;
@@ -43,23 +43,23 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityBaseChatsettingBinding;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.main.mine.UserInfoActivity;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.ToolKits;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.king.zxing.util.CodeUtils;
import com.netease.nimlib.sdk.msg.MessageBuilder;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivitySettingresourceBinding;
import com.dskj.rbchat.imkit.base.fragment.SettingPhotoFragment;
import com.dskj.rbchat.voom.CirclePicFragment;
import com.dskj.rbchat.voom.TiktoInfokActivity;
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.google.android.material.tabs.TabLayoutMediator;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityTeamaddmanagerBinding;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;

26
app/src/main/java/com/dskj/rbchat/imkit/team/TeamAnnouncementActivity.java → app/src/main/java/com/hbl/lewan/imkit/team/TeamAnnouncementActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.imkit.team;
import static com.netease.yunxin.kit.teamkit.ui.utils.NetworkUtilsWrapper.handleNetworkBrokenResult;
@@ -22,18 +22,18 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.contact.ReportActivity;
import com.dskj.rbchat.databinding.ActivityBaseChatsettingBinding;
import com.dskj.rbchat.databinding.ActivityTeamannouncementBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.TeamUpdateEvent;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.msg.MsgService;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityHeadUserEditBinding;
import com.dskj.rbchat.databinding.ActivityTeamothersettingBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.main.mine.UserHeadEditActivity;
import com.dskj.rbchat.model.TeamUpdateEvent;
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.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.common.ui.photo.PhotoPicker;
import com.netease.yunxin.kit.common.ui.utils.CommonCallback;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityTeamInvitejoinBinding;
import com.dskj.rbchat.main.index.add.AddFriendsActivity;
import com.dskj.rbchat.model.TeamUpdateEvent;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.ResponseCode;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityTeamManagerBinding;
import com.dskj.rbchat.databinding.ActivityTeamMembersBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.imkit.team.adapter.TeamMembersAdapter;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.team.TeamService;

145
app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersJinYanActivity.java Normal file
View File

@@ -0,0 +1,145 @@
// 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.imkit.team;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.Nullable;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.FriendService;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;
import com.netease.yunxin.kit.chatkit.model.UserInfoWithTeam;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView;
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
import com.netease.yunxin.kit.teamkit.ui.utils.viewmodel.TeamSettingViewModel;
import java.util.ArrayList;
import java.util.List;
/**
* 群聊成员页面 (编辑群员，群主转让那) 这快逻辑有点乱
*/
public class TeamMembersJinYanActivity extends BaseActivity {
public final TeamSettingViewModel teammodel = new TeamSettingViewModel();
public List<UserInfoWithTeam> listmemebers = new ArrayList<>();
CommonAdapter commonAdapter;
ActivityTeamMembersJinyanBinding binding;
String teamId;
int manages = 0;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityTeamMembersJinyanBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
binding.title.setTitle(getString(R.string.yijinyanchengyuan_txt));
teamId = getIntent().getStringExtra("teamId");
initListAdapter();
teammodel.requestTeamMembers(teamId);
teammodel.getUserInfoData().observe(this, listResultInfo -> {
if (listResultInfo.getSuccess()) {
List<UserInfoWithTeam> list = listResultInfo.getValue();
LogUtils.i("结果是啥："+GsonUtils.beanToJSONString(list));
listmemebers.clear();
for (UserInfoWithTeam userInfoWithTeam:list){
if(userInfoWithTeam.getUserInfo().getAccount().equals(IMKitClient.account())){
manages = userInfoWithTeam.getTeamInfo().getType().getValue();
}
if(userInfoWithTeam.getTeamInfo().isMute()){
listmemebers.add(userInfoWithTeam);
}
}
LogUtils.i("结果是啥1："+GsonUtils.beanToJSONString(listmemebers));
commonAdapter.setDates(listmemebers);
}
});
binding.title.getBackImageView().setOnClickListener(view -> finish());
}
private void initListAdapter() {
binding.rvMembers.setLayoutManager( new LinearLayoutManager(TeamMembersJinYanActivity.this));
commonAdapter = new CommonAdapter<UserInfoWithTeam>(TeamMembersJinYanActivity.this, R.layout.team_members_view_holder1, listmemebers) {
@Override
public void convert(ViewHolder holder, UserInfoWithTeam s, int index) {
ContactAvatarView contactAvatarView = holder.getView(R.id.avatar_view);
TextView tvName = holder.getView(R.id.tv_name);
View line = holder.getView(R.id.item_line);
String name = s.getUserInfo().getName();
if (ContactRepo.isFriend(s.getUserInfo().getAccount())) {
String alias = ContactRepo.getFriend(s.getUserInfo().getAccount()).getAlias();
if (!TextUtils.isEmpty(alias)) {
name = alias;
}
}
tvName.setText(name);
if (TextUtils.isEmpty(s.getUserInfo().getAvatar())) {
contactAvatarView.setData(R.mipmap.default_head_img, s.getUserInfo().getName(), 0);
} else {
contactAvatarView.setData(s.getUserInfo().getAvatar(), s.getUserInfo().getName());
}
contactAvatarView.setOnClickListener(v -> {
startUserInfoActivity(s.getUserInfo().getAccount());
});
line.setVisibility(View.VISIBLE);
if (index == listmemebers.size()-1) {
line.setVisibility(View.GONE);
}
holder.getView(R.id.jinyan_iv).setOnClickListener(v -> {
// showDeleteDialog(index, user.getName(), user.getAccount());
if(manages ==1||(manages==2&&s.getTeamInfo().getType().getValue()==0)){
TeamService v2TeamService = NIMClient.getService(TeamService.class);
v2TeamService.muteTeamMember(teamId, s.getUserInfo().getAccount(),false);
listmemebers.remove(index);
notifyDataSetChanged();
}else{
ToastUtils.showShort(getString(com.netease.yunxin.kit.chatkit.ui.R.string.chat_no_permission));
}
});
}
};
binding.rvMembers.setAdapter(commonAdapter);
}
public void startUserInfoActivity(String userid) {
XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
.withContext(TeamMembersJinYanActivity.this)
.withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, IMKitClient.account())
.withParam("userId", userid)
.withParam("isGroup", true)
.navigate();
}
}

51
app/src/main/java/com/dskj/rbchat/imkit/team/TeamMembersListActivity.java → app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersListActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityTeamMembersBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.imkit.team.adapter.TeamMembersAdapter;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.team.TeamService;
@@ -131,6 +131,8 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
isAllowAdd = extensionBean.getAllowAddFriends();
}
if (list != null && list.size() > 0) {
LogUtils.i("走了333333333377777777777777：");
listmemebers.clear();
listmemebers.addAll(list);
getTeamActiveTime();
@@ -146,7 +148,11 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
listmemebers.clear();
listmember = sortListMembers(listmember);
for (UserInfoWithTeam userinfo : listmember) {
listmemebers.add(userinfo.getUserInfo());
LogUtils.i("走了333333333355555555555："+GsonUtils.beanToJSONString(userinfo));
UserInfo userInfos = userinfo.getUserInfo();
userInfos.setSignature(userinfo.getTeamInfo().isMute()?"1":"");
listmemebers.add(userInfos);
}
setData();
@@ -195,6 +201,8 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
@Override
public void onSuccess(Result<Map<String, Long>> feedbackResp) {
LogUtils.d("dddd" + feedbackResp.data);
LogUtils.i("走了333333333366666666：");
memberMap = feedbackResp.data;
listmemebers.remove(0);
listmemebers = sortListByActivieTime(listmemebers);
@@ -341,6 +349,19 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
}
public void startUserInfoActivity(String userid, String teamId) {
if(isManager==1||isManager==2){
XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
.withContext(TeamMembersListActivity.this)
.withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, IMKitClient.account())
.withParam("userId", userid)
.withParam("teamId", teamId)
.withParam("isGroup", true)
.navigate();
return;
}
//如果群不允许群内添加好友 当前登录用户不是群主，以及userid 也不是群主 直接跳过
if (isAllowAdd == 0 && isManager != 1 && !userid.equals(teamOwnerId)) {
@@ -454,8 +475,14 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity {
listmemebers.clear();
listmemebers.add(IMKitClient.getUserInfo());
for (UserInfoWithTeam userinfo : list) {
LogUtils.i("走了3333333333444444444："+GsonUtils.beanToJSONString(userinfo));
selectorlist.add(userinfo.getUserInfo().getAccount());
listmemebers.add(userinfo.getUserInfo());
UserInfo userInfos = userinfo.getUserInfo();
userInfos.setSignature(userinfo.getTeamInfo().isMute()?"1":"");
listmemebers.add(userInfos);
// listmemebers.add(userinfo.getUserInfo());
}
membersAdapter.setData(listmemebers, true, memberMap, teamId);
isRefresh = true;

31
app/src/main/java/com/dskj/rbchat/imkit/team/TeamOtherSettingActivity.java → app/src/main/java/com/hbl/lewan/imkit/team/TeamOtherSettingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.imkit.team;
import android.app.Activity;
import android.content.Context;
@@ -22,11 +22,12 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.R;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.imkit.base.BaseSettingOtherActivity;
import com.dskj.rbchat.model.TeamUpdateEvent;
import com.dskj.rbchat.utils.GsonUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
@@ -145,7 +146,12 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
binding.icCleanEdit.setOnClickListener(view -> binding.tvTeamName.setText(""));
binding.flteamtransfer.setOnClickListener(view -> {
//跳转到转让
TeamMembersListActivity.launch(TeamOtherSettingActivity.this, 1, team.getId(), listmemebers, launcher);
com.hbl.lewan.imkit.team.TeamMembersListActivity.launch(TeamOtherSettingActivity.this, 1, team.getId(), listmemebers, launcher);
});
binding.fljinyan.setOnClickListener(v -> {
Intent intent = new Intent(TeamOtherSettingActivity.this, TeamMembersJinYanActivity.class);
intent.putExtra("teamId",team.getId());
startActivity(intent);
});
binding.flteamdiss.setOnClickListener(view -> {
ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(this, getString(R.string.teamsetting_other_teamdisstips),
@@ -164,11 +170,12 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
});
binding.flteamhead.setOnClickListener(view -> {
TeamHeadBgSettingActivity.launch(
com.hbl.lewan.imkit.team.TeamHeadBgSettingActivity.launch(
TeamOtherSettingActivity.this,
team, launcher
);
});
String extension = team.getExtension(); //扩展字段
if (!TextUtils.isEmpty(extension)) {
extensionBean = GsonUtils.getObjFromJSON(extension, TeamExtensionBean.class);
@@ -204,7 +211,7 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
teammodel.UpdateTeamFilesExtension(team.getId(), map);
});
binding.flteammanager.setOnClickListener(v -> {
Intent intent = new Intent(this, TeamManagerActivity.class);
Intent intent = new Intent(this, com.hbl.lewan.imkit.team.TeamManagerActivity.class);
intent.putExtra(RouterConstant.KEY_TEAM_ID, team.getId());
startActivity(intent);
});
@@ -260,7 +267,11 @@ public class TeamOtherSettingActivity extends BaseSettingOtherActivity {
listmemebers.clear();
for (UserInfoWithTeam userinfo : list) {
listmemebers.add(userinfo.getUserInfo());
LogUtils.i("走了3333333333："+GsonUtils.beanToJSONString(userinfo));
UserInfo userInfos = userinfo.getUserInfo();
userInfos.setSignature(userinfo.getTeamInfo().isMute()?"1":"");
listmemebers.add(userInfos);
// listmemebers.add(userinfo.getUserInfo());
}
}
});

41
app/src/main/java/com/dskj/rbchat/imkit/team/TeamSettingActivity.java → app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.team;
package com.hbl.lewan.imkit.team;
import static com.netease.yunxin.kit.teamkit.ui.utils.NetworkUtilsWrapper.handleNetworkBrokenResult;
@@ -19,16 +19,16 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.contact.ReportActivity;
import com.dskj.rbchat.databinding.ActivityBaseChatsettingBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.TeamUpdateEvent;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.msg.MsgService;
@@ -47,6 +47,7 @@ import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
import com.netease.yunxin.kit.chatkit.ui.model.CleanHistoryEvent;
import com.netease.yunxin.kit.chatkit.ui.model.TeamExtensionBean;
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.im.model.UserInfo;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
@@ -68,7 +69,6 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
private boolean isUpdateTeam = false;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -150,6 +150,11 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
});
initAdapterChatHist();
getChatList();
binding.fljinyan.setOnClickListener(v -> {
Intent intent = new Intent(TeamSettingActivity.this, TeamMembersJinYanActivity.class);
intent.putExtra("teamId",teamId);
startActivity(intent);
});
}
private void getChatList() {
@@ -261,7 +266,11 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
list = sortListMembers(list);
for (UserInfoWithTeam userinfo : list) {
selectorlist.add(userinfo.getUserInfo().getAccount());
listmemebers.add(userinfo.getUserInfo());
UserInfo userInfos = userinfo.getUserInfo();
userInfos.setSignature(userinfo.getTeamInfo().isMute()?"1":"");
listmemebers.add(userInfos);
// listmemebers.add(userinfo.getUserInfo());
}
teamNumber = listmemebers.size();
binding.tvTitle.setText(String.format("%s(%d)", teamName, teamNumber));
@@ -357,6 +366,12 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
// } else {
// isTeamShow = true;
// }
if(teamMember.getType() == TeamMemberType.Owner||teamMember.getType() == TeamMemberType.Manager){
binding.fljinyan.setVisibility(View.VISIBLE);
}else {
binding.fljinyan.setVisibility(View.GONE);
}
}
// public void setExtension() {

11
app/src/main/java/com/dskj/rbchat/imkit/team/adapter/TeamMembersAdapter.java → app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.team.adapter;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.TeamMembersViewHolderBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.TeamMembersViewHolderBinding;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;
@@ -192,6 +192,11 @@ public class TeamMembersAdapter extends RecyclerView.Adapter<TeamMembersAdapter.
} else {
holder.binding.tvNameActivetime.setVisibility(View.GONE);
}
holder.binding.jinyanIv.setVisibility(View.GONE);
if(!TextUtils.isEmpty(userInfo.getSignature())&&userInfo.getSignature().equals("1")){
holder.binding.jinyanIv.setVisibility(View.VISIBLE);
}
}
holder.binding.getRoot().setOnClickListener(view -> {

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.imkit.verify;
package com.hbl.lewan.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.dskj.rbchat.dialog.ActionConfirmDialog;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.yunxin.kit.contactkit.ui.ILoadListener;
import com.netease.yunxin.kit.contactkit.ui.R;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.imkit.watch;
package com.hbl.lewan.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.dskj.rbchat.base.LllChatBaseActivity;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.yunxin.kit.chatkit.ui.page.adapter.WatchImageAdapter;

16
app/src/main/java/com/dskj/rbchat/jpush/LocalBroadcastManager.java → app/src/main/java/com/hbl/lewan/jpush/LocalBroadcastManager.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.jpush;
package com.hbl.lewan.jpush;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -12,7 +12,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Set;
import cn.jpush.android.helper.Logger;
//import cn.jpush.android.helper.Logger;
public final class LocalBroadcastManager {
private static final String TAG = "JIGUANG-Example";
@@ -119,13 +119,13 @@ public final class LocalBroadcastManager {
Set categories = intent.getCategories();
boolean debug = (intent.getFlags() & 8) != 0;
if (debug) {
Logger.v("LocalBroadcastManager", "Resolving type " + type + " scheme " + scheme + " of intent " + intent);
// Logger.v("LocalBroadcastManager", "Resolving type " + type + " scheme " + scheme + " of intent " + intent);
}
ArrayList entries = (ArrayList) this.mActions.get(intent.getAction());
if (entries != null) {
if (debug) {
Logger.v("LocalBroadcastManager", "Action list: " + entries);
// Logger.v("LocalBroadcastManager", "Action list: " + entries);
}
ArrayList receivers = null;
@@ -134,18 +134,18 @@ public final class LocalBroadcastManager {
for (i = 0; i < entries.size(); ++i) {
ReceiverRecord receiver = (ReceiverRecord) entries.get(i);
if (debug) {
Logger.v("LocalBroadcastManager", "Matching against filter " + receiver.filter);
// Logger.v("LocalBroadcastManager", "Matching against filter " + receiver.filter);
}
if (receiver.broadcasting) {
if (debug) {
Logger.v("LocalBroadcastManager", " Filter\'s target already added");
// Logger.v("LocalBroadcastManager", " Filter\'s target already added");
}
} else {
int match = receiver.filter.match(action, type, scheme, data, categories, "LocalBroadcastManager");
if (match >= 0) {
if (debug) {
Logger.v("LocalBroadcastManager", " Filter matched! match=0x" + Integer.toHexString(match));
// Logger.v("LocalBroadcastManager", " Filter matched! match=0x" + Integer.toHexString(match));
}
if (receivers == null) {
@@ -173,7 +173,7 @@ public final class LocalBroadcastManager {
reason = "unknown reason";
}
Logger.v("LocalBroadcastManager", " Filter did not match: " + reason);
// Logger.v("LocalBroadcastManager", " Filter did not match: " + reason);
}
}
}

187
app/src/main/java/com/hbl/lewan/jpush/PushMessageReceiver.java Normal file
View File

@@ -0,0 +1,187 @@
//package com.hbl.lewan.jpush;
//
//import android.content.Context;
//import android.content.Intent;
//import android.os.Bundle;
//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.google.gson.JsonObject;
//
//import cn.jpush.android.api.CmdMessage;
//import cn.jpush.android.api.CustomMessage;
//import cn.jpush.android.api.JPushInterface;
//import cn.jpush.android.api.JPushMessage;
//import cn.jpush.android.api.NotificationMessage;
//import cn.jpush.android.service.JPushMessageReceiver;
//
//public class PushMessageReceiver extends JPushMessageReceiver {
// private static final String TAG = "PushMessageReceiver";
// public static final String MESSAGE_RECEIVED_ACTION = "com.example.jpushdemo.MESSAGE_RECEIVED_ACTION";
// public static final String KEY_MESSAGE = "message";
// public static final String KEY_EXTRAS = "extras";
//
// @Override
// public void onMessage(Context context, CustomMessage customMessage) {
// Log.e(TAG, "[onMessage] " + customMessage);
// processCustomMessage(context, customMessage);
// }
//
// @Override
// public void onNotifyMessageOpened(Context context, NotificationMessage message) {
// Log.e(TAG, "[onNotifyMessageOpened] " + message);
// try {
// //打开自定义的Activity
// if (!TextUtils.isEmpty(message.notificationExtras)) {
// NotifyExtraBean bean = GsonUtils.getObjFromJSON(message.notificationExtras, NotifyExtraBean.class);
// if (bean != null && (bean.getType() == 40 || bean.getType() == 41)) {
// Intent i = new Intent(context, NotifyMessageDetailsActivity.class);
// i.putExtra("id", bean.getPostId());
// i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
// context.startActivity(i);
// return;
// }
// }
// Intent i = new Intent(context, MainActivity.class);
//// Bundle bundle = new Bundle();
//// bundle.putString(JPushInterface.EXTRA_NOTIFICATION_TITLE,message.notificationTitle);
//// bundle.putString(JPushInterface.EXTRA_ALERT,message.notificationContent);
//// i.putExtras(bundle);
// //i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
// context.startActivity(i);
// } catch (Throwable throwable) {
// throwable.printStackTrace();
// }
// }
//
// @Override
// public void onMultiActionClicked(Context context, Intent intent) {
// Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮");
// String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
//
// //开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
// if (nActionExtra == null) {
// Log.d(TAG, "ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null");
// return;
// }
// if (nActionExtra.equals("my_extra1")) {
// Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一");
// } else if (nActionExtra.equals("my_extra2")) {
// Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二");
// } else if (nActionExtra.equals("my_extra3")) {
// Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三");
// } else {
// Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义");
// }
// }
//
// @Override
// public void onNotifyMessageArrived(Context context, NotificationMessage message) {
// Log.e(TAG, "[onNotifyMessageArrived] " + message + " json==" + message.notificationTargetEvent);
// String extra = message.notificationExtras;
// if (!TextUtils.isEmpty(extra)) {
// NotifyExtraBean bean = GsonUtils.getObjFromJSON(extra, NotifyExtraBean.class);
// if (bean != null) {
// switch (bean.getType()) {
// case 30:
// case 34: //cash
// VoiceUtils.with(context).Play(bean.getPostId(), 0);
// break;
// case 35: //礼品积分
// VoiceUtils.with(context).Play(bean.getPostId(), 1);
// break;
// }
// }
// }
// }
//
// @Override
// public void onNotifyMessageDismiss(Context context, NotificationMessage message) {
// Log.e(TAG, "[onNotifyMessageDismiss] " + message);
// }
//
// @Override
// public void onRegister(Context context, String registrationId) {
// Log.e(TAG, "[onRegister] " + registrationId);
// }
//
// @Override
// public void onConnected(Context context, boolean isConnected) {
// Log.e(TAG, "[onConnected] " + isConnected);
// }
//
// @Override
// public void onCommandResult(Context context, CmdMessage cmdMessage) {
// Log.e(TAG, "[onCommandResult] " + cmdMessage);
// }
//
// @Override
// public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
// TagAliasOperatorHelper.getInstance().onTagOperatorResult(context, jPushMessage);
// super.onTagOperatorResult(context, jPushMessage);
// }
//
// @Override
// public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage) {
// TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context, jPushMessage);
// super.onCheckTagOperatorResult(context, jPushMessage);
// }
//
// @Override
// public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
// TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context, jPushMessage);
// super.onAliasOperatorResult(context, jPushMessage);
// }
//
// @Override
// public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
// TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context, jPushMessage);
// super.onMobileNumberOperatorResult(context, jPushMessage);
// }
//
// //send msg to MainActivity
// private void processCustomMessage(Context context, CustomMessage customMessage) {
//
//
//
//
// /*if (MainActivity.isForeground) {
// String message = customMessage.message;
// String extras = customMessage.extra;
// Intent msgIntent = new Intent(MESSAGE_RECEIVED_ACTION);
// msgIntent.putExtra(KEY_MESSAGE, message);
// if (!Utils.isEmpty(extras)) {
// try {
// JSONObject extraJson = new JSONObject(extras);
// if (extraJson.length() > 0) {
// msgIntent.putExtra(KEY_EXTRAS, extras);
// }
// } catch (JSONException e) {
//
// }
//
// }
// LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
// }*/
// }
//
// @Override
// public void onNotificationSettingsCheck(Context context, boolean isOn, int source) {
// super.onNotificationSettingsCheck(context, isOn, source);
// Log.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
// }
//
//
// public void playSound() {
//
// }
//}

339
app/src/main/java/com/hbl/lewan/jpush/TagAliasOperatorHelper.java Normal file
View File

@@ -0,0 +1,339 @@
//package com.hbl.lewan.jpush;
//
//import android.content.Context;
//import android.os.Handler;
//import android.os.Message;
//import android.util.SparseArray;
//
//import java.util.Locale;
//import java.util.Set;
////
////import cn.jpush.android.api.JPushInterface;
////import cn.jpush.android.api.JPushMessage;
////import cn.jpush.android.helper.Logger;
//
///**
// * 处理tagalias相关的逻辑
// * */
//public class TagAliasOperatorHelper {
// private static final String TAG = "JIGUANG-TagAliasHelper";
// public static int sequence = 1;
// /**增加*/
// public static final int ACTION_ADD = 1;
// /**覆盖*/
// public static final int ACTION_SET = 2;
// /**删除部分*/
// public static final int ACTION_DELETE = 3;
// /**删除所有*/
// public static final int ACTION_CLEAN = 4;
// /**查询*/
// public static final int ACTION_GET = 5;
//
// public static final int ACTION_CHECK = 6;
//
// public static final int DELAY_SEND_ACTION = 1;
//
// public static final int DELAY_SET_MOBILE_NUMBER_ACTION = 2;
//
// private Context context;
//
// private static TagAliasOperatorHelper mInstance;
// private TagAliasOperatorHelper(){
// }
// public static TagAliasOperatorHelper getInstance(){
// if(mInstance == null){
// synchronized (TagAliasOperatorHelper.class){
// if(mInstance == null){
// mInstance = new TagAliasOperatorHelper();
// }
// }
// }
// return mInstance;
// }
// public void init(Context context){
// if(context != null) {
// this.context = context.getApplicationContext();
// }
// }
// private SparseArray<Object> setActionCache = new SparseArray<Object>();
//
// public Object get(int sequence){
// return setActionCache.get(sequence);
// }
// public Object remove(int sequence){
// return setActionCache.get(sequence);
// }
// public void put(int sequence,Object tagAliasBean){
// setActionCache.put(sequence,tagAliasBean);
// }
// private Handler delaySendHandler = new Handler(){
// @Override
// public void handleMessage(Message msg) {
// switch (msg.what){
// case DELAY_SEND_ACTION:
// if(msg.obj !=null && msg.obj instanceof TagAliasBean){
// //Logger.i(TAG,"on delay time");
// sequence++;
// TagAliasBean tagAliasBean = (TagAliasBean) msg.obj;
// setActionCache.put(sequence, tagAliasBean);
// if(context!=null) {
// handleAction(context, sequence, tagAliasBean);
// }else{
// //Logger.e(TAG,"#unexcepted - context was null");
// }
// }else{
// //Logger.w(TAG,"#unexcepted - msg obj was incorrect");
// }
// break;
// case DELAY_SET_MOBILE_NUMBER_ACTION:
// if(msg.obj !=null && msg.obj instanceof String) {
// //Logger.i(TAG, "retry set mobile number");
// sequence++;
// String mobileNumber = (String) msg.obj;
// setActionCache.put(sequence, mobileNumber);
// if(context !=null) {
// handleAction(context, sequence, mobileNumber);
// }else {
// //Logger.e(TAG, "#unexcepted - context was null");
// }
// }else{
// //Logger.w(TAG,"#unexcepted - msg obj was incorrect");
// }
// break;
// }
// }
// };
// public void handleAction(Context context,int sequence,String mobileNumber){
// put(sequence,mobileNumber);
// //Logger.d(TAG,"sequence:"+sequence+",mobileNumber:"+mobileNumber);
//// JPushInterface.setMobileNumber(context,sequence,mobileNumber);
// }
// /**
// * 处理设置tag
// * */
// public void handleAction(Context context,int sequence, TagAliasBean tagAliasBean){
// init(context);
// if(tagAliasBean == null){
// //Logger.w(TAG,"tagAliasBean was null");
// return;
// }
// put(sequence,tagAliasBean);
// if(tagAliasBean.isAliasAction){
// switch (tagAliasBean.action){
// case ACTION_GET:
//// JPushInterface.getAlias(context,sequence);
// break;
// case ACTION_DELETE:
//// JPushInterface.deleteAlias(context,sequence);
// break;
// case ACTION_SET:
//// JPushInterface.setAlias(context,sequence,tagAliasBean.alias);
// break;
// default:
// //Logger.w(TAG,"unsupport alias action type");
// return;
// }
// }else {
// switch (tagAliasBean.action) {
// case ACTION_ADD:
//// JPushInterface.addTags(context, sequence, tagAliasBean.tags);
// break;
// case ACTION_SET:
//// JPushInterface.setTags(context, sequence, tagAliasBean.tags);
// break;
// case ACTION_DELETE:
//// JPushInterface.deleteTags(context, sequence, tagAliasBean.tags);
// break;
// case ACTION_CHECK:
// //一次只能check一个tag
// String tag = (String)tagAliasBean.tags.toArray()[0];
//// JPushInterface.checkTagBindState(context,sequence,tag);
// break;
// case ACTION_GET:
//// JPushInterface.getAllTags(context, sequence);
// break;
// case ACTION_CLEAN:
//// JPushInterface.cleanTags(context, sequence);
// break;
// default:
// //Logger.w(TAG,"unsupport tag action type");
// return;
// }
// }
// }
// private boolean RetryActionIfNeeded(int errorCode,TagAliasBean tagAliasBean){
// if(!Utils.isConnected(context)){
// //Logger.w(TAG,"no network");
// return false;
// }
// //返回的错误码为6002 超时,6014 服务器繁忙,都建议延迟重试
// if(errorCode == 6002 || errorCode == 6014){
// //Logger.d(TAG,"need retry");
// if(tagAliasBean!=null){
// Message message = new Message();
// message.what = DELAY_SEND_ACTION;
// message.obj = tagAliasBean;
// delaySendHandler.sendMessageDelayed(message,1000*60);
// String logs =getRetryStr(tagAliasBean.isAliasAction, tagAliasBean.action,errorCode);
// Utils.showToast(logs, context);
// return true;
// }
// }
// return false;
// }
// private boolean RetrySetMObileNumberActionIfNeeded(int errorCode,String mobileNumber){
// if(!Utils.isConnected(context)){
// //Logger.w(TAG,"no network");
// return false;
// }
// //返回的错误码为6002 超时,6024 服务器内部错误,建议稍后重试
// if(errorCode == 6002 || errorCode == 6024){
// //Logger.d(TAG,"need retry");
// Message message = new Message();
// message.what = DELAY_SET_MOBILE_NUMBER_ACTION;
// message.obj = mobileNumber;
// delaySendHandler.sendMessageDelayed(message,1000*60);
// String str = "Failed to set mobile number due to %s. Try again after 60s.";
// str = String.format(Locale.ENGLISH,str,(errorCode == 6002 ? "timeout" : "server internal error”"));
// Utils.showToast(str, context);
// return true;
// }
// return false;
//
// }
// private String getRetryStr(boolean isAliasAction,int actionType,int errorCode){
// String str = "Failed to %s %s due to %s. Try again after 60s.";
// str = String.format(Locale.ENGLISH,str,getActionStr(actionType),(isAliasAction? "alias" : " tags") ,(errorCode == 6002 ? "timeout" : "server too busy"));
// return str;
// }
//
// private String getActionStr(int actionType){
// switch (actionType){
// case ACTION_ADD:
// return "add";
// case ACTION_SET:
// return "set";
// case ACTION_DELETE:
// return "delete";
// case ACTION_GET:
// return "get";
// case ACTION_CLEAN:
// return "clean";
// case ACTION_CHECK:
// return "check";
// }
// return "unkonw operation";
// }
// public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
// int sequence = jPushMessage.getSequence();
// //Logger.i(TAG,"action - onTagOperatorResult, sequence:"+sequence+",tags:"+jPushMessage.getTags());
// //Logger.i(TAG,"tags size:"+jPushMessage.getTags().size());
// init(context);
// //根据sequence从之前操作缓存中获取缓存记录
// TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
// if(tagAliasBean == null){
//// Utils.showToast("获取缓存记录失败", context);
// return;
// }
// if(jPushMessage.getErrorCode() == 0){
// //Logger.i(TAG,"action - modify tag Success,sequence:"+sequence);
// setActionCache.remove(sequence);
// String logs = getActionStr(tagAliasBean.action)+" tags success";
// //Logger.i(TAG,logs);
// Utils.showToast(logs, context);
// }else{
// String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags";
// if(jPushMessage.getErrorCode() == 6018){
// //tag数量超过限制,需要先清除一部分再add
// logs += ", tags is exceed limit need to clean";
// }
// logs += ", errorCode:" + jPushMessage.getErrorCode();
// //Logger.e(TAG, logs);
// if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
// Utils.showToast(logs, context);
// }
// }
// }
// public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
// int sequence = jPushMessage.getSequence();
// //Logger.i(TAG,"action - onCheckTagOperatorResult, sequence:"+sequence+",checktag:"+jPushMessage.getCheckTag());
// init(context);
// //根据sequence从之前操作缓存中获取缓存记录
// TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
// if(tagAliasBean == null){
//// Utils.showToast("获取缓存记录失败", context);
// return;
// }
// if(jPushMessage.getErrorCode() == 0){
// //Logger.i(TAG,"tagBean:"+tagAliasBean);
// setActionCache.remove(sequence);
// String logs = getActionStr(tagAliasBean.action)+" tag "+jPushMessage.getCheckTag() + " bind state success,state:"+jPushMessage.getTagCheckStateResult();
// //Logger.i(TAG,logs);
// Utils.showToast(logs, context);
// }else{
// String logs = "Failed to " + getActionStr(tagAliasBean.action)+" tags, errorCode:" + jPushMessage.getErrorCode();
// //Logger.e(TAG, logs);
// if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
// Utils.showToast(logs, context);
// }
// }
// }
// public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
// int sequence = jPushMessage.getSequence();
// //Logger.i(TAG,"action - onAliasOperatorResult, sequence:"+sequence+",alias:"+jPushMessage.getAlias());
// init(context);
// //根据sequence从之前操作缓存中获取缓存记录
// TagAliasBean tagAliasBean = (TagAliasBean)setActionCache.get(sequence);
// if(tagAliasBean == null){
//// Utils.showToast("获取缓存记录失败", context);
// return;
// }
// if(jPushMessage.getErrorCode() == 0){
// //Logger.i(TAG,"action - modify alias Success,sequence:"+sequence);
// setActionCache.remove(sequence);
// String logs = getActionStr(tagAliasBean.action)+" alias success";
// //Logger.i(TAG,logs);
// Utils.showToast(logs, context);
// }else{
// String logs = "Failed to " + getActionStr(tagAliasBean.action)+" alias, errorCode:" + jPushMessage.getErrorCode();
// //Logger.e(TAG, logs);
// if(!RetryActionIfNeeded(jPushMessage.getErrorCode(),tagAliasBean)) {
// Utils.showToast(logs, context);
// }
// }
// }
// //设置手机号码回调
// public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
// int sequence = jPushMessage.getSequence();
// //Logger.i(TAG,"action - onMobileNumberOperatorResult, sequence:"+sequence+",mobileNumber:"+jPushMessage.getMobileNumber());
// init(context);
// if(jPushMessage.getErrorCode() == 0){
// //Logger.i(TAG,"action - set mobile number Success,sequence:"+sequence);
// setActionCache.remove(sequence);
// }else{
// String logs = "Failed to set mobile number, errorCode:" + jPushMessage.getErrorCode();
// //Logger.e(TAG, logs);
// if(!RetrySetMObileNumberActionIfNeeded(jPushMessage.getErrorCode(),jPushMessage.getMobileNumber())){
// Utils.showToast(logs, context);
// }
// }
// }
// public static class TagAliasBean{
// int action;
// Set<String> tags;
// String alias;
// boolean isAliasAction;
//
// @Override
// public String toString() {
// return "TagAliasBean{" +
// "action=" + action +
// ", tags=" + tags +
// ", alias='" + alias + '\'' +
// ", isAliasAction=" + isAliasAction +
// '}';
// }
// }
//
//
//}

8
app/src/main/java/com/dskj/rbchat/jpush/Utils.java → app/src/main/java/com/hbl/lewan/jpush/Utils.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.jpush;
package com.hbl.lewan.jpush;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -15,7 +15,7 @@ import android.widget.Toast;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import cn.jpush.android.api.JPushInterface;
//import cn.jpush.android.api.JPushInterface;
public class Utils {
public static final String PREFS_NAME = "JPUSH_EXAMPLE";
@@ -112,6 +112,8 @@ public class Utils {
}
public static String getDeviceId(Context context) {
return JPushInterface.getUdid(context);
// return JPushInterface.getUdid(context);
return "";
}
}

42
app/src/main/java/com/dskj/rbchat/login/ChongZhiActivity.java → app/src/main/java/com/hbl/lewan/login/ChongZhiActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.login;
package com.hbl.lewan.login;
import android.app.Activity;
@@ -22,26 +22,26 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityChongzhiBinding;
import com.dskj.rbchat.databinding.ActivityWangjiBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.ActionConfirmDialog1;
import com.dskj.rbchat.dialog.SelectCountryDialog;
import com.dskj.rbchat.main.mine.ChangePhoneActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;

64
app/src/main/java/com/dskj/rbchat/login/LoginActivity.java → app/src/main/java/com/hbl/lewan/login/LoginActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.login;
package com.hbl.lewan.login;
import android.content.Intent;
@@ -13,26 +13,27 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityLoginBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
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.dskj.rbchat.network.BaseObserver1;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GetAndroidUniqueMark;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wxapi.bean.WeiXin;
import com.dskj.rbchat.wxapi.bean.WeiXinInfo;
import com.dskj.rbchat.wxapi.bean.WeiXinToken;
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.netease.nimlib.sdk.auth.LoginInfo;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -40,13 +41,13 @@ 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;
import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
import com.tencent.mm.opensdk.modelmsg.SendAuth;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
//import com.tencent.mm.opensdk.modelmsg.SendAuth;
//import com.tencent.mm.opensdk.openapi.IWXAPI;
//import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import com.dskj.rbchat.network.Result;
import com.hbl.lewan.network.Result;
/**
* Welcome Page is launch page
*/
@@ -56,7 +57,7 @@ public class LoginActivity extends BaseActivity {
private static final String TAG = "WelcomeActivity";
private ActivityLoginBinding activityWelcomeBinding;
private IWXAPI wxAPI;
// private IWXAPI wxAPI;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -70,8 +71,8 @@ public class LoginActivity extends BaseActivity {
setContentView(activityWelcomeBinding.getRoot());
activityWelcomeBinding.aboutTitleBar.setOnBackIconClickListener(v -> onBackPressed());
wxAPI = WXAPIFactory.createWXAPI(LoginActivity.this, IMUIKitConfig.WECHAT_APPID, true);
wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
// wxAPI = WXAPIFactory.createWXAPI(LoginActivity.this, IMUIKitConfig.WECHAT_APPID, true);
// wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
RxBus.getInstance().toObservable(WeiXin.class)
.subscribeOn(rx.schedulers.Schedulers.io())
@@ -96,10 +97,10 @@ public class LoginActivity extends BaseActivity {
});
activityWelcomeBinding.wechatBt.setOnClickListener(v -> {
SendAuth.Req req = new SendAuth.Req();
req.scope = "snsapi_userinfo";
req.state = String.valueOf(System.currentTimeMillis());
wxAPI.sendReq(req);
// SendAuth.Req req = new SendAuth.Req();
// req.scope = "snsapi_userinfo";
// req.state = String.valueOf(System.currentTimeMillis());
// wxAPI.sendReq(req);
});
AnimUtil.setAnimViews(activityWelcomeBinding.loginBt,activityWelcomeBinding.wechatBt);
@@ -140,6 +141,7 @@ public class LoginActivity extends BaseActivity {
DataUtils.set(LoginActivity.this,IMUIKitConfig.LOGIN_ACCOUNT,account);
DataUtils.set(LoginActivity.this,IMUIKitConfig.LOGIN_TOKEN,token);
DataUtils.set(LoginActivity.this,"last_login_time",System.currentTimeMillis());
showMainActivityAndFinish();
}

47
app/src/main/java/com/dskj/rbchat/login/PhoneLoginActivity.java → app/src/main/java/com/hbl/lewan/login/PhoneLoginActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.login;
package com.hbl.lewan.login;
import android.app.Activity;
@@ -26,28 +26,29 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.text.HtmlCompat;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityPhoneLoginBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.SelectCountryDialog;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.PassWordLoginBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
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.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GetAndroidUniqueMark;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.auth.LoginInfo;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -165,6 +166,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);
}
@@ -497,6 +499,7 @@ public class PhoneLoginActivity extends BaseActivity {
public void onSuccess(@Nullable LoginInfo data) {
DataUtils.set(PhoneLoginActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
DataUtils.set(PhoneLoginActivity.this, IMUIKitConfig.LOGIN_TOKEN, token);
DataUtils.set(PhoneLoginActivity.this,"last_login_time",System.currentTimeMillis());
showMainActivityAndFinish();
}

309
app/src/main/java/com/dskj/rbchat/login/RegisterActivity.java → app/src/main/java/com/hbl/lewan/login/RegisterActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.login;
package com.hbl.lewan.login;
import static com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant.LIB_TAG;
@@ -38,43 +38,45 @@ import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityPhoneLoginBinding;
import com.dskj.rbchat.databinding.ActivityRegisterBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.SelectCountryDialog;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.model.AvaterBean;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.PassWordLoginBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GetAndroidUniqueMark;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.config.SelectMimeType;
@@ -102,10 +104,18 @@ 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.login.LoginCallback;
import com.qiniu.android.storage.Configuration;
import com.qiniu.android.storage.UploadManager;
import com.qiniu.android.storage.UploadOptions;
import com.yalantis.ucrop.UCrop;
import com.yalantis.ucrop.UCropImageEngine;
import org.json.JSONException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -273,6 +283,7 @@ public class RegisterActivity extends BaseActivity {
}
}
});
activityWelcomeBinding.areaTv.setText(ApiService.AREA_CODE);
activityWelcomeBinding.nanIv.setOnClickListener(v -> changeSex(1));
activityWelcomeBinding.nanTv.setOnClickListener(v -> changeSex(1));
@@ -829,7 +840,6 @@ public class RegisterActivity extends BaseActivity {
private void loginIM(String account, String token) {
ALog.d(Constant.PROJECT_TAG, TAG, "loginIM");
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
LoginInfo loginInfo =
LoginInfo.LoginInfoBuilder.loginInfoDefault(account, token)
.withAppKey(DataUtils.readAppKey(this))
@@ -845,8 +855,11 @@ public class RegisterActivity extends BaseActivity {
@Override
public void onSuccess(@Nullable LoginInfo data) {
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
DataUtils.set(RegisterActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
DataUtils.set(RegisterActivity.this, IMUIKitConfig.LOGIN_TOKEN, token);
DataUtils.set(RegisterActivity.this,"last_login_time",System.currentTimeMillis());
showMainActivityAndFinish();
}
});
@@ -894,18 +907,37 @@ public class RegisterActivity extends BaseActivity {
StsCredentialsBean stsCredentialsBean;
String stsCredentialsBean;
private void toShangchuanAli(File file ) {
showLoadingDialog();
Api.getInstance().stsCredentials()
// Api.getInstance().stsCredentials()
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
// @Override
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
// stsCredentialsBean = feedbackResp.data;
// toAliYunOss(file);
// }
//
// @Override
// public void onError(int code, String msg) {
// dimessLoadingDialog();
// }
// });
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
public void onSuccess(Result<String> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
toAliYunOss(file);
// toAliYunOss(file, isHead);
toQIiNiuYunOss(file);
}
@Override
@@ -916,74 +948,151 @@ public class RegisterActivity extends BaseActivity {
}
private void toAliYunOss(File file ) {
String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
String accessKeyId = stsCredentialsBean.getAccessKeyId();
String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
String securityToken = stsCredentialsBean.getSecurityToken();
String bucketName = IMUIKitConfig.bucketName;
private void toQIiNiuYunOss(File file) {
String updatePathPic = "postHomepageBackground";
String updatePathPicHead = "userAvatarFileName";
OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
toUpdateOss(bucketName, 0, oss, file);
// new Handler().post(() -> QiNiuTool.upload(convertFileToBytes(file)));
UploadOptions options = new UploadOptions(null, null, true,
(key, percent) -> {
LogUtils.i("结果是啥进度：" + percent);
}, () -> {
LogUtils.i("结果是啥进度112222222111：");
return false;
});
// Zone zone = FixedZone.zoneAs0;
Configuration configuration = new Configuration.Builder()
// .connectTimeout(10) // 链接超时。默认10秒
// .responseTimeout(60) // 服务器响应超时。默认60秒
// .zone(zone) // 设置区域，不指定会自动选择。指定不同区域的上传域名、备用域名、备用IP。
.build();
UploadManager uploadManager = new UploadManager(configuration);
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath());
// Uri uri = FileUtils.getMediaUriFromPath(file.getAbsolutePath(),UserHeadEditActivity.this);
// GPX2hnRdNpAvovOSZGrhMxtaa6JP2mPvJ96-tdmD
// immchat
String files = "media/" + updatePathPicHead + "/" + fileName;
byte[] sss = convertFileToBytes(file);
LogUtils.i("结果是啥开始：" + sss);
uploadManager.put(sss, files, stsCredentialsBean, (key, info, response) -> {
// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info));
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
dimessLoadingDialog();
if (info != null && info.isOK()) {
// 上传成功
avater = IMUIKitConfig.OSS_URL+files;
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
}
}, options);
}
//
public static byte[] convertFileToBytes(File file) {
// 使用ByteArrayOutputStream来收集字节数据
FileInputStream fis = null;
try {
fis = new FileInputStream(file);
byte[] bytesArray = new byte[(int) file.length()];
fis.read(bytesArray);
fis.close();
return bytesArray;
} catch (FileNotFoundException e) {
// throw new RuntimeException(e);
return null;
} catch (IOException e) {
// throw new RuntimeException(e);
return null;
}
}
// private void toAliYunOss(File file, boolean isHead) {
// String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
//// String accessKeyId = stsCredentialsBean.getAccessKeyId();
//// String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
//// String securityToken = stsCredentialsBean.getSecurityToken();
//
// String accessKeyId = "";
// String accessKeySecret = "";
// String securityToken = "";
// String bucketName = IMUIKitConfig.bucketName;
//
// OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
// OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
// toUpdateOss(bucketName, 0, oss, file);
//
// }
public static Handler handler = new Handler();
//
private void toUpdateOss(String bucketName, int i, OSSClient oss, File file ) {
LogUtils.i("1111111111111111111");
String updatePathPicHead = "userAvatarFileName";
LogUtils.i("22222222222222222");
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
LogUtils.i("文件地址是啥1：" + file.getPath());
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
put.setProgressCallback((request, currentSize, totalSize) -> {
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
});
LogUtils.i("55555555555555");
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
@Override
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
LogUtils.i("PutObject", "UploadSuccess");
LogUtils.i("ETag", result.getETag());
LogUtils.i("RequestId", result.getRequestId());
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
handler.post(() -> {
dimessLoadingDialog();
avater = IMUIKitConfig.OSS_URL+"media/" + updatePathPicHead + "/" + fileName;
});
}
@Override
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
dimessLoadingDialog();
LogUtils.i("ErrorCode", clientExcepion.getMessage());
// 请求异常。
if (clientExcepion != null) {
// 本地异常，如网络异常等。
clientExcepion.printStackTrace();
}
if (serviceException != null) {
// 服务异常。
LogUtils.i("ErrorCode", serviceException.getErrorCode());
LogUtils.i("RequestId", serviceException.getRequestId());
LogUtils.i("HostId", serviceException.getHostId());
LogUtils.i("RawMessage", serviceException.getRawMessage());
}
}
});
// private void toUpdateOss(String bucketName, int i, OSSClient oss, File file ) {
// LogUtils.i("1111111111111111111");
// String updatePathPicHead = "userAvatarFileName";
//
// LogUtils.i("22222222222222222");
//
// String fileName = UUID.randomUUID().toString() + "_" + file.getName();
// LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
// LogUtils.i("文件地址是啥1：" + file.getPath());
//
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
//
// put.setProgressCallback((request, currentSize, totalSize) -> {
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
//
// });
// LogUtils.i("55555555555555");
//
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
// @Override
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
// LogUtils.i("PutObject", "UploadSuccess");
// LogUtils.i("ETag", result.getETag());
// LogUtils.i("RequestId", result.getRequestId());
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
//
// handler.post(() -> {
// dimessLoadingDialog();
// avater = IMUIKitConfig.OSS_URL+"media/" + updatePathPicHead + "/" + fileName;
// });
// }
//
// @Override
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
// dimessLoadingDialog();
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
//
// // 请求异常。
// if (clientExcepion != null) {
// // 本地异常，如网络异常等。
// clientExcepion.printStackTrace();
// }
// if (serviceException != null) {
// // 服务异常。
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
// LogUtils.i("RequestId", serviceException.getRequestId());
// LogUtils.i("HostId", serviceException.getHostId());
// LogUtils.i("RawMessage", serviceException.getRawMessage());
// }
// }
// });
//// }
// }
}

1054
app/src/main/java/com/hbl/lewan/login/RegisterActivityBf.java Normal file
View File

@@ -0,0 +1,1054 @@
//// 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.login;
//
//
//import android.Manifest;
//import android.app.Activity;
//import android.content.Context;
//import android.content.Intent;
//import android.graphics.Bitmap;
//import android.graphics.Color;
//import android.graphics.drawable.Drawable;
//import android.net.Uri;
//import android.os.Build;
//import android.os.Bundle;
//import android.os.CountDownTimer;
//import android.os.Handler;
//import android.text.Html;
//import android.text.SpannableStringBuilder;
//import android.text.Spanned;
//import android.text.TextUtils;
//import android.text.method.LinkMovementMethod;
//import android.view.MotionEvent;
//import android.view.View;
//import android.view.inputmethod.InputMethodManager;
//import android.widget.ImageView;
//import android.widget.TextView;
//
//import androidx.activity.result.ActivityResultLauncher;
//import androidx.activity.result.contract.ActivityResultContracts;
//import androidx.annotation.NonNull;
//import androidx.annotation.Nullable;
//import androidx.annotation.RequiresApi;
//import androidx.core.content.ContextCompat;
//import androidx.fragment.app.Fragment;
//
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.bumptech.glide.Glide;
//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.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.luck.picture.lib.basic.PictureSelector;
//import com.luck.picture.lib.config.PictureMimeType;
//import com.luck.picture.lib.config.SelectMimeType;
//import com.luck.picture.lib.engine.CropFileEngine;
//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.luck.picture.lib.utils.StyleUtils;
//import com.netease.nimlib.sdk.auth.LoginInfo;
//import com.netease.yunxin.kit.alog.ALog;
//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.activities.BrowseActivity;
//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.corekit.im.IMKitClient;
//import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
//import com.yalantis.ucrop.UCrop;
//import com.yalantis.ucrop.UCropImageEngine;
//
//import java.io.File;
//import java.util.ArrayList;
//import java.util.HashMap;
//import java.util.Map;
//import java.util.UUID;
//
//import cn.iwgang.simplifyspan.customspan.CustomClickableSpan;
//import cn.iwgang.simplifyspan.other.CustomLinkMovementMethod;
//import cn.iwgang.simplifyspan.unit.SpecialClickableUnit;
//import io.reactivex.android.schedulers.AndroidSchedulers;
//import io.reactivex.schedulers.Schedulers;
//
///**
// * Welcome Page is launch page
// */
//@Deprecated
//public class RegisterActivityBf extends BaseActivity {
// protected ActivityResultLauncher<String[]> permissionLauncher;
// String passwordCode = null;
//
// private static final String TAG = "WelcomeActivity";
// private ActivityRegisterBfBinding activityWelcomeBinding;
// int step = 1;
// int sexType = 1;
// CountryBean countryBean;
// String avater = null;
// long lastTime =0;
// PermissionExplainDialog permissionExplainDialog;
//
// @RequiresApi(api = Build.VERSION_CODES.M)
// @Override
// protected void onCreate(Bundle savedInstanceState) {
// super.onCreate(savedInstanceState);
// getWindow().setStatusBarColor(getResources().getColor(R.color.color_white));
// getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
//
// ALog.d(Constant.PROJECT_TAG, TAG, "onCreateView");
// IMApplication.setColdStart(true);
// activityWelcomeBinding = ActivityRegisterBfBinding.inflate(getLayoutInflater());
// setContentView(activityWelcomeBinding.getRoot());
// myCountDownTimer = new MyCountDownTimer(60000, 1000);
//
// activityWelcomeBinding.aboutTitleBar.setOnBackIconClickListener(v -> {
// onBackPressed();
// });
// setPrivacyContent(activityWelcomeBinding.mobileTipsTv);
//
// countryBean = DataUtils.getLocCountry(RegisterActivityBf.this);
// changeArea();
// activityWelcomeBinding.areaTv.setOnClickListener(v -> {
// SelectCountryDialog selectCountryDialog = new SelectCountryDialog(RegisterActivityBf.this);
// selectCountryDialog.setOnToVipListener(new SelectCountryDialog.OnToTypeListener() {
// @Override
// public void toType(CountryBean type) {
// countryBean = type;
// changeArea();
// DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOC_COUNTRY_CODE, type.getAreaCodeName());
// }
// });
// selectCountryDialog.show();
// });
// activityWelcomeBinding.nextIv.setOnClickListener(v -> {
// if(lastTime>0){
// if(System.currentTimeMillis()-lastTime<2000){
// return;
// }
// }
// lastTime = System.currentTimeMillis();
// if (step < 5) {
// if (step == 1) {
// if (TextUtils.isEmpty(activityWelcomeBinding.phoneEt.getText().toString().trim())) {
// ToastX.showShortToast(R.string.sjhbnwk_txt);
// return;
// }
// checkPhone();
// } else if (step == 2) {
// if (TextUtils.isEmpty(passwordCode)||passwordCode.length()!=4) {
// ToastX.showShortToast(R.string.dxyzmbnwk_txt);
// return;
// }
// checkVerfyCode();
// } else if (step == 3) {
// if (TextUtils.isEmpty(activityWelcomeBinding.passwordEt.getText().toString().trim())) {
// ToastX.showShortToast(R.string.mimabunengweikong_txt);
// return;
// }
//
// if(!DataUtils.checkPassword(activityWelcomeBinding.passwordEt.getText().toString().trim())){
// ToastX.showShortToast(R.string.qjcmmgs_txt);
// return;
// }
//
// if(activityWelcomeBinding.passwordEt.getText().toString().trim().length()<8){
// ToastX.showShortToast(R.string.qjcmmgs_txt1);
// return;
// }
//
// if (TextUtils.isEmpty(activityWelcomeBinding.passwordEt1.getText().toString().trim())) {
// ToastX.showShortToast(R.string.qrmmbnwk_txt);
// return;
// }
// if (!activityWelcomeBinding.passwordEt.getText().toString().trim().equals(activityWelcomeBinding.passwordEt1.getText().toString().trim())) {
// ToastX.showShortToast(R.string.mimaquernemimabuyizhi_txt);
// return;
// }
// hideSoftInput(this);
// new Handler().postDelayed(() -> {
// step += 1;
// changeStep();
// }, 500);
// }else if (step == 4) {
// if (TextUtils.isEmpty(activityWelcomeBinding.nicknameEt.getText().toString().trim())) {
// ToastX.showShortToast(R.string.nichengbunengweik_txt);
// return;
// }
//
// hideSoftInput(this);
// new Handler().postDelayed(() -> {
// step += 1;
// changeStep();
// }, 500);
// }
//
// } else {
// if (TextUtils.isEmpty(activityWelcomeBinding.trueNameEt.getText().toString().trim())) {
// ToastX.showShortToast(R.string.zhenshixingmingbunengweik_txt);
// return;
// }
//
// if (TextUtils.isEmpty(activityWelcomeBinding.cardNumberEt.getText().toString().trim())) {
// ToastX.showShortToast(R.string.shenfenzbunengwiek_txt);
// return;
// }
//
// if(!TaiWanIDCardUtils.checkTaiWanIdCardNumber(activityWelcomeBinding.cardNumberEt.getText().toString().trim())){
// ToastX.showShortToast(R.string.qsrzqsfzh_txt);
//
// return ;
// }
//
// hideSoftInput(this);
// phoneRegister();
//// loginIM(account, token);
// }
// });
// activityWelcomeBinding.changeSmsCodeTv.setOnClickListener(v -> {
// step = 3;
// changeStep();
// });
//
// activityWelcomeBinding.changePassTv.setOnClickListener(v -> {
// step = 2;
// changeStep();
// });
// activityWelcomeBinding.passwordEditTextCode.setOnCompleteListener(code -> {
// passwordCode = code;
//
// });
//
//
// activityWelcomeBinding.sendSmsTv.setOnClickListener(v -> {
// toStep2();
// });
//
// activityWelcomeBinding.headRy.setOnClickListener(v -> {
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
// if (PermissionUtils.hasPermissions(
// RegisterActivityBf.this, Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO)) {
// startPickMedia();
// } else {
// 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});
//
// }
// } else {
// if (PermissionUtils.hasPermissions(
// RegisterActivityBf.this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
// startPickMedia();
// } else {
// 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_EXTERNAL_STORAGE});
//
// }
// }
// });
//
// activityWelcomeBinding.nanIv.setOnClickListener(v -> changeSex(1));
// activityWelcomeBinding.nanTv.setOnClickListener(v -> changeSex(1));
// activityWelcomeBinding.nvIv.setOnClickListener(v -> changeSex(0));
// activityWelcomeBinding.nvTv.setOnClickListener(v -> changeSex(0));
//
// AnimUtil.setAnimViews(activityWelcomeBinding.sendSmsTv, activityWelcomeBinding.changePassTv,
// activityWelcomeBinding.nextIv, activityWelcomeBinding.changeSmsCodeTv, activityWelcomeBinding.areaTv,
// activityWelcomeBinding.headRy, activityWelcomeBinding.nanIv, activityWelcomeBinding.nvIv);
//
// permissionLauncher =
// registerForActivityResult(
// new ActivityResultContracts.RequestMultiplePermissions(),
// result -> {
// if (result != null) {
// for (Map.Entry<String, Boolean> entry : result.entrySet()) {
// String permission = entry.getKey().toString();
// boolean grant = (Boolean) entry.getValue();
// if (grant) {
// if (TextUtils.equals(
// permission, Manifest.permission.READ_EXTERNAL_STORAGE) || TextUtils.equals(
// permission, Manifest.permission.READ_MEDIA_IMAGES) || TextUtils.equals(
// permission, Manifest.permission.READ_MEDIA_VIDEO)) {
// startPickMedia();
// }
// } else {
// if (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();
// }
//
//
// });
// }
//
// private void checkVerfyCode() {
// Map<String, Object> maps = new HashMap<>();
// maps.put("verifyCode", passwordCode);
// maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
// maps.put("areaCode", countryBean.getAreaCodeName());
// if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
// maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
// }
// Api.getInstance().preCheckVerifyCode(maps)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result<RegisteredBean>>() {
//
// @Override
// public void onSuccess(Result<RegisteredBean> feedbackResp) {
//// dimessLoadingDialog();
// if (feedbackResp.data.isCorrect()) {
// new Handler().postDelayed(() -> {
// step += 1;
// changeStep();
// }, 500);
// } else {
// ToastX.showShortToast(R.string.yzmbzq_txt);
// }
// }
//
// @Override
// public void onError(int code, String msg) {
//// dimessLoadingDialog();
// LogUtils.i("获取到的错误:" + code + "" + msg);
// ToastX.showShortToast( msg);
//
//
// }
// });
// }
//
// private void checkPhone() {
// hideSoftInput(RegisterActivityBf.this);
// Map<String, Object> maps = new HashMap<>();
// maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
// maps.put("areaCode", countryBean.getAreaCodeName());
// if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
// maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
// }
// Api.getInstance().registered(maps)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result<RegisteredBean>>() {
//
// @Override
// public void onSuccess(Result<RegisteredBean> feedbackResp) {
// if (!feedbackResp.data.isRegistered()) {
//// checkVerfyCode();
// new Handler().postDelayed(() -> {
// step += 1;
// changeStep();
// }, 500);
//
// } else {
// ToastX.showShortToast(R.string.yzczjdl_txt);
// }
//
// }
//
// @Override
// public void onError(int code, String msg) {
// LogUtils.i("获取到的错误:" + code + "" + msg);
// ToastX.showShortToast(msg);
// }
// });
// }
//
//
// private void phoneRegister() {
// Map<String, Object> maps = new HashMap<>();
// maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
// 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);
// if (!TextUtils.isEmpty(avater)) {
// maps.put("avatar", avater);
// }
// maps.put("sex", sexType);
// maps.put("realName", activityWelcomeBinding.trueNameEt.getText().toString().trim());
// maps.put("idCard", activityWelcomeBinding.cardNumberEt.getText().toString().trim());
//
// if(!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
// maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
// }
// Api.getInstance().phoneRegister(maps)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<>() {
// @Override
// public void onSuccess(Result<String> feedbackResp) {
// doLogin();
// }
//
// @Override
// public void onError(int code, String msg) {
// LogUtils.i("获取到的错误:" + code + "" + msg);
// ToastX.showShortToast(msg);
// }
// });
//
//
// }
//
// /**
// * 实施登录的方法.
// * <p>
// * 本方法中将判断登录用名和密码的字面合法性（比如不能为空等），然后执行真正的异步登录处理.
// *
// */
// private void doLogin() {
//
// String uidOrMail = String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim().toLowerCase();
// String loginPsw = String.valueOf(activityWelcomeBinding.passwordEt.getText()).trim();
//
// PassWordLoginBean passWordLoginBean = new PassWordLoginBean(uidOrMail, loginPsw, countryBean.getAreaCodeName(), 0,
// GetAndroidUniqueMark.getUniqueId(RegisterActivityBf.this),IMUIKitConfig.SUBSTATIONID);
// if(TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)){
// passWordLoginBean = new PassWordLoginBean(uidOrMail, loginPsw, countryBean.getAreaCodeName(), 0,
// GetAndroidUniqueMark.getUniqueId(RegisterActivityBf.this));
// }
// Api.getInstance().passwordLogin(passWordLoginBean)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<>() {
//
// @Override
// public void onSuccess(Result<LoginBean> feedbackResp) {
//
// if(TextUtils.isEmpty(feedbackResp.data.getUser().getChatToken())){
// ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(RegisterActivityBf.this, getString(R.string.zhbhf_jqsb_txt), false);
// actionConfirmDialog.show();
// return;
// }
//
// DataUtils.set(RegisterActivityBf.this,"login_bean", GsonUtils.beanToJSONString(feedbackResp.data));
//
// loginIM(feedbackResp.data.getUser_uid(),feedbackResp.data.getUser().getChatToken());
// }
//
// @Override
// public void onError(int code, String msg) {
//// dimessLoadingDialog();
// LogUtils.i("获取到的错误:" + code + "" + msg);
// ToastX.showShortToast( msg);
//
//
// }
// });
// }
//
//
////
//// AvaterBean avaterBean = null;
////
//// private void updateImage(File file) {
//// RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
//// MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("file", file.getName(), imageBody);
//// Api.getInstance().uploadUserAvatar(imageBodyPart)
//// .subscribeOn(Schedulers.io())
//// .observeOn(AndroidSchedulers.mainThread())
//// .subscribe(new BaseObserver<Result<AvaterBean>>() {
////
//// @Override
//// public void onSuccess(Result<AvaterBean> feedbackResp) {
//// avaterBean = feedbackResp.data;
//// }
////
//// @Override
//// public void onError(int code, String msg) {
//// }
//// });
//// }
//
//
// private void toStep2() {
// hideSoftInput(RegisterActivityBf.this);
// Map<String, String> maps = new HashMap<>();
// maps.put("phone", String.valueOf(activityWelcomeBinding.phoneEt.getText()).trim());
// maps.put("areaCode", countryBean.getAreaCodeName());
// if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
// maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
// }
// Api.getInstance().sendSmsForRegister(maps)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result<String>>() {
//
// @Override
// public void onSuccess(Result<String> feedbackResp) {
// myCountDownTimer.start();
// ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(RegisterActivityBf.this, getString(R.string.yzmyfs_txt), false);
// actionConfirmDialog.show();
// activityWelcomeBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt1),
// countryBean.getAreaCodeName()+" "+activityWelcomeBinding.phoneEt.getText().toString().trim())));
// }
//
// @Override
// public void onError(int code, String msg) {
// LogUtils.i("获取到的错误:" + code + "" + msg);
// ToastX.showShortToast(msg);
// }
// });
//
//
// }
//
//
// MyCountDownTimer myCountDownTimer;
//
// //倒计时函数
// private class MyCountDownTimer extends CountDownTimer {
//
// public MyCountDownTimer(long millisInFuture, long countDownInterval) {
// super(millisInFuture, countDownInterval);
// }
//
// //计时过程
// @Override
// public void onTick(long l) {
// //防止计时过程中重复点击
// activityWelcomeBinding.sendSmsTv.setClickable(false);
//// getcodeTv.setTextColor(getResources().getColor(R.color.color_adb5bd));
// activityWelcomeBinding.sendSmsTv.setText(String.format(getString(R.string.get_code1_txt), (l / 1000)));
//
// }
//
// //计时完毕的方法
// @Override
// public void onFinish() {
// //重新给Button设置文字
// activityWelcomeBinding.sendSmsTv.setText(R.string.get_code_txt);
// //设置可点击
// activityWelcomeBinding.sendSmsTv.setClickable(true);
//// getcodeTv.setTextColor(getResources().getColor(R.color.colorAccent));
//
// }
// }
//
//
// /**
// * 隐藏软键盘
// */
// public void hideSoftInput(Activity activity) {
// InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
// if (getCurrentFocus() != null && null != imm) {
// imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
// }
//// View view = activity.getCurrentFocus();
////
//// if (view != null) {
////
//// InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
////
//// inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
////
//// }
// }
//
//
// private void changeSex(int i) {
// sexType = i;
// activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_f);
// activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_f);
// if (i == 1) {
// activityWelcomeBinding.nanIv.setImageResource(R.mipmap.nan_img_t);
// } else {
// activityWelcomeBinding.nvIv.setImageResource(R.mipmap.nv_img_t);
// }
// }
//
// @Override
// public void onBackPressed() {
// if (step == 1) {
// super.onBackPressed();
// } else {
// step -= 1;
// changeStep();
// }
// }
//
// private void changeStep() {
// switch (step) {
// case 1:
// activityWelcomeBinding.step1Ly.setVisibility(View.VISIBLE);
// activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
// activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
// break;
// case 2:
// activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step3Ly.setVisibility(View.VISIBLE);
// activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
// 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.step5Ly.setVisibility(View.GONE);
//
// break;
// case 3:
// activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step2Ly.setVisibility(View.VISIBLE);
// activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
// activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
//
// break;
//
// case 4:
// activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step4Ly.setVisibility(View.VISIBLE);
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
// activityWelcomeBinding.step5Ly.setVisibility(View.GONE);
//
// break;
//
// case 5:
// activityWelcomeBinding.step1Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step2Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step3Ly.setVisibility(View.GONE);
// activityWelcomeBinding.step4Ly.setVisibility(View.GONE);
// activityWelcomeBinding.changeSmsCodeTv.setVisibility(View.GONE);
// activityWelcomeBinding.changePassTv.setVisibility(View.GONE);
// activityWelcomeBinding.step5Ly.setVisibility(View.VISIBLE);
//
// break;
// }
// }
//
// PictureSelectorStyle selectorStyle;
// LocalMedia localMedia = null;
//
// protected void startPickMedia() {
//// pickMediaLauncher.launch("image/*;video/*");
//
// TitleBarStyle whiteTitleBarStyle = new TitleBarStyle();
// whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(RegisterActivityBf.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(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_black));
// whiteTitleBarStyle.setTitleCancelTextColor(ContextCompat.getColor(RegisterActivityBf.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(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
//
// whiteBottomNavBarStyle.setBottomPreviewNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
// whiteBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.color_222222));
// whiteBottomNavBarStyle.setCompleteCountTips(false);
// whiteBottomNavBarStyle.setBottomEditorTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
// whiteBottomNavBarStyle.setBottomOriginalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_53575e));
//
// SelectMainStyle selectMainStyle = new SelectMainStyle();
// selectMainStyle.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
// selectMainStyle.setDarkStatusBarBlack(true);
// selectMainStyle.setSelectNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_9b));
// selectMainStyle.setSelectTextColor(ContextCompat.getColor(RegisterActivityBf.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(RegisterActivityBf.this, com.netease.yunxin.kit.chatkit.ui.R.color.ps_color_white));
// selectorStyle = new PictureSelectorStyle();
// selectorStyle.setTitleBarStyle(whiteTitleBarStyle);
// selectorStyle.setBottomBarStyle(whiteBottomNavBarStyle);
// selectorStyle.setSelectMainStyle(selectMainStyle);
//
//
// PictureSelector.create(this)
// .openGallery(SelectMimeType.ofImage())
// .setImageEngine(GlideEngine.createGlideEngine())
// .setCropEngine(new ImageFileCropEngine())
// .setMaxSelectNum(1)
// .setSelectorUIStyle(selectorStyle)
// .forResult(new OnResultCallbackListener<>() {
// @Override
// public void onResult(ArrayList<LocalMedia> result) {
// if (result.size() > 0) {
// Glide.with(RegisterActivityBf.this)
// .load(result.get(0).getAvailablePath())
// .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
// .into(activityWelcomeBinding.headIv);
// localMedia = result.get(0);
// toShangchuanAli(new File(result.get(0).getAvailablePath()));
//// updateImage(new File(result.get(0).getAvailablePath()));
// }
// }
//
// @Override
// public void onCancel() {
//
// }
// });
//
// }
//
//
// /**
// * 自定义裁剪
// */
// private class ImageFileCropEngine implements CropFileEngine {
//
// @Override
// public void onStartCrop(Fragment fragment, Uri srcUri, Uri destinationUri, ArrayList<String> dataSource, int requestCode) {
// UCrop.Options options = buildOptions();
// UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource);
// uCrop.withOptions(options);
// uCrop.setImageEngine(new UCropImageEngine() {
// @Override
// public void loadImage(Context context, String url, ImageView imageView) {
// if (!AppUtils.assertValidRequest(context)) {
// return;
// }
// Glide.with(context).load(url).override(180, 180).into(imageView);
// }
//
// @Override
// public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener<Bitmap> call) {
// Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget<Bitmap>() {
// @Override
// public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
// if (call != null) {
// call.onCall(resource);
// }
// }
//
// @Override
// public void onLoadCleared(@Nullable Drawable placeholder) {
// if (call != null) {
// call.onCall(null);
// }
// }
// });
// }
// });
// uCrop.start(fragment.requireActivity(), fragment, requestCode);
// }
// }
//
// /**
// * 配制UCrop，可根据需求自我扩展
// *
// * @return
// */
// private UCrop.Options buildOptions() {
// UCrop.Options options = new UCrop.Options();
// options.setHideBottomControls(false);
// options.setFreeStyleCropEnabled(true);
// options.setShowCropFrame(true);
// options.setShowCropGrid(true);
// options.setCircleDimmedLayer(false);
// options.withAspectRatio(1, 1);
// options.setCropOutputPathDir(getSandboxPath());
// options.isCropDragSmoothToCenter(false);
// options.setSkipCropMimeType(new String[]{PictureMimeType.ofGIF(), PictureMimeType.ofWEBP()});
// options.isForbidCropGifWebp(true);
// options.isForbidSkipMultipleCrop(true);
// options.setMaxScaleMultiplier(100);
// if (selectorStyle != null && selectorStyle.getSelectMainStyle().getStatusBarColor() != 0) {
// SelectMainStyle mainStyle = selectorStyle.getSelectMainStyle();
// boolean isDarkStatusBarBlack = mainStyle.isDarkStatusBarBlack();
// int statusBarColor = mainStyle.getStatusBarColor();
// options.isDarkStatusBarBlack(isDarkStatusBarBlack);
// if (StyleUtils.checkStyleValidity(statusBarColor)) {
// options.setStatusBarColor(statusBarColor);
// options.setToolbarColor(statusBarColor);
// } else {
// options.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
// options.setToolbarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
// }
// TitleBarStyle titleBarStyle = selectorStyle.getTitleBarStyle();
// if (StyleUtils.checkStyleValidity(titleBarStyle.getTitleTextColor())) {
// options.setToolbarWidgetColor(titleBarStyle.getTitleTextColor());
// } else {
// options.setToolbarWidgetColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_white));
// }
// } else {
// options.setStatusBarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
// options.setToolbarColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_grey));
// options.setToolbarWidgetColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.ps_color_white));
// }
// return options;
// }
//
// /**
// * 创建自定义输出目录
// *
// * @return
// */
// private String getSandboxPath() {
// File externalFilesDir = getExternalFilesDir("");
// File customFile = new File(externalFilesDir.getAbsolutePath(), "Sandbox");
// if (!customFile.exists()) {
// customFile.mkdirs();
// }
// return customFile.getAbsolutePath() + File.separator;
// }
//
//
// private void changeArea() {
// activityWelcomeBinding.areaTv.setText(countryBean.getCountryName() + countryBean.getAreaCodeName());
// }
//
// private void showMainActivityAndFinish() {
// ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
// Intent intent = new Intent();
// intent.setClass(this, MainActivity.class);
// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
// this.startActivity(intent);
// finish();
// }
//
//
// private void loginIM(String account, String token) {
// ALog.d(Constant.PROJECT_TAG, TAG, "loginIM");
// activityWelcomeBinding.getRoot().setVisibility(View.GONE);
// LoginInfo loginInfo =
// LoginInfo.LoginInfoBuilder.loginInfoDefault(account, token)
// .withAppKey(DataUtils.readAppKey(this))
// .build();
// IMKitClient.loginIM(
// loginInfo,
// new LoginCallback<LoginInfo>() {
// @Override
// public void onError(int errorCode, @NonNull String errorMsg) {
// ToastX.showShortToast(
// String.format(getResources().getString(R.string.login_fail), errorCode));
// }
//
// @Override
// public void onSuccess(@Nullable LoginInfo data) {
// DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
// DataUtils.set(RegisterActivityBf.this, IMUIKitConfig.LOGIN_TOKEN, token);
// showMainActivityAndFinish();
// }
// });
// }
//
// private void setPrivacyContent(TextView contentView) {
//
// SpannableStringBuilder stringBuilder = new SpannableStringBuilder(getString(R.string.denglujitongyi_txt));
//
// int len = stringBuilder.length();
//
// stringBuilder.append(getString(R.string.fuwuxieyi_txt));
//
// SpecialClickableUnit unit = new SpecialClickableUnit(contentView,
// (tv, clickableSpan) -> {
// BrowseActivity.Companion.launch(
// RegisterActivityBf.this, getString(R.string.fuwuxieyi_txt), IMUIKitConfig.RBCHAT_SERVICE_CN_URL);
// });
// unit.setNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
// unit.setPressTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
// unit.showUnderline();
// CustomClickableSpan customClickableSpan = new CustomClickableSpan(unit);
// stringBuilder.setSpan(customClickableSpan, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
// stringBuilder.append(getString(R.string.yiji_txt));
// len = stringBuilder.length();
// stringBuilder.append(getString(R.string.yinsizhengche_txt));
// SpecialClickableUnit unit1 = new SpecialClickableUnit(contentView,
// (tv, clickableSpan) -> {
// BrowseActivity.Companion.launch(
// RegisterActivityBf.this, getString(R.string.yinsizhengche_txt), IMUIKitConfig.RBCHAT_PRIVACY_CN_URL);
// });
// unit1.setNormalTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
// unit1.setPressTextColor(ContextCompat.getColor(RegisterActivityBf.this, R.color.color_7f7b81));
// unit1.showUnderline();
// CustomClickableSpan customClickableSpan1 = new CustomClickableSpan(unit1);
// stringBuilder.setSpan(customClickableSpan1, len, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
//
// contentView.setText(stringBuilder);
// contentView.setClickable(false);
// contentView.setMovementMethod(CustomLinkMovementMethod.getInstance());//不设置 没有点击事件
// contentView.setHighlightColor(Color.TRANSPARENT); //设置点击后的颜色为透明
// contentView.setMovementMethod(LinkMovementMethod.getInstance());//不设置点击会失效
//
// }
//
//
//
// StsCredentialsBean stsCredentialsBean;
//
// private void toShangchuanAli(File file ) {
// showLoadingDialog();
// Api.getInstance().stsCredentials()
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
// @Override
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
// stsCredentialsBean = feedbackResp.data;
// toAliYunOss(file);
// }
//
// @Override
// public void onError(int code, String msg) {
// dimessLoadingDialog();
// }
// });
// }
//
//
// private void toAliYunOss(File file ) {
// 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, file);
//
// }
// public static Handler handler = new Handler();
//
// //
// private void toUpdateOss(String bucketName, int i, OSSClient oss, File file ) {
// LogUtils.i("1111111111111111111");
// String updatePathPicHead = "userAvatarFileName";
//
// LogUtils.i("22222222222222222");
//
// String fileName = UUID.randomUUID().toString() + "_" + file.getName();
// LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
// LogUtils.i("文件地址是啥1：" + file.getPath());
//
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
//
// put.setProgressCallback((request, currentSize, totalSize) -> {
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
//
// });
// LogUtils.i("55555555555555");
//
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
// @Override
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
// LogUtils.i("PutObject", "UploadSuccess");
// LogUtils.i("ETag", result.getETag());
// LogUtils.i("RequestId", result.getRequestId());
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
//
// handler.post(() -> {
// dimessLoadingDialog();
// avater = IMUIKitConfig.OSS_URL+"media/" + updatePathPicHead + "/" + fileName;
// });
// }
//
// @Override
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
// dimessLoadingDialog();
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
//
// // 请求异常。
// if (clientExcepion != null) {
// // 本地异常，如网络异常等。
// clientExcepion.printStackTrace();
// }
// if (serviceException != null) {
// // 服务异常。
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
// LogUtils.i("RequestId", serviceException.getRequestId());
// LogUtils.i("HostId", serviceException.getHostId());
// LogUtils.i("RawMessage", serviceException.getRawMessage());
// }
// }
// });
//// }
// }
//
//
//
//
// 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();
// }
//
// }
// 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);
// }
//
//}

70
app/src/main/java/com/dskj/rbchat/login/WangjiActivity.java → app/src/main/java/com/hbl/lewan/login/WangjiActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.login;
package com.hbl.lewan.login;
import android.Manifest;
@@ -37,45 +37,45 @@ import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityRegisterBinding;
import com.dskj.rbchat.databinding.ActivityWangjiBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.SelectCountryDialog;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.mine.ChangePasswordActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.PassWordLoginBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GetAndroidUniqueMark;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.config.SelectMimeType;

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

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

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

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

422
app/src/main/java/com/dskj/rbchat/main/MainActivity.java → app/src/main/java/com/hbl/lewan/main/MainActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main;
package com.hbl.lewan.main;
import static com.luck.picture.lib.utils.DensityUtil.getNavigationBarHeight;
@@ -57,54 +57,55 @@ import androidx.recyclerview.widget.RecyclerView;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.CustomConfig;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.NotificationMsgService;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityMainBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.ActionConfirmDialog1;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.dialog.VersionDialog;
import com.dskj.rbchat.game.JsBridgeActivity;
import com.dskj.rbchat.main.authorize.AuthorizeActivity;
import com.dskj.rbchat.main.chat.ChatConversationFragment;
import com.dskj.rbchat.main.chat.ChatTabFragment;
import com.dskj.rbchat.main.home.HomeFragment;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.main.mine.MineFragment;
import com.dskj.rbchat.main.mine.setting.SettingNotifyViewModel;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.ConfigBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.MessagefcmBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.model.VersionBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.pay.PaymentActivity;
import com.dskj.rbchat.pay.PaymentActivity1;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.CommonUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.QRCodeScheme;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.ToolKits;
import com.dskj.rbchat.voom.VoomFragment;
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.JsonObject;
import com.huawei.hms.hmsscankit.ScanUtilNew;
@@ -112,15 +113,15 @@ import com.huawei.hms.ml.scan.HmsScan;
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;
import com.netease.nimlib.sdk.ResponseCode;
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;
@@ -161,15 +162,15 @@ import com.netease.yunxin.kit.corekit.im.provider.FriendProvider;
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;
//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 org.json.JSONException;
import org.json.JSONObject;
@@ -182,7 +183,7 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import cn.jpush.android.api.JPushInterface;
//import cn.jpush.android.api.JPushInterface;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import kotlin.Unit;
@@ -337,7 +338,7 @@ public class MainActivity extends BaseActivity {
}
}
NotificationCompat.Builder builder = new NotificationCompat.Builder(this, channelID)
.setSmallIcon(R.mipmap.ic_launcher)
.setSmallIcon(R.mipmap.ic_launche)
.setContentTitle(title)
.setContentText(content)
.setContentIntent(pendingIntent)
@@ -359,7 +360,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.dskj.rbchat/raw/" + rawResource);
Uri ringUri = Uri.parse("android.resource://com.hbl.lewan/raw/" + rawResource);
NotificationChannel vibration = new NotificationChannel(channelID, IMApplication.getAppContext().getString(R.string.bell_default), NotificationManager.IMPORTANCE_DEFAULT);
vibration.enableLights(true);
vibration.enableVibration(true);
@@ -497,7 +498,7 @@ public class MainActivity extends BaseActivity {
private void getVersion() {
try {
Api.getInstance().version(7, DataUtils.getVersionCode(MainActivity.this), IMUIKitConfig.SUBSTATIONID)
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(MainActivity.this), IMUIKitConfig.SUBSTATIONID)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@@ -510,7 +511,8 @@ public class MainActivity extends BaseActivity {
VersionDialog actionDialog = new VersionDialog(MainActivity.this,
String.format(getString(R.string.updateversion_txt), versionBean.getVersionName()),
getDownloadText(versionBean), getString(R.string.xiacigengxin_txt),
getString(R.string.login_form_have_latest_version_update_now), versionBean.getForceDownload() == 0);
getString(R.string.login_form_have_latest_version_update_now),
versionBean.getForceDownload() == 0);
actionDialog.setOnToActionListener(new VersionDialog.OnToActionListener() {
@Override
public void toSumbit() {
@@ -546,6 +548,9 @@ public class MainActivity extends BaseActivity {
private void checkUpdate(String url) {
new AppUpdater(MainActivity.this, url).start();
// Intent intent = new Intent(Intent.ACTION_VIEW);
// intent.setData(Uri.parse(url));
// startActivity(intent);
}
private String getDownloadText(VersionBean versionBean) {
@@ -670,7 +675,7 @@ public class MainActivity extends BaseActivity {
}
private void setAlias() {
JPushInterface.setAlias(MainActivity.this, Integer.parseInt(IMKitClient.account()), IMKitClient.account());
// JPushInterface.setAlias(MainActivity.this, Integer.parseInt(IMKitClient.account()), IMKitClient.account());
}
public void setUnReadChat(int number) {
@@ -731,9 +736,9 @@ public class MainActivity extends BaseActivity {
protected void onPostResume() {
super.onPostResume();
// 部分Android机型在页面进入onResume前启动其他页面会取消当前页面流程，避免组件初始化后立即展示来电页面将初始化的逻辑滞后
if (!CallKitUI.INSTANCE.getInit()) {
configCallKit();
}
// if (!CallKitUI.INSTANCE.getInit()) {
// configCallKit();
// }
}
@@ -767,13 +772,18 @@ public class MainActivity extends BaseActivity {
ALog.d(Constant.PROJECT_TAG, "MainActivity:initView");
loadConfig();
List<Fragment> fragments = new ArrayList<>();
// index2Fragment = new HomeFragment();
index2Fragment = new HomeFragment();
chatTabFragment = new ChatTabFragment();
// voomFragment = new VoomFragment();
voomFragment = new VoomFragment();
walletFragment = new MineFragment();
// fragments.add(index2Fragment);
fragments.add(index2Fragment);
fragments.add(chatTabFragment);
// fragments.add(voomFragment);
if(ApiService.AREA_CODE.equals("+86")) {
fragments.add(voomFragment);
activityMainBinding.liveBtnGroup.setVisibility(View.VISIBLE);
}else{
activityMainBinding.liveBtnGroup.setVisibility(View.GONE);
}
fragments.add(walletFragment);
fragmentAdapter = new FragmentAdapter(this);
@@ -782,7 +792,7 @@ public class MainActivity extends BaseActivity {
activityMainBinding.viewPager.setAdapter(fragmentAdapter);
activityMainBinding.viewPager.setCurrentItem(START_INDEX, false);
activityMainBinding.viewPager.setOffscreenPageLimit(fragments.size());
mCurrentTab = activityMainBinding.contactBtnGroup;
mCurrentTab = activityMainBinding.conversationBtnGroup;
resetTabSkin(isCommonSkin);
checkZhiWen();
shareDateUtils = new ShareDateUtils();
@@ -843,7 +853,7 @@ public class MainActivity extends BaseActivity {
/**
* 解析2维码扫码结果并进入相应和业务逻辑处理（主要用于从2维码扫描界面扫描完成后的回调结果处理）。
*
* @param originalQrcodeStr 扫描出的原始2维码字符串，形如"time_go_chat://add_user/400069"
* @param originalQrcodeStr 扫描出的原始2维码字符串，形如"time_go_mm://add_user/400069"
*/
public void processQRCodeScanResult(Activity activity, String originalQrcodeStr) {
if (originalQrcodeStr != null) {
@@ -888,7 +898,7 @@ public class MainActivity extends BaseActivity {
startActivity(intent2);
} else {
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(originalQrcodeStr);
// 2维码内容前缀（形如“time_go_chat://add_user/”）
// 2维码内容前缀（形如“time_go_mm://add_user/”）
LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
String scheme = qrData.getScheme();
@@ -963,7 +973,7 @@ public class MainActivity extends BaseActivity {
break;
default:
if (scheme.startsWith("http")) {
if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
// showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent));
@@ -1538,7 +1548,7 @@ public class MainActivity extends BaseActivity {
@SuppressLint("UseCompatLoadingForDrawables")
private void resetTabSkin(boolean isCommonSkin) {
if (mCurrentTab == activityMainBinding.contactBtnGroup) {
activityMainBinding.viewPager.setCurrentItem(0, false);
activityMainBinding.viewPager.setCurrentItem(1, false);
activityMainBinding.contact.setTextColor(
getResources().getColor(R.color.color_fe6881));
activityMainBinding.contact.setCompoundDrawablesWithIntrinsicBounds(
@@ -1552,7 +1562,11 @@ public class MainActivity extends BaseActivity {
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) {
activityMainBinding.viewPager.setCurrentItem(1, false);
// if(ApiService.AREA_CODE.equals("+86")) {
activityMainBinding.viewPager.setCurrentItem(3, false);
// }else{
// activityMainBinding.viewPager.setCurrentItem(1, false);
// }
activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_fe6881));
activityMainBinding.mine.setCompoundDrawablesWithIntrinsicBounds(
null, getResources().getDrawable(R.mipmap.wo_t), null, null);
@@ -1718,129 +1732,129 @@ public class MainActivity extends BaseActivity {
}
private void configCallKit() {
CallKitUIOptions options = new CallKitUIOptions.Builder().soundHelper(new SoundHelper() {
@Override
public boolean isEnable() {
return true;
}
@Nullable
@Override
public Integer soundResources(@NonNull AVChatSoundPlayer.RingerTypeEnum type) {
int resId;
if (type == AVChatSoundPlayer.RingerTypeEnum.CONNECTING) {
resId = com.netease.yunxin.nertc.ui.R.raw.avchat_ring;
} else if (type == AVChatSoundPlayer.RingerTypeEnum.RING) {
resId = getResources().getIdentifier(ChatDataUtils.getCellBell(IMKitClient.getUserInfo()), "raw", getPackageName());
} else {
//結束
resId = R.raw.nosound;
}
return resId;
}
}).rtcAppKey(DataUtils.readAppKey(this))
.currentUserAccId(IMKitClient.account())
.userInfoHelper(new UserInfoHelper() {
@Override
public boolean fetchNickname(@NonNull String s, @NonNull Function1<? super String, Unit> function1) {
LogUtils.d("s===" + s + function1);
FriendInfo friendInfo = ContactRepo.getFriend(s);
if (friendInfo != null) {
function1.invoke(friendInfo.getName());
}
return true;
}
@Override
public boolean fetchNicknameByTeam(@NonNull String s, @NonNull String s1, @NonNull Function1<? super String, Unit> function1) {
return false;
}
@Override
public boolean loadAvatar(@NonNull Context context, @NonNull String s, @NonNull ImageView imageView) {
return false;
}
})
.timeOutMillisecond(30 * 1000L)
.pushConfigProvider(new PushConfigProvider() {
@Override
public SignallingPushConfig providePushConfig(InvitedInfo invitedInfo) {
return new SignallingPushConfig(true, (invitedInfo.channelType == ChannelType.AUDIO.getValue()
? getString(R.string.incoming_call_notify_audio)
: getString(R.string.incoming_call_notify_video)), (invitedInfo.channelType == ChannelType.AUDIO.getValue()
? getString(R.string.incoming_call_notify_audio)
: getString(R.string.incoming_call_notify_video)),
setPushPload(ContactRepo.getUserInfo(invitedInfo.currentAccId))
);
}
})
// 收到被叫时若 app 在后台，在恢复到前台时是否自动唤起被叫页面，默认为 true
.resumeBGInvitation(true)
.notificationConfigFetcher(new Function1<InvitedInfo, CallKitNotificationConfig>() {
@RequiresApi(api = Build.VERSION_CODES.O)
@Override
public CallKitNotificationConfig invoke(InvitedInfo invitedInfo) {
UserInfo info = ContactRepo.getUserInfo(invitedInfo.currentAccId);
String content =
(info != null ? info.getUserInfoName() : invitedInfo.currentAccId)
+ (invitedInfo.channelType == ChannelType.AUDIO.getValue()
? getString(R.string.incoming_call_notify_audio)
: getString(R.string.incoming_call_notify_video));
String callName = ChatDataUtils.getCellBell(IMKitClient.getUserInfo());
LogUtils.d("NotificationConfig callName==" + callName);
int rawResource = getResources().getIdentifier(callName, "raw", getPackageName());
Uri musicUri = Uri.parse("android.resource://com.dskj.rbchat/raw/" + callName);
return new CallKitNotificationConfig(R.mipmap.ic_logo, callName, getString(R.string.message_notifycontent_avchat), content, musicUri);
}
})
// 请求 rtc token 服务，若非安全模式则不需设置(V1.8.0版本之前需要配置，V1.8.0及之后版本无需配置)
//.rtcTokenService((uid, callback) -> requestRtcToken(appKey, uid, callback)) // 自己实现的 token 请求方法
// 设置初始化 rtc sdk 相关配置，按照所需进行配置
.rtcSdkOption(new NERtcOption())
// 呼叫组件初始化 rtc 范围，true-全局初始化，false-每次通话进行初始化以及销毁
// 全局初始化有助于更快进入首帧页面，当结合其他组件使用时存在rtc初始化冲突可设置false
.rtcInitScope(false)
.build();
// 设置自定义话单消息发送
NERTCVideoCall.sharedInstance().setCallOrderListener(new CustomCallOrderHelper());
// // 若重复初始化会销毁之前的初始化实例，重新初始化
CallKitUI.init(getApplicationContext(), options);
NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer<StatusCode>() {
@Override
public void onEvent(StatusCode statusCode) {
if (statusCode == StatusCode.LOGOUT) {
CallKitUI.destroy();
} else if (statusCode.wontAutoLogin()) {
if (!isFinishing()) {
ActionConfirmDialog1 actionConfirmDialog = new ActionConfirmDialog1(MainActivity.this, getString(R.string.tcdl_tips_txt1), "", getString(R.string.general_got_it), false);
actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog1.OnToActionListener() {
@Override
public void toSumbit() {
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
CallKitUI.destroy();
finish();
}
@Override
public void toCancel() {
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
CallKitUI.destroy();
finish();
}
});
actionConfirmDialog.setSureBg(R.drawable.cornor_themblue_12dp);
actionConfirmDialog.show();
}
}
}
}, true);
}
// private void configCallKit() {
// CallKitUIOptions options = new CallKitUIOptions.Builder().soundHelper(new SoundHelper() {
// @Override
// public boolean isEnable() {
// return true;
// }
//
// @Nullable
// @Override
// public Integer soundResources(@NonNull AVChatSoundPlayer.RingerTypeEnum type) {
// int resId;
// if (type == AVChatSoundPlayer.RingerTypeEnum.CONNECTING) {
// resId = com.netease.yunxin.nertc.ui.R.raw.avchat_ring;
// } else if (type == AVChatSoundPlayer.RingerTypeEnum.RING) {
// resId = getResources().getIdentifier(ChatDataUtils.getCellBell(IMKitClient.getUserInfo()), "raw", getPackageName());
// } else {
// //結束
// resId = R.raw.nosound;
// }
// return resId;
// }
// }).rtcAppKey(DataUtils.readAppKey(this))
// .currentUserAccId(IMKitClient.account())
// .userInfoHelper(new UserInfoHelper() {
// @Override
// public boolean fetchNickname(@NonNull String s, @NonNull Function1<? super String, Unit> function1) {
// LogUtils.d("s===" + s + function1);
// FriendInfo friendInfo = ContactRepo.getFriend(s);
// if (friendInfo != null) {
// function1.invoke(friendInfo.getName());
// }
// return true;
// }
//
// @Override
// public boolean fetchNicknameByTeam(@NonNull String s, @NonNull String s1, @NonNull Function1<? super String, Unit> function1) {
// return false;
// }
//
// @Override
// public boolean loadAvatar(@NonNull Context context, @NonNull String s, @NonNull ImageView imageView) {
// return false;
// }
// })
// .timeOutMillisecond(30 * 1000L)
// .pushConfigProvider(new PushConfigProvider() {
// @Override
// public SignallingPushConfig providePushConfig(InvitedInfo invitedInfo) {
// return new SignallingPushConfig(true, (invitedInfo.channelType == ChannelType.AUDIO.getValue()
// ? getString(R.string.incoming_call_notify_audio)
// : getString(R.string.incoming_call_notify_video)), (invitedInfo.channelType == ChannelType.AUDIO.getValue()
// ? getString(R.string.incoming_call_notify_audio)
// : getString(R.string.incoming_call_notify_video)),
// setPushPload(ContactRepo.getUserInfo(invitedInfo.currentAccId))
// );
// }
// })
// // 收到被叫时若 app 在后台，在恢复到前台时是否自动唤起被叫页面，默认为 true
// .resumeBGInvitation(true)
// .notificationConfigFetcher(new Function1<InvitedInfo, CallKitNotificationConfig>() {
// @RequiresApi(api = Build.VERSION_CODES.O)
// @Override
// public CallKitNotificationConfig invoke(InvitedInfo invitedInfo) {
// UserInfo info = ContactRepo.getUserInfo(invitedInfo.currentAccId);
// String content =
// (info != null ? info.getUserInfoName() : invitedInfo.currentAccId)
// + (invitedInfo.channelType == ChannelType.AUDIO.getValue()
// ? getString(R.string.incoming_call_notify_audio)
// : getString(R.string.incoming_call_notify_video));
// String callName = ChatDataUtils.getCellBell(IMKitClient.getUserInfo());
// LogUtils.d("NotificationConfig callName==" + callName);
// int rawResource = getResources().getIdentifier(callName, "raw", getPackageName());
// Uri musicUri = Uri.parse("android.resource://com.hbl.lewan/raw/" + callName);
// return new CallKitNotificationConfig(R.mipmap.ic_logo, callName, getString(R.string.message_notifycontent_avchat), content, musicUri);
// }
// })
// // 请求 rtc token 服务，若非安全模式则不需设置(V1.8.0版本之前需要配置，V1.8.0及之后版本无需配置)
// //.rtcTokenService((uid, callback) -> requestRtcToken(appKey, uid, callback)) // 自己实现的 token 请求方法
// // 设置初始化 rtc sdk 相关配置，按照所需进行配置
// .rtcSdkOption(new NERtcOption())
// // 呼叫组件初始化 rtc 范围，true-全局初始化，false-每次通话进行初始化以及销毁
// // 全局初始化有助于更快进入首帧页面，当结合其他组件使用时存在rtc初始化冲突可设置false
// .rtcInitScope(false)
// .build();
// // 设置自定义话单消息发送
// NERTCVideoCall.sharedInstance().setCallOrderListener(new CustomCallOrderHelper());
//// // 若重复初始化会销毁之前的初始化实例，重新初始化
// CallKitUI.init(getApplicationContext(), options);
//
// NIMClient.getService(AuthServiceObserver.class).observeOnlineStatus(new Observer<StatusCode>() {
// @Override
// public void onEvent(StatusCode statusCode) {
// if (statusCode == StatusCode.LOGOUT) {
// CallKitUI.destroy();
// } else if (statusCode.wontAutoLogin()) {
// if (!isFinishing()) {
// ActionConfirmDialog1 actionConfirmDialog = new ActionConfirmDialog1(MainActivity.this, getString(R.string.tcdl_tips_txt1), "", getString(R.string.general_got_it), false);
// actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog1.OnToActionListener() {
// @Override
// public void toSumbit() {
// DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
// DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
// startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
// CallKitUI.destroy();
// finish();
// }
//
// @Override
// public void toCancel() {
// DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
// DataUtils.set(MainActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
// startActivity(new Intent(MainActivity.this, WelcomeActivity.class));
// CallKitUI.destroy();
// finish();
// }
// });
// actionConfirmDialog.setSureBg(R.drawable.cornor_themblue_12dp);
// actionConfirmDialog.show();
// }
// }
// }
// }, true);
// }
public Map<String, Object> setPushPload(UserInfo userInfo) {
Map<String, Object> map = new HashMap<>();
@@ -2176,7 +2190,7 @@ public class MainActivity extends BaseActivity {
private EditText commentEtShare;
private TextView shareBt;
private LinearLayoutManager linearLayoutManager;
private com.dskj.rbchat.adapter.CommonAdapter commonAdapter;
private com.hbl.lewan.adapter.CommonAdapter commonAdapter;
private ArrayList<UserShareBean> titleUsers;
private ArrayList<Boolean> titleUsersIsCheck;

16
app/src/main/java/com/dskj/rbchat/main/authorize/AuthorizeActivity.java → app/src/main/java/com/hbl/lewan/main/authorize/AuthorizeActivity.java
View File

@@ -1,17 +1,17 @@
package com.dskj.rbchat.main.authorize;
package com.hbl.lewan.main.authorize;
import android.os.Bundle;
import android.text.TextUtils;
import androidx.annotation.Nullable;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityAuthorizeBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityAuthorizeBinding;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.LogUtils;
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.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;
@@ -39,7 +39,7 @@ public class AuthorizeActivity extends BaseActivity {
setContentView(viewBinding.getRoot());
isWebLogin = getIntent().getBooleanExtra("isWebLogin",false);
if(isWebLogin){
viewBinding.logoIv.setImageResource(R.mipmap.ic_launcher);
viewBinding.logoIv.setImageResource(R.mipmap.ic_launche);
viewBinding.logoTv.setText(R.string.wangyeban_tmg_txt);
}
initView();

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

102
app/src/main/java/com/dskj/rbchat/main/chat/ChatConversationFragment.java → app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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,21 +20,22 @@ import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentChatconversationBinding;
import com.dskj.rbchat.event.ConversationEditEvent;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.model.NotifyCountBean;
import com.dskj.rbchat.model.TeamUpdateEvent;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.NIMClient;
@@ -48,6 +49,7 @@ import com.netease.nimlib.sdk.msg.model.RecentSession;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.nimlib.sdk.team.model.TeamInfoResult;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.model.ConversationInfo;
import com.netease.yunxin.kit.chatkit.model.UserInfoWithTeam;
@@ -250,9 +252,13 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
String values = array.getString(0);
if (!TextUtils.isEmpty(values)) {
String[] groupIdStr = values.split(",");
if(ApiService.AREA_CODE.equals("+86")) {
groupIds.addAll(Arrays.asList(groupIdStr));
LogUtils.i("获取到的错误1:" + groupIds);
queryTeamInfo();
}
}
}
} catch (JSONException e) {
throw new RuntimeException(e);
@@ -271,23 +277,18 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
}
private void queryTeamInfo() {
List<Long> teams = new ArrayList<>();
for (String groupId : groupIds) {
// teammodel
// .getTeamWithMemberData()
// .observe(
// this,
// teamResultInfo -> {
// if (teamResultInfo.getValue() == null || !teamResultInfo.getSuccess()) {
// return;
// }
// Team team = teamResultInfo.getValue().getTeam();
// addShiJieConversation(team);
// });
// teammodel.requestTeamData(groupId);
NIMClient.getService(TeamService.class).searchTeam(groupId).setCallback(new RequestCallback<Team>() {
if (!TextUtils.isEmpty(groupId)) {
teams.add(Long.parseLong(groupId));
}
}
NIMClient.getService(TeamService.class).searchTeam(teams).setCallback(new RequestCallback<TeamInfoResult>() {
@Override
public void onSuccess(Team result) {
addShiJieConversation(result);
public void onSuccess(TeamInfoResult result) {
for (int i = 0; i < result.getTeamInfoList().size(); i++) {
addShiJieConversation(result.getTeamInfoList().get(i));
}
}
@Override
@@ -302,8 +303,6 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
});
}
}
// public void updateShiJieTeamInfo(List<Team> result) {
// for (Team team : result) {
// if (groupIds.contains(team.getId()) && conversationViewShiJie.getAdatper().getConversationList().size() == 0) {
@@ -394,9 +393,10 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
if (!isAdd) {
if (conversationBeanItem != null) {
listGuanfangTeam.add(conversationBeanItem);
} else {
listGuanfangTeam.add(conversationBean); //有时候这个创建的空会话数据不全
}
// else {
// listGuanfangTeam.add(conversationBean); //有时候这个创建的空会话数据不全
// }
conversationViewShiJie.addStickTop(team.getId());
conversationViewShiJie.addData(listGuanfangTeam);
}
@@ -452,15 +452,17 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
result = 1;
} else if (bean2 == null) {
result = -1;
} else if (bean1.infoData.isStickTop() == bean2.infoData.isStickTop()) {
if (bean1.isShiJie == bean2.isShiJie) {
long time = bean1.infoData.getTime() - bean2.infoData.getTime();
result = time == 0L ? 0 : (time > 0 ? -1 : 1);
} else {
result = bean1.isShiJie ? -1 : 1;
}
} else {
result = bean1.isShiJie ? -1 : 1;
// else if (bean1.infoData.isStickTop() == bean2.infoData.isStickTop()) {
// if (bean1.isShiJie == bean2.isShiJie) {
// long time = bean1.infoData.getTime() - bean2.infoData.getTime();
// result = time == 0L ? 0 : (time > 0 ? -1 : 1);
// } else {
// result = bean1.isShiJie ? -1 : 1;
// }
// }
else {
result = bean1.infoData.isStickTop() ? -1 : 1;
}
return result;
};
@@ -658,12 +660,18 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
conversationViewBottom.setViewHolderFactory(funViewHolderFactory);
conversationViewShiJie.setViewHolderFactory(funViewHolderFactory);
if (conversationType == 2) {
if(ApiService.AREA_CODE.equals("+86")) {
viewBinding.layoutShijiechat.setVisibility(View.VISIBLE);
}else{
viewBinding.layoutShijiechat.setVisibility(View.GONE);
}
conversationViewTop.getAdatper().setShowAll(false);
conversationViewBottom.getAdatper().setShowAll(false);
}
emptyView = viewBinding.emptyLayout;
if (conversationType == 2) {
viewBinding.layoutMyjoin.setVisibility(View.VISIBLE);
}
viewBinding.tvMyteamspull.setOnClickListener(view -> {
@@ -934,7 +942,8 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
if (conversationBean.infoData.getSessionType() == SessionTypeEnum.P2P && servicesIds.indexOf(conversationBean.infoData.getContactId()) >= 0) {
conversationBean.isServices = true;
}
if (conversationBean.infoData.getSessionType() == SessionTypeEnum.Team || conversationBean.infoData.getSessionType() == SessionTypeEnum.SUPER_TEAM) {
if (conversationBean.infoData.getSessionType() == SessionTypeEnum.Team
|| conversationBean.infoData.getSessionType() == SessionTypeEnum.SUPER_TEAM) {
if (groupIds.contains(conversationBean.infoData.getContactId())) {
conversationBean.isShiJie = true;
conversationBean.infoData.setStickTop(true);
@@ -999,7 +1008,12 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
viewBinding.layoutOneroot.setVisibility(View.GONE);
viewBinding.layoutShijiechat.setVisibility(View.GONE);
} else {
if(ApiService.AREA_CODE.equals("+86")) {
viewBinding.layoutShijiechat.setVisibility(View.VISIBLE);
}else{
viewBinding.layoutShijiechat.setVisibility(View.GONE);
}
emptyView.setVisibility(View.GONE);
viewBinding.layoutOneroot.setVisibility(View.VISIBLE);
}

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.databinding.FragmentChatgroupBinding;
import com.hbl.lewan.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;

24
app/src/main/java/com/dskj/rbchat/main/chat/ChatMain2Fragment.java → app/src/main/java/com/hbl/lewan/main/chat/ChatMain2Fragment.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentChatBinding;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.main.FragmentAdapter;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.index.add.AddFriendsActivity;
import com.dskj.rbchat.event.ConversationEditEvent;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
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.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.friend.model.MuteListChangedNotify;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

14
app/src/main/java/com/dskj/rbchat/main/chat/ChatMainFragment.java → app/src/main/java/com/hbl/lewan/main/chat/ChatMainFragment.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentChatBinding;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.main.FragmentAdapter;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.utils.LogUtils;
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.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;

38
app/src/main/java/com/dskj/rbchat/main/chat/ChatTabFragment.java → app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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;
@@ -18,24 +18,24 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.viewpager2.widget.ViewPager2;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentChatBinding;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.main.FragmentAdapter;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.index.add.AddFriendsActivity;
import com.dskj.rbchat.event.ConversationEditEvent;
import com.dskj.rbchat.main.message.NotifyMessageActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.NotifyCountBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.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.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.RequestCallback;

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

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

56
app/src/main/java/com/dskj/rbchat/main/chat/ContactFragment.java → app/src/main/java/com/hbl/lewan/main/chat/ContactFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentIndex2Binding;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.imkit.verify.FunVerifyListActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.index.AiChatActivity;
import com.dskj.rbchat.main.index.adapter.IndexContactAdapter;
import com.dskj.rbchat.main.index.add.AddFriendsActivity;
import com.dskj.rbchat.main.mine.setting.SettingNewActivity;
import com.dskj.rbchat.model.AiChatUpdateEvent;
import com.dskj.rbchat.model.AiMessageBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.TeamUpdateEvent;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.FileUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.MsgService;
@@ -466,7 +466,7 @@ public class ContactFragment extends BaseFragment {
binding.layoutIndexfmAichat.setOnClickListener(view -> {
//launcher
// launcher.launch(new Intent(getActivity(), AiChatActivity.class));
startActivity(new Intent(getActivity(), AiChatActivity.class));
// startActivity(new Intent(getActivity(), AiChatActivity.class));
});
binding.tvIndexfmTbgzpull.setOnClickListener(v -> {

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityEditChatrecordBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.event.ConversationEditEvent;
import com.dskj.rbchat.login.PhoneLoginActivity;
import com.dskj.rbchat.model.NotifyCountBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentFollowlistBinding;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentChatBinding;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.chat;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentChatBinding;
import com.dskj.rbchat.databinding.FragmentTeamconversationBinding;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.utils.AdaptScreenUtils;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.yunxin.kit.alog.ALog;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.home;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityCustomServicesBinding;
import com.dskj.rbchat.model.StaffServiceIdBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

154
app/src/main/java/com/dskj/rbchat/main/home/HomeFragment.java → app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.home;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentHomeNewBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.game.JsBridgeActivity;
import com.dskj.rbchat.imkit.verify.FunVerifyListActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.index.AiChatActivity;
import com.dskj.rbchat.main.message.NotifyMessageActivity;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.AdBean;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.MessageBean;
import com.dskj.rbchat.model.NotifyCountBean;
import com.dskj.rbchat.model.StaffServiceIdBean;
import com.dskj.rbchat.model.UserRankBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.ImageLoader;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.GiftInfoActivity;
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
import com.dskj.rbchat.wallet.TopUpActivity;
import com.dskj.rbchat.wallet.WalletInfoActivity;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.Observer;
import com.netease.nimlib.sdk.friend.model.AddFriendNotify;
@@ -72,7 +72,7 @@ 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.youth.banner.BannerConfig;
//import com.youth.banner.BannerConfig;
import java.util.ArrayList;
import java.util.List;
@@ -183,7 +183,7 @@ public class HomeFragment extends BaseFragment {
binding.layoutIndexfmAichat.setOnClickListener(view -> {
//launcher
startActivity(new Intent(getActivity(), AiChatActivity.class));
// startActivity(new Intent(getActivity(), AiChatActivity.class));
});
binding.userLayout.setOnClickListener(v -> startUserInfoActivity(IMKitClient.account()));
@@ -198,21 +198,21 @@ public class HomeFragment extends BaseFragment {
adList();
initObserver();
binding.recordLottieView.setOnClickListener(v -> {
if (binding.robitRy.getVisibility() == View.GONE) {
binding.robitRy.setBackgroundResource(R.mipmap.robit_bg1);
animateIn();
} else {
binding.robitRy.setBackgroundResource(R.mipmap.robit_bg1);
animateOut();
}
});
binding.robitRy.setOnClickListener(v -> {
});
AnimationDrawable mLoadingAnimationDrawable = (AnimationDrawable) binding.recordLottieView.getDrawable();
//直接就开始执行，性能不是最佳的。
mLoadingAnimationDrawable.start();
// binding.recordLottieView.setOnClickListener(v -> {
// if (binding.robitRy.getVisibility() == View.GONE) {
// binding.robitRy.setBackgroundResource(R.mipmap.robit_bg1);
// animateIn();
// } else {
// binding.robitRy.setBackgroundResource(R.mipmap.robit_bg1);
// animateOut();
// }
// });
// binding.robitRy.setOnClickListener(v -> {
//
// });
// AnimationDrawable mLoadingAnimationDrawable = (AnimationDrawable) binding.recordLottieView.getDrawable();
// //直接就开始执行，性能不是最佳的。
// mLoadingAnimationDrawable.start();
}
@@ -275,25 +275,25 @@ public class HomeFragment extends BaseFragment {
private void initBanner() {
binding.banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR);
//设置图片加载器，图片加载器在下方
binding.banner.setImageLoader(new MyLoader());
//设置图片网址或地址的集合
binding.banner.setImages(list_path1);
//设置轮播的动画效果，内含多种特效，可点入方法内查找后内逐一体验
binding.banner.setBannerAnimation(com.youth.banner.Transformer.Default);
//设置轮播图的标题集合
binding.banner.setBannerTitles(list_title1);
//设置轮播间隔时间
binding.banner.setDelayTime(3000);
//设置是否为自动轮播，默认是“是”。
binding.banner.isAutoPlay(true);
//设置指示器的位置，小点点，左中右。
binding.banner.setIndicatorGravity(BannerConfig.CENTER)
//以上内容都可写成链式布局，这是轮播图的监听。比较重要。方法在下面。
.setOnBannerListener(position1 -> toAdClick(binding.banner.getContext(), list_path1.get(position1)))
//必须最后调用的方法，启动轮播图。
.start();
// binding.banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR);
// //设置图片加载器，图片加载器在下方
// binding.banner.setImageLoader(new MyLoader());
// //设置图片网址或地址的集合
// binding.banner.setImages(list_path1);
// //设置轮播的动画效果，内含多种特效，可点入方法内查找后内逐一体验
// binding.banner.setBannerAnimation(com.youth.banner.Transformer.Default);
// //设置轮播图的标题集合
// binding.banner.setBannerTitles(list_title1);
// //设置轮播间隔时间
// binding.banner.setDelayTime(3000);
// //设置是否为自动轮播，默认是“是”。
// binding.banner.isAutoPlay(true);
// //设置指示器的位置，小点点，左中右。
// binding.banner.setIndicatorGravity(BannerConfig.CENTER)
// //以上内容都可写成链式布局，这是轮播图的监听。比较重要。方法在下面。
// .setOnBannerListener(position1 -> toAdClick(binding.banner.getContext(), list_path1.get(position1)))
// //必须最后调用的方法，启动轮播图。
// .start();
}
private void toAdClick(Context context, AdBean s) {
@@ -301,14 +301,14 @@ public class HomeFragment extends BaseFragment {
activity.toGame(s.getJumpUrl());
}
//自定义的图片加载器
private class MyLoader extends com.youth.banner.loader.ImageLoader {
@Override
public void displayImage(Context context, Object path, ImageView imageView) {
ImageLoader.loadCenterCropBanner(getActivity(), (AdBean) path, imageView, R.mipmap.ad2, R.mipmap.ad2);
}
}
// //自定义的图片加载器
// private class MyLoader extends com.youth.banner.loader.ImageLoader {
// @Override
// public void displayImage(Context context, Object path, ImageView imageView) {
// ImageLoader.loadCenterCropBanner(getActivity(), (AdBean) path, imageView, R.mipmap.ad2, R.mipmap.ad2);
//
// }
// }
public void startUserInfoActivity(String userid) {
XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)

390
app/src/main/java/com/hbl/lewan/main/index/AiChatActivity.java Normal file
View File

@@ -0,0 +1,390 @@
//package com.hbl.lewan.main.index;
//
//import static android.widget.RelativeLayout.ALIGN_PARENT_END;
//import static android.widget.RelativeLayout.ALIGN_PARENT_START;
//
//import android.content.Context;
//import android.content.Intent;
//import android.content.SharedPreferences;
//import android.os.Bundle;
//import android.text.TextUtils;
//import android.util.JsonWriter;
//import android.util.Log;
//import android.view.View;
//import android.view.ViewGroup;
//import android.view.inputmethod.EditorInfo;
//import android.widget.RelativeLayout;
//import android.widget.TextView;
//
//import androidx.annotation.Nullable;
//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.google.android.gms.common.util.JsonUtils;
//import com.google.android.gms.common.util.SharedPreferencesUtils;
//import com.google.gson.JsonParser;
//import com.iflytek.sparkchain.core.LLM;
//import com.iflytek.sparkchain.core.LLMCallbacks;
//import com.iflytek.sparkchain.core.LLMError;
//import com.iflytek.sparkchain.core.LLMEvent;
//import com.iflytek.sparkchain.core.LLMResult;
//import com.netease.nimlib.sdk.NIMClient;
//import com.netease.nimlib.sdk.msg.MsgService;
//import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
//import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
//import com.netease.yunxin.kit.common.ui.utils.ToastX;
//
//import org.json.JSONArray;
//import org.json.JSONException;
//import org.json.JSONObject;
//import org.w3c.dom.Document;
//import org.w3c.dom.Element;
//import org.w3c.dom.Node;
//import org.w3c.dom.NodeList;
//
//import java.io.BufferedReader;
//import java.io.BufferedWriter;
//import java.io.File;
//import java.io.FileNotFoundException;
//import java.io.FileOutputStream;
//import java.io.FileReader;
//import java.io.FileWriter;
//import java.io.IOException;
//import java.util.ArrayList;
//import java.util.List;
//import java.util.Map;
//
//import javax.xml.parsers.DocumentBuilder;
//import javax.xml.parsers.DocumentBuilderFactory;
//import javax.xml.transform.OutputKeys;
//import javax.xml.transform.Transformer;
//import javax.xml.transform.TransformerFactory;
//import javax.xml.transform.dom.DOMSource;
//import javax.xml.transform.stream.StreamResult;
//
//import io.reactivex.android.schedulers.AndroidSchedulers;
//import io.reactivex.schedulers.Schedulers;
//
//public class AiChatActivity extends LllChatBaseActivity {
//
// ActivityAichatBinding binding;
// public LLM llm;
// public CommonAdapter commonAdapter;
// private StringBuilder stringBuilderContent = new StringBuilder();
// private ArrayList<AiMessageBean> chatMessageBeans = new ArrayList<>();
// private boolean isAichat = false;
//
//
// @Override
// protected void onCreate(@Nullable Bundle savedInstanceState) {
// super.onCreate(savedInstanceState);
// binding = ActivityAichatBinding.inflate(getLayoutInflater());
// setContentView(binding.getRoot());
// llm = IMApplication.getInstance().llm;
// if (llm != null) {
// llm.registerLLMCallbacks(new LLMCallbacks() {
// @Override
// public void onLLMResult(LLMResult llmResult, Object o) {
// stringBuilderContent.append(llmResult.getContent());
// int status = llmResult.getStatus(); //status 为2
// if (status == 2) {
// AiChatEnd();
// }
//
// }
//
// @Override
// public void onLLMEvent(LLMEvent llmEvent, Object o) {
//
// }
//
// @Override
// public void onLLMError(LLMError llmError, Object o) {
//
// }
// });
// }
//
// initView();
// }
//
// @Override
// public int initNavigationBarColor() {
// return 0;
// }
//
// @Override
// public int initStatusBarColor() {
// return 0;
// }
//
// public void AiChatEnd() {
// //結束了對話
//// dismissLoading();
// if (!TextUtils.isEmpty(stringBuilderContent.toString())) {
// runOnUiThread(() -> {
//// AiMessageBean bean = new AiMessageBean(replaceContent(stringBuilderContent.toString()), true);
// int size = commonAdapter.getDates().size();
// AiMessageBean bean = (AiMessageBean) commonAdapter.getDates().get(size - 1);
// if (!bean.isAi()) {
// String value = replaceContent(stringBuilderContent.toString());
// convertContent(value, new CallbackListener() {
// @Override
// public void setResult(String value) {
// AiMessageBean bean = new AiMessageBean(value, true);
// commonAdapter.addItems(commonAdapter.getDates().size(), bean);
// }
// });
// } else {
// String value = replaceContent(replaceContent(stringBuilderContent.toString()));
// AiMessageBean finalBean = bean;
// convertContent(value, new CallbackListener() {
// @Override
// public void setResult(String value) {
// finalBean.setMessage(value);
// commonAdapter.notifyDataSetChanged();
// FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
// stringBuilderContent.delete(0, stringBuilderContent.toString().length());
// scrollbottom();
// binding.editInputchat.setFocusable(true);
// binding.editInputchat.setFocusableInTouchMode(true);
// isAichat = false;
// }
// });
//
// }
//
// });
// }
// }
//
// public void scrollbottom() {
// int count = commonAdapter.getItemCount();
// binding.recyclerChat.post(() -> binding.recyclerChat.scrollToPosition(count > 0 ? count - 1 : 0));
// }
//
// public String replaceContent(String content) {
// if (content.contains("您好，我是科大讯飞研发的认知智能大模型，我的名字叫讯飞星火认知大模型。我可以和人类进行自然交流，解答问题，高效完成各领域认知智能需求。")) {
// content = getString(R.string.aiintroduct_zh_txt);
// return content;
// }
// if (content.contains("Hello, I am iFLYTEK Spark developed by iFLYTEK, and myHello, I am iFLYTEK Spark developed by iFLYTEK, and my name is iFLYTEK Spark. I can communicate with human beings naturally, answer questions, and efficiently complete the needs of cognitive intelligence in various fields.")) {
// content = getString(R.string.aiintroduct_en_txt);
// return content;
// }
// content = content.replace("科大讯飞", "小夢");
// content = content.replace("讯飞", "小夢");
// content = content.replace("讯飞", "小夢");
// content = content.replace("科大", "小夢");
// content = content.replace("iFLYTEK Spark", "XiaoMeng");
//
// return content;
// }
//
//
// private void initView() {
// binding.titlebarAichat.setActionTextColor(getResources().getColor(R.color.color_themeblue));
// binding.titlebarAichat.setActionText(getString(R.string.aihistory_clean));
// binding.titlebarAichat.setActionListener(view -> {
// if (!isAichat) {
// ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(this, getString(R.string.aihistory_title), true);
// actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
// @Override
// public void toSumbit() {
// commonAdapter.getDates().clear();
// chatMessageBeans.clear();
// FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
// commonAdapter.notifyDataSetChanged();
// }
//
// @Override
// public void toCancel() {
//
//
// }
// });
// actionConfirmDialog.show();
// }
//
// });
// binding.titlebarAichat.setOnBackIconClickListener(view -> onBackPressed());
// binding.titlebarAichat.setTitle(getString(R.string.ainame_txt));
// binding.editInputchat.setOnEditorActionListener(
// (v, actionId, event) -> {
// if (actionId == EditorInfo.IME_ACTION_SEND) {
// sendText();
// }
// return true;
// });
// binding.recyclerChat.setLayoutManager(new LinearLayoutManager(this));
// commonAdapter = new CommonAdapter<AiMessageBean>(this, R.layout.item_chatai, chatMessageBeans) {
//
// private TextView tvContent;
//
// @Override
// public void convert(ViewHolder holder, AiMessageBean s, int index) {
// tvContent = holder.getView(R.id.tv_chatcontent);
// tvContent.setText(s.message);
// RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
// if (s.isAi) {
// params.addRule(ALIGN_PARENT_START);
// params.setMargins(20, 20, 100, 20);
// tvContent.setBackgroundResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.fun_message_receive_bg);
// tvContent.setTextColor(mContext.getResources().getColor(R.color.color_333333));
// } else {
// params.addRule(ALIGN_PARENT_END);
// params.setMargins(100, 20, 20, 20);
// tvContent.setBackgroundResource(com.netease.yunxin.kit.chatkit.ui.R.drawable.fun_message_send_bg);
// tvContent.setTextColor(mContext.getResources().getColor(android.R.color.black));
// }
// tvContent.setLayoutParams(params);
//
// }
// };
//
// String value = FileUtils.getChatData(AiChatActivity.this);
// if (!TextUtils.isEmpty(value)) {
// List<AiMessageBean> aiMessageBean = GsonUtils.getListFromJSON(value, AiMessageBean.class);
// LogUtils.i("aimessagebean-" + aiMessageBean.size());
// if (aiMessageBean.size() == 0) {
// sendHello();
// }
// chatMessageBeans.addAll(aiMessageBean);
// } else {
// sendHello();
// }
// binding.recyclerChat.setAdapter(commonAdapter);
// scrollbottom();
// }
//
// public void sendHello() {
// AiMessageBean bean = new AiMessageBean(getString(R.string.aihint_txt), true);
// commonAdapter.addItems(commonAdapter.getDates().size(), bean);
// FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
// }
//
// public void sendText() {
// String value = binding.editInputchat.getText().toString();
// if (!TextUtils.isEmpty(value)) {
// startChat(value);
// binding.editInputchat.setFocusable(false);
// binding.editInputchat.setFocusableInTouchMode(false);
// } else {
// isAichat = false;
// ToastX.showShortToast("请输入聊天内容");
// }
//
// }
//
// private void startChat(String content) {
// if (llm == null) {
// // Log.e(TAG, "startChat failed,please setLLMConfig before!");
// return;
// }
// isAichat = true;
// String usrInputText = content;
// //Log.d(TAG, "用户输入：" + usrInputText);
//// if (usrInputText.length() >= 1)
//// binding.editInputchat.append("\n输入:\n " + usrInputText + "\n");
// AiMessageBean bean = new AiMessageBean(content, false);
// commonAdapter.addItems(commonAdapter.getDates().size(), bean);
// FileUtils.writeData(AiChatActivity.this, chatMessageBeans);
// AiMessageBean bean2 = new AiMessageBean(getString(R.string.aianswer_txt), true);
// commonAdapter.addItems(commonAdapter.getDates().size(), bean2);
// scrollbottom();
// KeyboardUtil.hideSoftInput(this);
// String myContext = "myContext";
// binding.editInputchat.setText("");
//
//// showLoading();
// int ret = llm.arun(usrInputText, myContext);
// if (ret != 0) {
// dismissLoading();
// //Log.e(TAG, "SparkChain failed:\n" + ret);
// return;
// }
// }
//
//
// private void convertContent(String content, CallbackListener callbackListener) {
// Api.getInstance().convertzh(1, content, "nxmfxsiggkcw1pbl", "p7UncBBNfLmq1aoajsHB2qnfiznmiMHs")
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<>() {
// @Override
// public void onSuccess(Result<AiConvertBean> o) {
// if (o.code == 1 && o.data != null) {
// try {
// String result = o.data.getConvertContent();
// callbackListener.setResult(result);
// } catch (Exception e) {
// callbackListener.setResult(content);
// }
//
// } else {
// callbackListener.setResult(content);
// }
// }
//
// @Override
// public void onError(int code, String msg) {
// callbackListener.setResult(content);
// }
// });
// }
//
// public interface CallbackListener {
// void setResult(String value);
// }
//// private void writeData() {
//// try {
////// if (chatMessageBeans.size() > 100) { //只存100条
////// chatMessageBeans.remove(0);
////// }
//// File file = new File(getFilesDir(), chatFileName);
//// String jsonString = GsonUtils.beanToJSONString(chatMessageBeans);
//// FileWriter fileWriter = new FileWriter(file, false);
//// BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
//// bufferedWriter.write(jsonString);
//// bufferedWriter.close();
//// } catch (IOException e) {
//// LogUtils.i(e.getMessage());
//// }
////
//// }
//
//
//// @Override
//// public void onBackPressed() {
//// Intent intent = new Intent();
//// intent.putExtra("update", isUpdate);
//// setResult(RESULT_OK, intent);
//// finish();
////// super.onBackPressed();
//// }
//
//
//}
//
//
//
//
//

60
app/src/main/java/com/dskj/rbchat/main/index/Index2Fragment.java → app/src/main/java/com/hbl/lewan/main/index/Index2Fragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.index;
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;
@@ -27,34 +27,34 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentIndex2Binding;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.imkit.verify.FunVerifyListActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.index.adapter.IndexContactAdapter;
import com.dskj.rbchat.main.index.add.AddFriendsActivity;
import com.dskj.rbchat.main.mine.setting.SettingNewActivity;
import com.dskj.rbchat.model.AiChatUpdateEvent;
import com.dskj.rbchat.model.AiMessageBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.TeamUpdateEvent;
import com.dskj.rbchat.model.UserUpdateEvent;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.NfcReaderActivity;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.FileUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
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;
@@ -480,7 +480,7 @@ public class Index2Fragment extends BaseFragment {
binding.layoutIndexfmAichat.setOnClickListener(view -> {
//launcher
// launcher.launch(new Intent(getActivity(), AiChatActivity.class));
startActivity(new Intent(getActivity(), AiChatActivity.class));
// startActivity(new Intent(getActivity(), AiChatActivity.class));
});
binding.tvIndexfmTbgzpull.setOnClickListener(v -> {

58
app/src/main/java/com/dskj/rbchat/main/index/Index2FragmentBf.java → app/src/main/java/com/hbl/lewan/main/index/Index2FragmentBf.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.index;
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;
@@ -25,33 +25,33 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentIndex2BfBinding;
import com.dskj.rbchat.databinding.FragmentIndex2Binding;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.imkit.verify.FunVerifyListActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.index.adapter.IndexContactAdapter;
import com.dskj.rbchat.main.index.add.AddFriendsActivity;
import com.dskj.rbchat.main.mine.setting.SettingNewActivity;
import com.dskj.rbchat.model.AiChatUpdateEvent;
import com.dskj.rbchat.model.AiMessageBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.TeamUpdateEvent;
import com.dskj.rbchat.model.UserUpdateEvent;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.FileUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
@@ -461,7 +461,7 @@ public class Index2FragmentBf extends BaseFragment {
binding.layoutIndexfmAichat.setOnClickListener(view -> {
//launcher
// launcher.launch(new Intent(getActivity(), AiChatActivity.class));
startActivity(new Intent(getActivity(), AiChatActivity.class));
// startActivity(new Intent(getActivity(), AiChatActivity.class));
});
binding.tvIndexfmTbgzpull.setOnClickListener(v -> {

44
app/src/main/java/com/dskj/rbchat/main/index/IndexFragment.java → app/src/main/java/com/hbl/lewan/main/index/IndexFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.index;
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;
@@ -24,26 +24,26 @@ import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentIndexBinding;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.imkit.verify.FunVerifyListActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.index.add.AddFriendsActivity;
import com.dskj.rbchat.main.mine.setting.SettingNewActivity;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.model.MuteListChangedNotify;
import com.netease.nimlib.sdk.msg.MsgService;
@@ -330,7 +330,7 @@ public class IndexFragment extends BaseFragment {
});
binding.layoutIndexfmAichat.setOnClickListener(view -> {
startActivity(new Intent(getActivity(), AiChatActivity.class));
// startActivity(new Intent(getActivity(), AiChatActivity.class));
});
binding.tvIndexfmTbgzpull.setOnClickListener(v -> {

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.index.adapter;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ItemContactlistBinding;
import com.dskj.rbchat.databinding.TeamMembersViewHolderBinding;
import com.dskj.rbchat.utils.DataUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.MsgService;

86
app/src/main/java/com/dskj/rbchat/main/index/add/AddFriendsActivity.java → app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.index.add;
package com.hbl.lewan.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;
@@ -37,44 +37,44 @@ import androidx.recyclerview.widget.RecyclerView;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityAddfriendsBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.game.JsBridgeActivity;
import com.dskj.rbchat.imkit.add.FunAddFriendActivity;
import com.dskj.rbchat.imkit.selector.FunContactSelectorActivity;
import com.dskj.rbchat.imkit.verify.FunVerifyListActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.authorize.AuthorizeActivity;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.main.mine.FriendPermissionsActivity;
import com.dskj.rbchat.main.mine.UserInfoActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.PaymentActivity;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.CommonUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.QRCodeScheme;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.ToolKits;
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
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.BottomSheetDialog;
import com.huawei.hms.hmsscankit.ScanUtilNew;
import com.huawei.hms.ml.scan.HmsScan;
@@ -471,7 +471,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
/**
* 解析2维码扫码结果并进入相应和业务逻辑处理（主要用于从2维码扫描界面扫描完成后的回调结果处理）。
*
* @param originalQrcodeStr 扫描出的原始2维码字符串，形如"time_go_chat://add_user/400069"
* @param originalQrcodeStr 扫描出的原始2维码字符串，形如"time_go_mm://add_user/400069"
*/
public void processQRCodeScanResult(Activity activity, String originalQrcodeStr) {
if (originalQrcodeStr != null) {
@@ -514,7 +514,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
startActivity(intent2);
} else {
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(originalQrcodeStr);
// 2维码内容前缀（形如“time_go_chat://add_user/”）
// 2维码内容前缀（形如“time_go_mm://add_user/”）
LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
String scheme = qrData.getScheme();
@@ -593,7 +593,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
default:
if (scheme.startsWith("http")) {
if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
Intent intentweb = new Intent(Intent.ACTION_VIEW);
@@ -612,7 +612,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
}
} else {
if (scheme.startsWith("http")) {
if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
// activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));

44
app/src/main/java/com/dskj/rbchat/main/message/NotifyActMessageActivity.java → app/src/main/java/com/hbl/lewan/main/message/NotifyActMessageActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.message;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityMessageActBinding;
import com.dskj.rbchat.databinding.ActivityMessageBinding;
import com.dskj.rbchat.model.ActivityMsgBean;
import com.dskj.rbchat.model.DongTaiActionBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.MessageBean;
import com.dskj.rbchat.model.SendOrderBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.TopUpActivity;
import com.dskj.rbchat.widget.CircleImageView;
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.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;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.message;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityMessageBinding;
import com.dskj.rbchat.imkit.verify.FunVerifyListActivity;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.CirPushMessage;
import com.dskj.rbchat.model.DongTaiActionBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.MessageBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.MessageActivity;
import com.dskj.rbchat.widget.CircleImageView;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.Observer;
import com.netease.nimlib.sdk.friend.model.AddFriendNotify;

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

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

74
app/src/main/java/com/dskj/rbchat/main/mine/AccountAndSecurityActivity.java → app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.main.mine;
import android.content.Intent;
import android.os.Bundle;
@@ -9,43 +9,43 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.login.ChongZhiActivity;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.BaseObserver1;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
import com.dskj.rbchat.wxapi.bean.WeiXin;
import com.dskj.rbchat.wxapi.bean.WeiXinInfo;
import com.dskj.rbchat.wxapi.bean.WeiXinToken;
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.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;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.tencent.mm.opensdk.modelmsg.SendAuth;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
//import com.tencent.mm.opensdk.modelmsg.SendAuth;
//import com.tencent.mm.opensdk.openapi.IWXAPI;
//import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.dskj.rbchat.databinding.ActivitySecurityBinding;
import com.hbl.lewan.databinding.ActivitySecurityBinding;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
public class AccountAndSecurityActivity extends BaseActivity {
BindBean bean;
private IWXAPI wxAPI;
// private IWXAPI wxAPI;
LoginBean loginBean;
private ActivitySecurityBinding viewBinding;
@@ -117,10 +117,10 @@ public class AccountAndSecurityActivity extends BaseActivity {
}
protected void initView() {
wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID, true);
wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
initListeners();
//
// wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID, true);
// wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
// initListeners();
}
@@ -210,15 +210,15 @@ public class AccountAndSecurityActivity extends BaseActivity {
});
viewBinding.bindWechatBt.setOnClickListener(v -> {
if (bean != null && bean.getWechatBind() == false) {
SendAuth.Req req = new SendAuth.Req();
req.scope = "snsapi_userinfo";
req.state = String.valueOf(System.currentTimeMillis());
wxAPI.sendReq(req);
} else {
ToastX.showShortToast(R.string.yibind_wechat_txt);
}
// if (bean != null && bean.getWechatBind() == false) {
// SendAuth.Req req = new SendAuth.Req();
// req.scope = "snsapi_userinfo";
// req.state = String.valueOf(System.currentTimeMillis());
// wxAPI.sendReq(req);
// } else {
// ToastX.showShortToast(R.string.yibind_wechat_txt);
//
// }
});
viewBinding.accoutBt.setOnClickListener(v -> {
startActivityForResult(new Intent(AccountAndSecurityActivity.this, SettingAccoutIdActivity.class), 888);

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.custom.PasswordEditText;
import com.dskj.rbchat.databinding.ActivityChangeAccoutActionBinding;
import com.dskj.rbchat.databinding.ActivitySetAccoutIdBinding;
import com.dskj.rbchat.dialog.SelectCountryDialog;
import com.dskj.rbchat.login.LoginActivity;
import com.dskj.rbchat.login.RegisterActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ToolKits;
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.dskj.rbchat.welcome.WelcomeActivity;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.databinding.ActivityActivityChangeBinding;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

48
app/src/main/java/com/dskj/rbchat/main/mine/ChangePhoneActivity.java → app/src/main/java/com/hbl/lewan/main/mine/ChangePhoneActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.main.mine;
import android.app.Activity;
import android.content.Intent;
@@ -20,29 +20,29 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.custom.PasswordEditText;
import com.dskj.rbchat.databinding.ActivityChangeAccoutActionBinding;
import com.dskj.rbchat.databinding.ActivityChangePhoneBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.ActionConfirmDialog1;
import com.dskj.rbchat.dialog.SelectCountryDialog;
import com.dskj.rbchat.login.LoginActivity;
import com.dskj.rbchat.login.PhoneLoginActivity;
import com.dskj.rbchat.login.WangjiActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.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;

40
app/src/main/java/com/dskj/rbchat/main/mine/CloseAccountActivity.java → app/src/main/java/com/hbl/lewan/main/mine/CloseAccountActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.main.mine;
import android.app.Activity;
@@ -22,25 +22,25 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityChongzhiBinding;
import com.dskj.rbchat.databinding.ActivityCloseAccountBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.ActionConfirmDialog1;
import com.dskj.rbchat.login.LoginActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityEditFriendnicknameBinding;
import com.dskj.rbchat.databinding.ActivityEditNicknameBinding;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.FriendService;
import com.netease.nimlib.sdk.friend.constant.FriendFieldEnum;

18
app/src/main/java/com/dskj/rbchat/main/mine/EditUserInfoActivity.java → app/src/main/java/com/hbl/lewan/main/mine/EditUserInfoActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityEditNicknameBinding;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.Constant;
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.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;

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

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

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.BuildConfig;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.BuildConfig;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityHelpBinding;
import com.dskj.rbchat.databinding.ActivityMineSettingBinding;
import com.dskj.rbchat.main.mine.setting.SettingViewModel;
import com.dskj.rbchat.model.QuesBean;
import com.dskj.rbchat.model.QuesListBean;
import com.dskj.rbchat.model.StaffServiceIdBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.GsonUtils;
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.dskj.rbchat.widget.CircleImageView;
import com.hbl.lewan.widget.CircleImageView;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.hbl.lewan.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityGelpBinding;
import com.dskj.rbchat.databinding.ActivityHelpBinding;
import com.dskj.rbchat.model.QuesBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.GsonUtils;
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.netease.yunxin.kit.common.ui.activities.BaseActivity;
import java.util.ArrayList;

74
app/src/main/java/com/dskj/rbchat/main/mine/MineFragment.java → app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.main.mine;
import android.app.Activity;
import android.content.Intent;
@@ -25,38 +25,38 @@ import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.app.ActivityOptionsCompat;
import com.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.about.AboutActivity;
import com.dskj.rbchat.databinding.FragmentMineBinding;
import com.dskj.rbchat.databinding.FragmentMineNewBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.VersionDialog;
import com.dskj.rbchat.game.JsBridgeActivity;
import com.dskj.rbchat.login.PhoneLoginActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.mine.photo.UserPhotoListActivity;
import com.dskj.rbchat.main.mine.setting.SettingActivity;
import com.dskj.rbchat.main.mine.setting.SettingNotifyActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.VersionBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.GiftInfoActivity;
import com.dskj.rbchat.wallet.PaySettingActivity;
import com.dskj.rbchat.wallet.WalletInfoActivity;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.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.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.PaySettingActivity;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.hbl.lewan.welcome.WelcomeActivity;
//import com.king.app.updater.AppUpdater;
import com.king.app.updater.AppUpdater;
import com.netease.yunxin.kit.alog.ALog;
@@ -78,7 +78,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.dskj.rbchat.dialog.SelectLanguageDialog;
import com.hbl.lewan.dialog.SelectLanguageDialog;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -322,7 +322,7 @@ public class MineFragment extends BaseFragment {
private void getVersion() {
try {
Api.getInstance().version(7, DataUtils.getVersionCode(getActivity()), IMUIKitConfig.SUBSTATIONID)
Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(getActivity()), IMUIKitConfig.SUBSTATIONID)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@@ -378,7 +378,9 @@ public class MineFragment extends BaseFragment {
private void checkUpdate(String url) {
new AppUpdater(getActivity(), url).start();
// Intent intent = new Intent(Intent.ACTION_VIEW);
// intent.setData(Uri.parse(url));
// startActivity(intent);
}

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

@@ -2,7 +2,7 @@
//// Use of this source code is governed by a MIT license that can be
//// found in the LICENSE file.
//
//package com.dskj.rbchat.main.mine;
//package com.hbl.lewan.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.dskj.rbchat.AppSkinConfig;
//import com.dskj.rbchat.R;
//import com.dskj.rbchat.about.AboutActivity;
//import com.dskj.rbchat.databinding.FragmentMineBinding;
//import com.dskj.rbchat.main.mine.setting.SettingActivity;
//import com.dskj.rbchat.utils.Constant;
//import com.dskj.rbchat.utils.LogUtils;
//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.netease.yunxin.kit.alog.ALog;
//import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
//import com.netease.yunxin.kit.common.ui.utils.AvatarColor;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityMineInfoBinding;
import com.dskj.rbchat.utils.Constant;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityMineInfoBinding;
import com.hbl.lewan.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;

24
app/src/main/java/com/dskj/rbchat/main/mine/SettingAccoutIdActivity.java → app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.databinding.ActivityHeadUserEditBinding;
import com.dskj.rbchat.databinding.ActivitySetAccoutIdBinding;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.TypeSelectActivityBinding;
import com.dskj.rbchat.utils.Constant;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.TypeSelectActivityBinding;
import com.hbl.lewan.utils.Constant;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.utils.SizeUtils;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.databinding.ActivityUnbindPhoneBinding;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
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.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;

379
app/src/main/java/com/dskj/rbchat/main/mine/UserHeadEditActivity.java → app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java
View File

@@ -2,9 +2,8 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.main.mine;
import static com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant.LIB_TAG;
import static com.netease.yunxin.kit.chatkit.ui.common.ChatUserCache.getUserInfo;
import android.Manifest;
@@ -12,23 +11,16 @@ import android.content.ClipData;
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;
import android.os.Handler;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.result.ActivityResultLauncher;
@@ -37,42 +29,30 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityHeadUserEditBinding;
import com.dskj.rbchat.databinding.ActivityLocUserInfoBinding;
import com.dskj.rbchat.login.LoginActivity;
import com.dskj.rbchat.login.RegisterActivity;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.model.UserUpdateEvent;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ToolKits;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.king.zxing.util.CodeUtils;
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.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
@@ -81,51 +61,48 @@ 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.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.nimlib.sdk.uinfo.constant.GenderEnum;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.repo.ChatRepo;
import com.netease.yunxin.kit.chatkit.ui.common.GlideEngine;
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.datepicker.CustomDatePicker;
import com.netease.yunxin.kit.common.ui.widgets.datepicker.DateFormatUtils;
import com.netease.yunxin.kit.common.utils.NetworkUtils;
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;
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.repo.CommonRepo;
import com.netease.yunxin.kit.teamkit.ui.fun.dialog.FunPhotoChoiceDialog;
import com.qiniu.android.common.FixedZone;
import com.qiniu.android.common.Zone;
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.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
public class UserHeadEditActivity extends BaseActivity implements CommonCallback<File> {
private ActivityHeadUserEditBinding binding;
@@ -148,12 +125,13 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
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);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
loginBean = DataUtils.getLocUserInfo();
initView();
// if(!getIntent().getBooleanExtra("start",false)) {
loadData(IMKitClient.account());
if (loginBean != null) {
if (!TextUtils.isEmpty(loginBean.getUser().getPostHomepageBackground())) {
@@ -164,12 +142,12 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
.into(binding.forbgIv);
}
}
// }
initClip();
}
private void initClip() {
try {
@@ -183,8 +161,8 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
ClipData.Item item = clipData.getItemAt(i);
if (item != null) {
String text = item.getText().toString();
if (text.startsWith("http")&&text.endsWith(".gif")) {
toPush(text,true);
if (text.startsWith("http") && text.endsWith(".gif")) {
toPush(text, true);
}
}
}
@@ -202,8 +180,6 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
}
@RequiresApi(api = Build.VERSION_CODES.M)
private void initView() {
@@ -264,18 +240,20 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
}
StsCredentialsBean stsCredentialsBean;
String stsCredentialsBean;
private void toShangchuanAli(File file, boolean isHead) {
showLoadingDialog();
Api.getInstance().stsCredentials()
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
public void onSuccess(Result<String> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
toAliYunOss(file, isHead);
// toAliYunOss(file, isHead);
toQIiNiuYunOss(file, isHead);
}
@Override
@@ -309,83 +287,196 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
}
private void toAliYunOss(File file, boolean isHead) {
String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
String accessKeyId = stsCredentialsBean.getAccessKeyId();
String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
String securityToken = stsCredentialsBean.getSecurityToken();
String bucketName = IMUIKitConfig.bucketName;
// private void toAliYunOss(File file, boolean isHead) {
// String endpoint = "https://oss-cn-hongkong.aliyuncs.com";
//// String accessKeyId = stsCredentialsBean.getAccessKeyId();
//// String accessKeySecret = stsCredentialsBean.getAccessKeySecret();
//// String securityToken = stsCredentialsBean.getSecurityToken();
//
// String accessKeyId = "";
// String accessKeySecret = "";
// String securityToken = "";
// String bucketName = IMUIKitConfig.bucketName;
//
// OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
// OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
// toUpdateOss(bucketName, 0, oss, file, isHead);
//
// }
OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
toUpdateOss(bucketName, 0, oss, file, isHead);
private void toQIiNiuYunOss(File file, boolean isHead) {
String updatePathPic = "postHomepageBackground";
String updatePathPicHead = "userAvatarFileName";
// new Handler().post(() -> QiNiuTool.upload(convertFileToBytes(file)));
UploadOptions options = new UploadOptions(null, null, true,
(key, percent) -> {
LogUtils.i("结果是啥进度：" + percent);
}, () -> {
LogUtils.i("结果是啥进度112222222111：");
return false;
});
// Zone zone = FixedZone.zoneAs0;
Configuration configuration = new Configuration.Builder()
// .connectTimeout(10) // 链接超时。默认10秒
// .responseTimeout(60) // 服务器响应超时。默认60秒
// .zone(zone) // 设置区域，不指定会自动选择。指定不同区域的上传域名、备用域名、备用IP。
.build();
UploadManager uploadManager = new UploadManager(configuration);
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean + ";;" + file.getAbsolutePath());
// Uri uri = FileUtils.getMediaUriFromPath(file.getAbsolutePath(),UserHeadEditActivity.this);
// GPX2hnRdNpAvovOSZGrhMxtaa6JP2mPvJ96-tdmD
// immchat
String files = "media/" + updatePathPic + "/" + fileName;
if (isHead) {
files = "media/" + updatePathPicHead + "/" + fileName;
}
byte[] sss = convertFileToBytes(file);
LogUtils.i("结果是啥开始：" + sss);
uploadManager.put(sss, files, stsCredentialsBean, (key, info, response) -> {
// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info));
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
dimessLoadingDialog();
if (info != null && info.isOK()) {
// 上传成功
try {
if (isHead) {
LogUtils.i("地址是啥：" + response.getString("key"));
toPush("https://qn.hnsdl.com/" + response.getString("key"), isHead);
} else {
LogUtils.i("地址是啥：" + response.getString("key"));
toPush(response.getString("key"), isHead);
}
} catch (JSONException e) {
throw new RuntimeException(e);
}
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
}
}, options);
}
//
public static byte[] convertFileToBytes(File file) {
// 使用ByteArrayOutputStream来收集字节数据
FileInputStream fis = null;
try {
fis = new FileInputStream(file);
byte[] bytesArray = new byte[(int) file.length()];
fis.read(bytesArray);
fis.close();
return bytesArray;
} catch (FileNotFoundException e) {
// throw new RuntimeException(e);
return null;
} catch (IOException e) {
// throw new RuntimeException(e);
return null;
}
}
/**
* Unicode转 汉字字符串
*
* @param str \u6728
* @return '木' 26408
*/
public static String unicodeToString(String str) {
Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
Matcher matcher = pattern.matcher(str);
char ch;
while (matcher.find()) {
//group 6728
String group = matcher.group(2);
//ch:'木' 26408
ch = (char) Integer.parseInt(group, 16);
//group1 \u6728
String group1 = matcher.group(1);
str = str.replace(group1, ch + "");
}
return str;
}
public static Handler handler = new Handler();
//
private void toUpdateOss(String bucketName, int i, OSSClient oss, File file, boolean isHead) {
LogUtils.i("1111111111111111111");
String updatePathPic = "postHomepageBackground";
String updatePathPicHead = "userAvatarFileName";
LogUtils.i("22222222222222222");
String fileName = UUID.randomUUID().toString() + "_" + file.getName();
LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
LogUtils.i("文件地址是啥1：" + file.getPath());
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + fileName, file.getAbsolutePath());
if (isHead) {
put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
}
put.setProgressCallback((request, currentSize, totalSize) -> {
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
});
LogUtils.i("55555555555555");
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
@Override
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
LogUtils.i("PutObject", "UploadSuccess");
LogUtils.i("ETag", result.getETag());
LogUtils.i("RequestId", result.getRequestId());
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
handler.post(() -> {
if (isHead) {
toPush(IMUIKitConfig.OSS_URL + "media/" + updatePathPicHead + "/" + fileName, isHead);
} else {
LogUtils.i("地址是啥："+IMUIKitConfig.OSS_URL+"media/" + updatePathPic + "/" + fileName);
toPush("media/" + updatePathPic + "/" + fileName, isHead);
}
});
}
@Override
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
dimessLoadingDialog();
LogUtils.i("ErrorCode", clientExcepion.getMessage());
// 请求异常。
if (clientExcepion != null) {
// 本地异常，如网络异常等。
clientExcepion.printStackTrace();
}
if (serviceException != null) {
// 服务异常。
LogUtils.i("ErrorCode", serviceException.getErrorCode());
LogUtils.i("RequestId", serviceException.getRequestId());
LogUtils.i("HostId", serviceException.getHostId());
LogUtils.i("RawMessage", serviceException.getRawMessage());
}
}
});
// private void toUpdateOss(String bucketName, int i, OSSClient oss, File file, boolean isHead) {
// LogUtils.i("1111111111111111111");
// String updatePathPic = "postHomepageBackground";
// String updatePathPicHead = "userAvatarFileName";
//
// LogUtils.i("22222222222222222");
//
// String fileName = System.currentTimeMillis() + "_" + file.getName();
// LogUtils.i("文件地址是啥：" + file.getAbsolutePath());
// LogUtils.i("文件地址是啥1：" + file.getPath());
//
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + fileName, file.getAbsolutePath());
// if (isHead) {
// put = new PutObjectRequest(bucketName, "media/" + updatePathPicHead + "/" + fileName, file.getAbsolutePath());
// }
// put.setProgressCallback((request, currentSize, totalSize) -> {
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
//
// });
// LogUtils.i("55555555555555");
//
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
// @Override
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
// LogUtils.i("PutObject", "UploadSuccess");
// LogUtils.i("ETag", result.getETag());
// LogUtils.i("RequestId", result.getRequestId());
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
//
// handler.post(() -> {
// if (isHead) {
// toPush(IMUIKitConfig.OSS_URL + "media/" + updatePathPicHead + "/" + fileName, isHead);
// } else {
// LogUtils.i("地址是啥：" + IMUIKitConfig.OSS_URL + "media/" + updatePathPic + "/" + fileName);
// toPush("media/" + updatePathPic + "/" + fileName, isHead);
//
// }
// });
// }
//
// @Override
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
// dimessLoadingDialog();
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
//
// // 请求异常。
// if (clientExcepion != null) {
// // 本地异常，如网络异常等。
// clientExcepion.printStackTrace();
// }
// if (serviceException != null) {
// // 服务异常。
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
// LogUtils.i("RequestId", serviceException.getRequestId());
// LogUtils.i("HostId", serviceException.getHostId());
// LogUtils.i("RawMessage", serviceException.getRawMessage());
// }
// }
// });
//// }
// }
}
private void toPush(String fileName, boolean isHead) {
Map<String, Object> maps = new HashMap<>();
@@ -520,9 +611,9 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
}
private void startPickMedia(boolean isBg) {
if(!isBg){
if (!isBg) {
PhotoPicker.getInstance().getAPhotoFromAlbumCropAndUpload(UserHeadEditActivity.this, this);
}else{
} else {
TitleBarStyle whiteTitleBarStyle = new TitleBarStyle();
whiteTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(UserHeadEditActivity.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);
@@ -569,9 +660,9 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
public void onResult(ArrayList<LocalMedia> result) {
for (int i = 0; i < result.size(); ++i) {
// Uri uri = Uri.parse(result.get(i).getAvailablePath());
LogUtils.i("地址是啥："+result.get(i).getRealPath());
LogUtils.i("地址是啥：" + result.get(i).getRealPath());
File file = new File(result.get(i).getRealPath());
toUpdateBg(file,false);
toUpdateBg(file, false);
}
}

82
app/src/main/java/com/dskj/rbchat/main/mine/UserInfoActivity.java → app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine;
package com.hbl.lewan.main.mine;
import android.Manifest;
import android.app.Activity;
@@ -45,41 +45,41 @@ import com.bumptech.glide.Glide;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.custom.CustomDatePickerNew;
import com.dskj.rbchat.databinding.ActivityLocUserInfoBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.dialog.SelectSexDialog;
import com.dskj.rbchat.game.JsBridgeActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.authorize.AuthorizeActivity;
import com.dskj.rbchat.main.index.add.AddFriendsActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionActivity;
import com.dskj.rbchat.pay.PaymentActivity;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.CommonUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.QRCodeScheme;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.ToolKits;
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.huawei.hms.hmsscankit.ScanUtilNew;
import com.huawei.hms.ml.scan.HmsScan;
@@ -250,7 +250,7 @@ public class UserInfoActivity extends BaseActivity {
/**
* 解析2维码扫码结果并进入相应和业务逻辑处理（主要用于从2维码扫描界面扫描完成后的回调结果处理）。
*
* @param originalQrcodeStr 扫描出的原始2维码字符串，形如"time_go_chat://add_user/400069"
* @param originalQrcodeStr 扫描出的原始2维码字符串，形如"time_go_mm://add_user/400069"
*/
public void processQRCodeScanResult(Activity activity, String originalQrcodeStr) {
if (originalQrcodeStr != null) {
@@ -293,7 +293,7 @@ public class UserInfoActivity extends BaseActivity {
startActivity(intent2);
} else {
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(originalQrcodeStr);
// 2维码内容前缀（形如“time_go_chat://add_user/”）
// 2维码内容前缀（形如“time_go_mm://add_user/”）
LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
String scheme = qrData.getScheme();
@@ -379,7 +379,7 @@ public class UserInfoActivity extends BaseActivity {
// break;
default:
if (scheme.startsWith("http")) {
if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
// activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));
@@ -397,7 +397,7 @@ public class UserInfoActivity extends BaseActivity {
}
} else {
if (scheme.startsWith("http")) {
if (scheme.startsWith("https://admin.letschat2023.com/") && scheme.contains("deviceId")) {
if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) {
sendMachine(scheme);
} else {
// activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true));
@@ -1154,7 +1154,7 @@ public class UserInfoActivity extends BaseActivity {
int sexualValue = R.string.sexual_unknown;
if (userInfo.getGenderEnum() == GenderEnum.MALE) {
sexualValue = R.string.sexual_male;
} else if (userInfo.getGenderEnum() == GenderEnum.FEMALE) {
} else{
sexualValue = R.string.sexual_female;
}
// binding.tvAccount.setText(userInfo.getAccount());

254
app/src/main/java/com/dskj/rbchat/main/mine/photo/AddPhotoActivity.java → app/src/main/java/com/hbl/lewan/main/mine/photo/AddPhotoActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine.photo;
package com.hbl.lewan.main.mine.photo;
import android.Manifest;
import android.content.res.ColorStateList;
@@ -21,32 +21,32 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityAddphotosBinding;
import com.dskj.rbchat.dialog.SelectPhotoTypeDialog;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.ItemDragTouchHelperCallback;
import com.dskj.rbchat.utils.LogUtils;
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.google.gson.Gson;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
@@ -61,11 +61,19 @@ import com.netease.yunxin.kit.chatkit.ui.dialog.PermissionExplainDialog;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.utils.PermissionUtils;
import com.netease.yunxin.kit.common.utils.SizeUtils;
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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -165,6 +173,7 @@ public class AddPhotoActivity extends LllChatBaseActivity implements TextWatcher
}
StsCredentialsBean stsCredentialsBean;
String stsCredentialsBean1;
private void toShangchuanAli() {
showLoading();
@@ -172,14 +181,17 @@ public class AddPhotoActivity extends LllChatBaseActivity implements TextWatcher
toSubmit();
return;
}
Api.getInstance().stsCredentials()
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
toAliYunOss();
public void onSuccess(Result<String> feedbackResp) {
stsCredentialsBean1 = feedbackResp.data;
// toAliYunOss(file, isHead);
toUpdateOssNew(0);
}
@Override
@@ -189,76 +201,140 @@ public class AddPhotoActivity extends LllChatBaseActivity implements TextWatcher
});
}
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 toUpdateOss(String bucketName, int i, OSSClient oss) {
String picPath = "user_album";
String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
if (i < uris.size()) {
// File file = new File(uriStrings.get(i));
String fileName = System.currentTimeMillis() + "_" + localMedias.get(i).getFileName();
LogUtils.i("上传文件是啥:" + GsonUtils.beanToJSONString(localMedias.get(i)));
LogUtils.i("上传文件是啥:" + fileName);
// 构造上传请求。
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + picPath + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
put.setProgressCallback((request, currentSize, totalSize) -> {
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
// if(isVideo){
// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
// }
private void toUpdateOssNew( int i) {
String updatePathPic = "report";
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);
//OSSAsyncTask task =
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
@Override
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
LogUtils.i("PutObject", "UploadSuccess");
LogUtils.i("ETag", result.getETag());
LogUtils.i("RequestId", result.getRequestId());
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + picPath + "/" + data + "/" + fileName);
if (i < uris.size()) {
File file = new File(localMedias.get(i).getRealPath());
String fileName = UUID.randomUUID().toString() + "_" + localMedias.get(i).getFileName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean1 + ";;" + file.getAbsolutePath());
String files = "media/" + updatePathPic + "/" + fileName;
byte[] sss = convertFileToBytes(file);
LogUtils.i("结果是啥开始：" + sss);
uploadManager.put(sss, files, stsCredentialsBean1, (key, info, response) -> {
// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info));
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
dismissLoading();
if (info != null && info.isOK()) {
// 上传成功
outputStrings.add(IMUIKitConfig.OSS_URL + files);
//https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
if (i == uris.size() - 1) {
toSubmit();
} else {
toUpdateOss(bucketName, i + 1, oss);
toUpdateOssNew(i + 1);
}
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
}
}, options);
}
}
public static byte[] convertFileToBytes(File file) {
// 使用ByteArrayOutputStream来收集字节数据
FileInputStream fis = null;
try {
fis = new FileInputStream(file);
byte[] bytesArray = new byte[(int) file.length()];
fis.read(bytesArray);
fis.close();
return bytesArray;
} catch (FileNotFoundException e) {
// throw new RuntimeException(e);
return null;
} catch (IOException e) {
// throw new RuntimeException(e);
return null;
}
@Override
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
dismissLoading();
LogUtils.i("ErrorCode", clientExcepion.getMessage());
// 请求异常。
if (clientExcepion != null) {
// 本地异常，如网络异常等。
clientExcepion.printStackTrace();
}
if (serviceException != null) {
// 服务异常。
LogUtils.i("ErrorCode", serviceException.getErrorCode());
LogUtils.i("RequestId", serviceException.getRequestId());
LogUtils.i("HostId", serviceException.getHostId());
LogUtils.i("RawMessage", serviceException.getRawMessage());
}
}
});
}
}
// 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 toUpdateOss(String bucketName, int i, OSSClient oss) {
// String picPath = "user_album";
// String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
// if (i < uris.size()) {
//
//// File file = new File(uriStrings.get(i));
// String fileName = System.currentTimeMillis() + "_" + localMedias.get(i).getFileName();
// LogUtils.i("上传文件是啥:" + GsonUtils.beanToJSONString(localMedias.get(i)));
// LogUtils.i("上传文件是啥:" + fileName);
//
// // 构造上传请求。
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + picPath + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
// put.setProgressCallback((request, currentSize, totalSize) -> {
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
//// if(isVideo){
//// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
//// }
// });
//
// //OSSAsyncTask task =
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
// @Override
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
// LogUtils.i("PutObject", "UploadSuccess");
// LogUtils.i("ETag", result.getETag());
// LogUtils.i("RequestId", result.getRequestId());
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
// outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + picPath + "/" + data + "/" + fileName);
// //https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
// if (i == uris.size() - 1) {
// toSubmit();
// } else {
// toUpdateOss(bucketName, i + 1, oss);
// }
// }
//
// @Override
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
// dismissLoading();
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
//
// // 请求异常。
// if (clientExcepion != null) {
// // 本地异常，如网络异常等。
// clientExcepion.printStackTrace();
// }
// if (serviceException != null) {
// // 服务异常。
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
// LogUtils.i("RequestId", serviceException.getRequestId());
// LogUtils.i("HostId", serviceException.getHostId());
// LogUtils.i("RawMessage", serviceException.getRawMessage());
// }
// }
// });
// }
// }
public void toSubmit() {
UserAlbumBean.UserAlbum userAlbum = new UserAlbumBean.UserAlbum();
userAlbum.setName(binding.editUserphotoMingcheng.getText().toString());

52
app/src/main/java/com/dskj/rbchat/main/mine/photo/EditPhotoActivity.java → app/src/main/java/com/hbl/lewan/main/mine/photo/EditPhotoActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine.photo;
package com.hbl.lewan.main.mine.photo;
import android.Manifest;
import android.content.Intent;
@@ -23,32 +23,32 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityAddphotosBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.SelectPhotoTypeDialog;
import com.dskj.rbchat.event.UserAlbumsUpdateEvent;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.CharInputFilter;
import com.dskj.rbchat.utils.LogUtils;
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.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.event.EventCenter;

297
app/src/main/java/com/dskj/rbchat/main/mine/photo/UserPhotoDetailsActivity.java → app/src/main/java/com/hbl/lewan/main/mine/photo/UserPhotoDetailsActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine.photo;
package com.hbl.lewan.main.mine.photo;
import android.Manifest;
import android.app.Activity;
@@ -30,43 +30,43 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityUserphotosBinding;
import com.dskj.rbchat.databinding.ActivityUserphotosDetailsBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.ActionInputConfirmDialog;
import com.dskj.rbchat.dialog.SelectPhotosMoveDialog;
import com.dskj.rbchat.event.UserAlbumsUpdateEvent;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.AlbumItemBean;
import com.dskj.rbchat.model.HisChatShowBean;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.voom.TiktokActivity;
import com.dskj.rbchat.welcome.WelcomeActivity;
import com.dskj.rbchat.widget.CircleImageView;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
@@ -104,13 +104,21 @@ import com.netease.yunxin.kit.corekit.im.IMKitClient;
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.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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -707,6 +715,8 @@ public class UserPhotoDetailsActivity extends LllChatBaseActivity {
List<String> uriStrings = new ArrayList<>();
StsCredentialsBean stsCredentialsBean;
String stsCredentialsBean1;
List<LocalMedia> localMedias = new ArrayList<>();
List<String> outputStrings = new ArrayList<>();
@@ -774,14 +784,31 @@ public class UserPhotoDetailsActivity extends LllChatBaseActivity {
public void onSubmitPic() {
showLoading();
Api.getInstance().stsCredentials()
// Api.getInstance().stsCredentials()
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
// @Override
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
// stsCredentialsBean = feedbackResp.data;
// toAliYunOss();
// }
//
// @Override
// public void onError(int code, String msg) {
// dismissLoading();
// }
// });
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
toAliYunOss();
public void onSuccess(Result<String> feedbackResp) {
stsCredentialsBean1 = feedbackResp.data;
// toAliYunOss(file, isHead);
toUpdateOssNew(0);
}
@Override
@@ -791,77 +818,143 @@ public class UserPhotoDetailsActivity extends LllChatBaseActivity {
});
}
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 toUpdateOss(String bucketName, int i, OSSClient oss) {
String picPath = "user_album";
String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
if (i < uriStrings.size()) {
// File file = new File(uriStrings.get(i));
String fileName = System.currentTimeMillis() + "_" + localMedias.get(i).getFileName();
LogUtils.i("上传文件是啥:" + GsonUtils.beanToJSONString(localMedias.get(i)));
LogUtils.i("上传文件是啥:" + fileName);
// 构造上传请求。
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + picPath + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
put.setProgressCallback((request, currentSize, totalSize) -> {
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
// if(isVideo){
// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
// }
private void toUpdateOssNew( int i) {
String updatePathPic = "user_album";
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);
//OSSAsyncTask task =
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
@Override
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
LogUtils.i("PutObject", "UploadSuccess");
LogUtils.i("ETag", result.getETag());
LogUtils.i("RequestId", result.getRequestId());
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + picPath + "/" + data + "/" + fileName);
if (i < uriStrings.size()) {
File file = new File(localMedias.get(i).getRealPath());
//localMedias.get(i).getRealPath()
String fileName = UUID.randomUUID().toString() + "_" + localMedias.get(i).getFileName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean1 + ";;" + file.getAbsolutePath());
String files = "media/" + updatePathPic + "/" + fileName;
byte[] sss = convertFileToBytes(file);
LogUtils.i("结果是啥开始：" + sss);
uploadManager.put(sss, files, stsCredentialsBean1, (key, info, response) -> {
// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info));
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
dismissLoading();
if (info != null && info.isOK()) {
// 上传成功
outputStrings.add(IMUIKitConfig.OSS_URL + files);
//https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
// outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + picPath + "/" + data + "/" + fileName);
//https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
if (i == uriStrings.size() - 1) {
toAddPhotos();
} else {
toUpdateOss(bucketName, i + 1, oss);
toUpdateOssNew( i + 1);
}
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
}
}, options);
}
}
public static byte[] convertFileToBytes(File file) {
// 使用ByteArrayOutputStream来收集字节数据
FileInputStream fis = null;
try {
fis = new FileInputStream(file);
byte[] bytesArray = new byte[(int) file.length()];
fis.read(bytesArray);
fis.close();
return bytesArray;
} catch (FileNotFoundException e) {
// throw new RuntimeException(e);
return null;
} catch (IOException e) {
// throw new RuntimeException(e);
return null;
}
@Override
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
dismissLoading();
LogUtils.i("ErrorCode", clientExcepion.getMessage());
// 请求异常。
if (clientExcepion != null) {
// 本地异常，如网络异常等。
clientExcepion.printStackTrace();
}
if (serviceException != null) {
// 服务异常。
LogUtils.i("ErrorCode", serviceException.getErrorCode());
LogUtils.i("RequestId", serviceException.getRequestId());
LogUtils.i("HostId", serviceException.getHostId());
LogUtils.i("RawMessage", serviceException.getRawMessage());
}
}
});
}
}
// 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 toUpdateOss(String bucketName, int i, OSSClient oss) {
// String picPath = "user_album";
// String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
// if (i < uriStrings.size()) {
//
//// File file = new File(uriStrings.get(i));
// String fileName = System.currentTimeMillis() + "_" + localMedias.get(i).getFileName();
// LogUtils.i("上传文件是啥:" + GsonUtils.beanToJSONString(localMedias.get(i)));
// LogUtils.i("上传文件是啥:" + fileName);
//
// // 构造上传请求。
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + picPath + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
// put.setProgressCallback((request, currentSize, totalSize) -> {
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
//// if(isVideo){
//// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
//// }
// });
//
// //OSSAsyncTask task =
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
// @Override
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
// LogUtils.i("PutObject", "UploadSuccess");
// LogUtils.i("ETag", result.getETag());
// LogUtils.i("RequestId", result.getRequestId());
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
// outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + picPath + "/" + data + "/" + fileName);
// //https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
// if (i == uriStrings.size() - 1) {
// toAddPhotos();
// } else {
// toUpdateOss(bucketName, i + 1, oss);
// }
// }
//
// @Override
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
// dismissLoading();
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
//
// // 请求异常。
// if (clientExcepion != null) {
// // 本地异常，如网络异常等。
// clientExcepion.printStackTrace();
// }
// if (serviceException != null) {
// // 服务异常。
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
// LogUtils.i("RequestId", serviceException.getRequestId());
// LogUtils.i("HostId", serviceException.getHostId());
// LogUtils.i("RawMessage", serviceException.getRawMessage());
// }
// }
// });
// }
// }
//
public void toAddPhotos() {
UserAlbumBean.UserAlbum userAlbum1 = new UserAlbumBean.UserAlbum();

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine.photo;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityUserphotosBinding;
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.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.ActionInputConfirmDialog;
import com.dskj.rbchat.dialog.SelectPhotoTypeDialog;
import com.dskj.rbchat.event.UserAlbumsUpdateEvent;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.ItemDragTouchHelperCallback;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.PushActivity;
import com.dskj.rbchat.voom.TiktokActivity;
import com.dskj.rbchat.widget.CircleImageView;
import com.dskj.rbchat.widget.GridItemDecoration;
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.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;

52
app/src/main/java/com/dskj/rbchat/main/mine/photo/UserSelectPhotoActivity.java → app/src/main/java/com/hbl/lewan/main/mine/photo/UserSelectPhotoActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine.photo;
package com.hbl.lewan.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;
@@ -22,32 +22,32 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityUserphotosDetailsBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.AlbumItemBean;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.main.mine.photo;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityWatchPhotosBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.event.UserAlbumsUpdateEvent;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.model.AlbumItemBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.ToolKits;
import com.dskj.rbchat.widget.CircleImageView;
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.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.dskj.rbchat.utils.LogUtils.i("用户信息：" + GsonUtils.beanToJSONString(s.getFriendInfo()));
com.hbl.lewan.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.dskj.rbchat.utils.LogUtils.i("0000000000");
com.hbl.lewan.utils.LogUtils.i("0000000000");
changeItemButton();
});
@@ -412,7 +412,7 @@ public class WatchImagesActivity extends LllChatBaseActivity {
}
private void changeItemButton() {
com.dskj.rbchat.utils.LogUtils.i("1111111111111111");
com.hbl.lewan.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.dskj.rbchat.utils.LogUtils.i("22222222222:" + b);
com.hbl.lewan.utils.LogUtils.i("22222222222:" + b);
if (b) {
shareBt.setBackground(getResources().getDrawable(R.drawable.button_true_bg));

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

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

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

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

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine.setting;
package com.hbl.lewan.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.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityMineSettingBinding;
import com.dskj.rbchat.login.LoginActivity;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.netease.yunxin.kit.chatkit.ui.custom.ChatConfigManager;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.utils.SizeUtils;

75
app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNewActivity.java Normal file
View File

@@ -0,0 +1,75 @@
// 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.mine.setting;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import androidx.annotation.DrawableRes;
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.google.android.gms.maps.CameraUpdateFactory;
//import com.google.android.gms.maps.GoogleMap;
//import com.google.android.gms.maps.MapFragment;
//import com.google.android.gms.maps.OnMapReadyCallback;
//import com.google.android.gms.maps.model.LatLng;
//import com.google.android.gms.maps.model.MarkerOptions;
//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;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
public class SettingNewActivity extends BaseActivity {
private ActivitySettingBinding viewBinding;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
getWindow().setStatusBarColor(getResources().getColor(R.color.color_white));
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
super.onCreate(savedInstanceState);
viewBinding = ActivitySettingBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
initView();
}
private void initView() {
viewBinding.settingTitleBar.getBackImageView().setOnClickListener(v -> finish());
// MapFragment mapFragment = (MapFragment) getFragmentManager()
// .findFragmentById(R.id.mapview);
// mapFragment.getMapAsync(this);
}
// @Override
// public void onMapReady(@NonNull GoogleMap googleMap) {
// LatLng sydney = new LatLng(-33.867, 151.206);
//
// googleMap.setMyLocationEnabled(true);
// googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 13));
//
// googleMap.addMarker(new MarkerOptions()
// .title("Sydney")
// .snippet("The most populous city in Australia.")
// .position(sydney));
// }
}

10
app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyActivity.java → app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine.setting;
package com.hbl.lewan.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.dskj.rbchat.AppSkinConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityMineSettingNotifyBinding;
import com.dskj.rbchat.utils.GsonUtils;
import com.hbl.lewan.AppSkinConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityMineSettingNotifyBinding;
import com.hbl.lewan.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;

20
app/src/main/java/com/dskj/rbchat/main/mine/setting/SettingNotifyRingActivity.java → app/src/main/java/com/hbl/lewan/main/mine/setting/SettingNotifyRingActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.main.mine.setting;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityRingSetBinding;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
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.netease.yunxin.kit.chatkit.ui.model.IMUserExtension;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -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.dskj.rbchat/raw/" + name);
Uri ringUri = Uri.parse("android.resource://com.hbl.lewan/raw/" + name);
if (mMediaPlayer == null) {
mMediaPlayer = new MediaPlayer();
}

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

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

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

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

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

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

294
app/src/main/java/com/dskj/rbchat/map/LocationPageActivity1.java → app/src/main/java/com/hbl/lewan/map/LocationPageActivity1.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.map;
package com.hbl.lewan.map;
import static com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant.LIB_TAG;
@@ -42,35 +42,35 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.BuildConfig;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityLocation1Binding;
import com.dskj.rbchat.model.AdBean;
import com.dskj.rbchat.model.BillBean;
import com.dskj.rbchat.model.NearbySearchBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.BaseObserverNew;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.network.ResultNew;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
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.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.location.LocationRequest;
import com.google.android.gms.location.LocationServices;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapFragment;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions;
//import com.google.android.gms.location.LocationRequest;
//import com.google.android.gms.location.LocationServices;
//import com.google.android.gms.maps.CameraUpdateFactory;
//import com.google.android.gms.maps.GoogleMap;
//import com.google.android.gms.maps.MapFragment;
//import com.google.android.gms.maps.OnMapReadyCallback;
//import com.google.android.gms.maps.model.BitmapDescriptorFactory;
//import com.google.android.gms.maps.model.LatLng;
//import com.google.android.gms.maps.model.Marker;
//import com.google.android.gms.maps.model.MarkerOptions;
import com.netease.nimlib.sdk.msg.attachment.LocationAttachment;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.yunxin.kit.alog.ALog;
@@ -98,11 +98,11 @@ import java.util.List;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCallback, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
public class LocationPageActivity1 extends BaseActivity implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
private static final String TAG = "LocationPageActivity";
private GoogleMap mMap;
// private GoogleMap mMap;
GoogleApiClient mGoogleApiClient;
LocationRequest mLocationRequest;
// LocationRequest mLocationRequest;
CommonAdapter commonAdapter;
public static final String SEND_LOCATION_RESULT = "SEND_LOCATION_RESULT";
public static final String LAUNCH_TYPE = "LOCATION_LAUNCH_TYPE";
@@ -117,9 +117,9 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
int launchType = LAUNCH_SEND;
IMMessage message;
private IPageMapProvider pageMapProvider;
LatLng sydney;
LatLng locLatLng;
Marker marker;
// LatLng sydney;
// LatLng locLatLng;
// Marker marker;
public static void launch(Context context, int type, IMMessage message) {
Intent intent = new Intent(context, LocationPageActivity1.class);
@@ -143,9 +143,9 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
initData(getIntent());
MapFragment mapFragment = (MapFragment) getFragmentManager()
.findFragmentById(com.dskj.rbchat.R.id.mapview);
mapFragment.getMapAsync(LocationPageActivity1.this);
// MapFragment mapFragment = (MapFragment) getFragmentManager()
// .findFragmentById(com.hbl.lewan.R.id.mapview);
// mapFragment.getMapAsync(LocationPageActivity1.this);
binding.mapViewCancel.setOnClickListener(v -> finish());
binding.mapDetailBack.setOnClickListener(v -> finish());
binding.mapViewSend.setOnClickListener(
@@ -223,14 +223,14 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
holder.setText(R.id.location_title, s.getName());
holder.setText(R.id.location_desc, s.getVicinity());
String desc = s.getVicinity();
if (locLatLng != null) {
float distance = gps2m(locLatLng.latitude, locLatLng.longitude, s.getGeometry().getLocation().getLat(), s.getGeometry().getLocation().getLng());
if (distance > 0 && distance < 1000) {
desc = getString(R.string.chat_message_location_distance, Math.ceil(distance), desc);
holder.setText(R.id.location_desc, desc);
}
}
// if (locLatLng != null) {
// float distance = gps2m(locLatLng.latitude, locLatLng.longitude, s.getGeometry().getLocation().getLat(), s.getGeometry().getLocation().getLng());
// if (distance > 0 && distance < 1000) {
// desc = getString(R.string.chat_message_location_distance, Math.ceil(distance), desc);
// holder.setText(R.id.location_desc, desc);
//
// }
// }
if (selectPosition == index) {
holder.getView(R.id.location_selected).setVisibility(View.VISIBLE);
@@ -244,20 +244,20 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
nearbySearchBean = s;
selectPosition = index;
notifyDataSetChanged();
if (mMap != null) {
sydney = new LatLng(s.getGeometry().getLocation().getLat(), s.getGeometry().getLocation().getLng());
mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 13));
if (marker != null) {
marker.remove();
}
Bitmap bitmap = BitmapFactory.decodeResource(getResources(), com.netease.yunxin.kit.locationkit.R.drawable.ic_location_marker).copy(Bitmap.Config.ARGB_8888, true);
//ic_location_marker
marker = mMap.addMarker(new MarkerOptions()
.title(s.getName() + "")
.icon(BitmapDescriptorFactory.fromResource(com.netease.yunxin.kit.locationkit.R.drawable.ic_location_marker))
.snippet(s.getVicinity() + "")
.position(sydney));
}
// if (mMap != null) {
// sydney = new LatLng(s.getGeometry().getLocation().getLat(), s.getGeometry().getLocation().getLng());
// mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 13));
// if (marker != null) {
// marker.remove();
// }
// Bitmap bitmap = BitmapFactory.decodeResource(getResources(), com.netease.yunxin.kit.locationkit.R.drawable.ic_location_marker).copy(Bitmap.Config.ARGB_8888, true);
// //ic_location_marker
// marker = mMap.addMarker(new MarkerOptions()
// .title(s.getName() + "")
// .icon(BitmapDescriptorFactory.fromResource(com.netease.yunxin.kit.locationkit.R.drawable.ic_location_marker))
// .snippet(s.getVicinity() + "")
// .position(sydney));
// }
});
}
@@ -294,45 +294,45 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
}
@Override
public void onMapReady(@NonNull GoogleMap googleMap) {
mMap = googleMap;
mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
buildGoogleApiClient();
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions
// here to request the missing permissions, and then overriding
// public void onRequestPermissionsResult(int requestCode, String[] permissions,
// int[] grantResults)
// to handle the case where the user grants the permission. See the documentation
// for ActivityCompat#requestPermissions for more details.
return;
}
mMap.setMyLocationEnabled(true);
// mMap.addMarker(new MarkerOptions()
// .title("Sydney")
// .snippet("The most populous city in Australia.")
// @Override
// public void onMapReady(@NonNull GoogleMap googleMap) {
// mMap = googleMap;
// mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
// buildGoogleApiClient();
// if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
// // TODO: Consider calling
// // ActivityCompat#requestPermissions
// // here to request the missing permissions, and then overriding
// // public void onRequestPermissionsResult(int requestCode, String[] permissions,
// // int[] grantResults)
// // to handle the case where the user grants the permission. See the documentation
// // for ActivityCompat#requestPermissions for more details.
// return;
// }
// mMap.setMyLocationEnabled(true);
//
//
//// mMap.addMarker(new MarkerOptions()
//// .title("Sydney")
//// .snippet("The most populous city in Australia.")
//// .position(sydney));
// if (launchType == LAUNCH_SEND) {
// getLocationPermission();
// } else {
// LocationAttachment attachment = (LocationAttachment) message.getAttachment();
// sydney = new LatLng(attachment.getLatitude(), attachment.getLongitude());
// mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 15));
// if (marker != null) {
// marker.remove();
// }
// marker = mMap.addMarker(new MarkerOptions()
// .icon(BitmapDescriptorFactory.fromResource(com.netease.yunxin.kit.locationkit.R.drawable.ic_location_marker))
// .title(message.getContent() + "")
// .snippet(attachment.getAddress())
// .position(sydney));
if (launchType == LAUNCH_SEND) {
getLocationPermission();
} else {
LocationAttachment attachment = (LocationAttachment) message.getAttachment();
sydney = new LatLng(attachment.getLatitude(), attachment.getLongitude());
mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 15));
if (marker != null) {
marker.remove();
}
marker = mMap.addMarker(new MarkerOptions()
.icon(BitmapDescriptorFactory.fromResource(com.netease.yunxin.kit.locationkit.R.drawable.ic_location_marker))
.title(message.getContent() + "")
.snippet(attachment.getAddress())
.position(sydney));
}
}
// }
// }
//
/**
* Prompts the user for permission to use the device location.
@@ -385,13 +385,13 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
Toast.makeText(LocationPageActivity1.this, "未有定位", Toast.LENGTH_SHORT).show();
return;
}
LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
if (latLng != null) {
sydney = new LatLng(location.getLatitude(), location.getLongitude());
locLatLng = new LatLng(location.getLatitude(), location.getLongitude());
mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 13));
search("");
}
// LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
// if (latLng != null) {
// sydney = new LatLng(location.getLatitude(), location.getLongitude());
// locLatLng = new LatLng(location.getLatitude(), location.getLongitude());
// mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 13));
// search("");
// }
}
});
@@ -400,44 +400,44 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
private void search(String s) {
selectPosition = -1;
if(sydney ==null){
return;
}
// if(sydney ==null){
// return;
// }
if(TextUtils.isEmpty(s)) {
Api.getInstance().nearbysearch(sydney.latitude + "," + sydney.longitude, "10000", "",
"true", BuildConfig.APIKEY)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserverNew<>() {
@Override
public void onSuccess(ResultNew<List<NearbySearchBean>> o) {
changeInfo(o.results);
}
@Override
public void onError(int code, String msg) {
}
});
// Api.getInstance().nearbysearch(sydney.latitude + "," + sydney.longitude, "10000", "",
// "true", BuildConfig.APIKEY)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserverNew<>() {
// @Override
// public void onSuccess(ResultNew<List<NearbySearchBean>> o) {
// changeInfo(o.results);
//
// }
//
// @Override
// public void onError(int code, String msg) {
//
// }
// });
}else{
Api.getInstance().nearbysearch(sydney.latitude + "," + sydney.longitude, "10000", "",
"true", BuildConfig.APIKEY,s)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserverNew<>() {
@Override
public void onSuccess(ResultNew<List<NearbySearchBean>> o) {
changeInfo(o.results);
}
@Override
public void onError(int code, String msg) {
}
});
// Api.getInstance().nearbysearch(sydney.latitude + "," + sydney.longitude, "10000", "",
// "true", BuildConfig.APIKEY,s)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserverNew<>() {
// @Override
// public void onSuccess(ResultNew<List<NearbySearchBean>> o) {
// changeInfo(o.results);
//
//
// }
//
// @Override
// public void onError(int code, String msg) {
//
// }
// });
}
}
@@ -451,12 +451,12 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
}
protected synchronized void buildGoogleApiClient() {
mGoogleApiClient = new GoogleApiClient.Builder(this)
.addConnectionCallbacks(this)
.addOnConnectionFailedListener(this)
.addApi(LocationServices.API)
.build();
mGoogleApiClient.connect();
// mGoogleApiClient = new GoogleApiClient.Builder(this)
// .addConnectionCallbacks(this)
// .addOnConnectionFailedListener(this)
// .addApi(LocationServices.API)
// .build();
// mGoogleApiClient.connect();
}
//
@@ -467,7 +467,7 @@ public class LocationPageActivity1 extends BaseActivity implements OnMapReadyCal
// 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.dskj.rbchat.R.string.google_map_key))
// Api.getInstance().nearbysearch(location.getLatitude()+","+location.getLongitude(),"10000","","true",getString(com.hbl.lewan.R.string.google_map_key))
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result>() {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

123
app/src/main/java/com/dskj/rbchat/network/ApiService.java → app/src/main/java/com/hbl/lewan/network/ApiService.java
View File

@@ -1,63 +1,64 @@
package com.dskj.rbchat.network;
package com.hbl.lewan.network;
import com.blankj.utilcode.util.LogUtils;
import com.dskj.rbchat.model.ActivityMsgBean;
import com.dskj.rbchat.model.AdBean;
import com.dskj.rbchat.model.AfterCountBean;
import com.dskj.rbchat.model.AiConvertBean;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.AuthorizeBean;
import com.dskj.rbchat.model.AvaterBean;
import com.dskj.rbchat.model.BankBean;
import com.dskj.rbchat.model.BankListBean;
import com.dskj.rbchat.model.BillBean;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.ChargingBean;
import com.dskj.rbchat.model.ConfigBean;
import com.dskj.rbchat.model.CreditsConfBean;
import com.dskj.rbchat.model.ExchangeConfBean;
import com.dskj.rbchat.model.ForBiddenInfoBean;
import com.dskj.rbchat.model.FukuanResultBean;
import com.dskj.rbchat.model.GameBean;
import com.dskj.rbchat.model.GroupActionBean;
import com.dskj.rbchat.model.GroupBeanResult;
import com.dskj.rbchat.model.InstallmentBean;
import com.dskj.rbchat.model.InviteDetailsBean;
import com.dskj.rbchat.model.LinkBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.LoginBeanJiaXu;
import com.dskj.rbchat.model.MessageBean;
import com.dskj.rbchat.model.NearbySearchBean;
import com.dskj.rbchat.model.NewsBean;
import com.dskj.rbchat.model.NotifyCountBean;
import com.dskj.rbchat.model.PassWordLoginBean;
import com.dskj.rbchat.model.PayInfoBean;
import com.dskj.rbchat.model.QuesListBean;
import com.dskj.rbchat.model.ReadMessageBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.model.RtcTokenBean;
import com.dskj.rbchat.model.RtcTokenResBean;
import com.dskj.rbchat.model.SendOrderBean;
import com.dskj.rbchat.model.SetUpdatesBean;
import com.dskj.rbchat.model.StaffServiceIdBean;
import com.dskj.rbchat.model.StatisticsBean;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.model.TaskBean;
import com.dskj.rbchat.model.TopBean;
import com.dskj.rbchat.model.TopOrderBean;
import com.dskj.rbchat.model.TopUpBean;
import com.dskj.rbchat.model.TrcGroupBean;
import com.dskj.rbchat.model.UserAlbumBean;
import com.dskj.rbchat.model.UserRankBean;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.model.VersionBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.model.WithCashBean;
import com.dskj.rbchat.model.WorldChatBean;
import com.dskj.rbchat.wxapi.bean.WeiXinInfo;
import com.dskj.rbchat.wxapi.bean.WeiXinToken;
import com.hbl.lewan.BuildConfig;
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.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.QuesListBean;
import com.hbl.lewan.model.ReadMessageBean;
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.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.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.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;
@@ -96,6 +97,11 @@ import retrofit2.http.QueryMap;
public interface ApiService {
/***
* 打包的国家编码
*/
// String AREA_CODE = "+886";
String AREA_CODE = BuildConfig.AREA_CODE;
/**
* 测试环境
@@ -793,7 +799,8 @@ public interface ApiService {
@GET("/file/stsCredentials")
Observable<Result<StsCredentialsBean>> stsCredentials();
@GET("/file/stsCredentials")
Observable<Result<String>> stsCredentials1();
// @POST(Const.TESTTOY_SAVE_USER_MACHINE)
// Observable<Result1> save_user_machine(@Body Map<String, Object> requestBody);

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

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

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.network;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.google.gson.JsonParseException;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

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

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

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.network;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.utils.DataUtils;
import com.hbl.lewan.welcome.WelcomeActivity;
import com.google.gson.JsonParseException;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

6
app/src/main/java/com/dskj/rbchat/network/HeaderInterceptor.java → app/src/main/java/com/hbl/lewan/network/HeaderInterceptor.java
View File

@@ -1,7 +1,7 @@
package com.dskj.rbchat.network;
package com.hbl.lewan.network;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.utils.DataUtils;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.utils.DataUtils;
import java.io.IOException;

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

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

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

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

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

@@ -1,5 +1,5 @@
package com.dskj.rbchat.pay;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityCollectionBinding;
import com.dskj.rbchat.databinding.ActivityPaymentBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.FukuanResultBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.WalletInfoActivity;
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.king.zxing.util.CodeUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.uinfo.UserService;

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

@@ -1,5 +1,5 @@
package com.dskj.rbchat.pay;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.PayInfoBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.ToolKits;
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.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.R;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.dialog.SelectPayTypeDialog;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.ImageCacheLoader;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.PaySettingActivity;
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.king.zxing.util.CodeUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.dskj.rbchat.databinding.ActivityCollectionAndPaymentBinding;
import com.hbl.lewan.databinding.ActivityCollectionAndPaymentBinding;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

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

@@ -1,5 +1,5 @@
package com.dskj.rbchat.pay;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityCollectionAndPaymentBinding;
import com.dskj.rbchat.databinding.ActivityLipinduihuanBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.dialog.SelectPayTypeDialog;
import com.dskj.rbchat.model.PayInfoBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.ToolKits;
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.king.zxing.util.CodeUtils;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.pay;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityLipinSuccessBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityLipinSuccessBinding;
import com.dskj.rbchat.model.FukuanResultBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
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.netease.yunxin.kit.common.ui.activities.BaseActivity;
import io.reactivex.android.schedulers.AndroidSchedulers;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.pay;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.base.LllChatBaseActivity;
import com.dskj.rbchat.databinding.ActivityNfcreaderBinding;
import com.hbl.lewan.R;
import com.hbl.lewan.base.LllChatBaseActivity;
import com.hbl.lewan.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.dskj.rbchat.R.string.nfctitle_dialog_status));
tvStatus.setText(getString(com.hbl.lewan.R.string.nfctitle_dialog_status));
Glide.with(this).load(R.mipmap.nfc_read).into(ivStatus);
tvCancel.setOnClickListener(view -> {
nfcAdapter.disableReaderMode(this);

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

@@ -1,5 +1,5 @@
package com.dskj.rbchat.pay;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.contact.UserInfoActivity;
import com.dskj.rbchat.databinding.ActivityCollectionAndPaymentBinding;
import com.dskj.rbchat.databinding.ActivityPaymentBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.dialog.PayDialog;
import com.dskj.rbchat.dialog.SelectPayTypeDialog;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.redpack.TransferAccountsActivity;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ToolKits;
import com.dskj.rbchat.wallet.PaySettingActivity;
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
import com.dskj.rbchat.wallet.WalletInfoActivity;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

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

@@ -1,5 +1,5 @@
package com.dskj.rbchat.pay;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityPayment1Binding;
import com.dskj.rbchat.databinding.ActivityPaymentBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.UsersExistBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.wallet.SetPayPasswordActivity;
import com.dskj.rbchat.wallet.WalletInfoActivity;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.FriendService;

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

@@ -1,5 +1,5 @@
package com.dskj.rbchat.pay;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityPaymentSuccessBinding;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityPaymentSuccessBinding;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.uinfo.UserService;

5
app/src/main/java/com/dskj/rbchat/push/HWPushMessageService.java → app/src/main/java/com/hbl/lewan/push/HWPushMessageService.java
View File

@@ -2,9 +2,10 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.push;
package com.hbl.lewan.push;
import com.huawei.hms.push.RemoteMessage;
//import com.huawei.hms.push.RemoteMessage;
import com.google.firebase.messaging.RemoteMessage;
import com.netease.yunxin.kit.alog.ALog;
public class HWPushMessageService extends com.netease.nimlib.sdk.mixpush.HWPushMessageService {

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.push;
package com.hbl.lewan.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.dskj.rbchat.NimSDKOptionConfig;
import com.hbl.lewan.NimSDKOptionConfig;
import java.util.ArrayList;
import java.util.Map;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.push;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.hbl.lewan.R;
import com.netease.yunxin.kit.corekit.im.provider.TeamProvider;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

26
app/src/main/java/com/dskj/rbchat/redpack/ReceiveRedPacketActivity.java → app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.redpack;
package com.hbl.lewan.redpack;
import android.annotation.SuppressLint;
import android.content.Intent;
@@ -10,24 +10,24 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.network.Api;
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 androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.dskj.rbchat.R;
import com.hbl.lewan.R;
import com.dskj.rbchat.databinding.ActivityReceiveRedPacketBinding;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.ImageCacheLoader;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.WalletInfoActivity;
import com.hbl.lewan.databinding.ActivityReceiveRedPacketBinding;
import com.hbl.lewan.network.BaseObserver;
import com.hbl.lewan.network.Result;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.uinfo.UserService;
import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;

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

@@ -1,5 +1,5 @@
package com.dskj.rbchat.redpack;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivitySendGiftRedpacketBinding;
import com.dskj.rbchat.databinding.ActivitySendRedPacketBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.WalletInfoActivity;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;

102
app/src/main/java/com/dskj/rbchat/redpack/SendRedPacketActivity.java → app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java
View File

@@ -1,5 +1,5 @@
package com.dskj.rbchat.redpack;
package com.hbl.lewan.redpack;
import android.app.Activity;
import android.content.Intent;
@@ -28,30 +28,30 @@ import androidx.core.graphics.drawable.DrawableCompat;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.databinding.ActivitySendRedPacketBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.dialog.PayDialog;
import com.dskj.rbchat.dialog.SelectPayTypeDialog;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.PaySettingActivity;
import com.dskj.rbchat.wallet.WalletInfoActivity;
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.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.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.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
@@ -322,12 +322,12 @@ public class SendRedPacketActivity extends BaseActivity {
}
if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.GROUP_MAX_MONEY) {
// ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.GROUP_MAX_MONEY));
ToastX.showShortToast(getString(R.string.dghbjebndy_txt) + " " + IMUIKitConfig.GROUP_MAX_MONEY);
return;
}
// if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.GROUP_MAX_MONEY) {
//// ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.GROUP_MAX_MONEY));
// ToastX.showShortToast(getString(R.string.dghbjebndy_txt) + " " + IMUIKitConfig.GROUP_MAX_MONEY);
//
// return;
// }
if (Integer.parseInt(viewBinding.sizeHintEt.getText().toString().trim()) > maxNumber) {
ToastX.showShortToast(R.string.hbgsbncgdqqlzs_txt);
@@ -337,12 +337,12 @@ public class SendRedPacketActivity extends BaseActivity {
}
} else {
if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.SINGLE_MAX_MONEY) {
// ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.SINGLE_MAX_MONEY));
ToastX.showShortToast(getString(R.string.dghbjebndy_txt) + " " + IMUIKitConfig.SINGLE_MAX_MONEY);
return;
}
// if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.SINGLE_MAX_MONEY) {
//// ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.SINGLE_MAX_MONEY));
// ToastX.showShortToast(getString(R.string.dghbjebndy_txt) + " " + IMUIKitConfig.SINGLE_MAX_MONEY);
//
// return;
// }
}
if (walletBean != null) {
if (Float.parseFloat(viewBinding.numberTv.getText().toString().trim()) > (isJinBi ? walletBean.getGoldCoin() / 100f : walletBean.getSilverCoin() / 100f)) {
@@ -356,21 +356,21 @@ public class SendRedPacketActivity extends BaseActivity {
// .setNegativeButton($$(R.string.general_cancel), null)
// .show();
ActionConfirmDialog actionDialog = new ActionConfirmDialog(SendRedPacketActivity.this, getString(R.string.sfqcz_txt), getString(R.string.general_cancel), getString(R.string.quchongzhi_txt));
actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
@Override
public void toSumbit() {
Intent intent = new Intent(SendRedPacketActivity.this, WalletInfoActivity.class);
intent.putExtra("isG", true);
startActivity(intent);
}
@Override
public void toCancel() {
}
});
actionDialog.show();
// ActionConfirmDialog actionDialog = new ActionConfirmDialog(SendRedPacketActivity.this, getString(R.string.sfqcz_txt), getString(R.string.general_cancel), getString(R.string.quchongzhi_txt));
// actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
// @Override
// public void toSumbit() {
// Intent intent = new Intent(SendRedPacketActivity.this, WalletInfoActivity.class);
// intent.putExtra("isG", true);
// startActivity(intent);
// }
//
// @Override
// public void toCancel() {
//
// }
// });
// actionDialog.show();
ToastX.showShortToast(R.string.yebz_txt);

92
app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java → app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java
View File

@@ -1,5 +1,5 @@
package com.dskj.rbchat.redpack;
package com.hbl.lewan.redpack;
import android.app.Activity;
import android.content.Intent;
@@ -19,27 +19,27 @@ import androidx.annotation.RequiresApi;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityTransferAccountsBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.PayCashDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.dialog.PayDialog;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.dskj.rbchat.wallet.WalletInfoActivity;
import com.hbl.lewan.wallet.WalletInfoActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
@@ -119,31 +119,31 @@ public class TransferAccountsActivity extends BaseActivity {
if (walletBean != null) {
if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > (isJinBi ? walletBean.getGoldCoin() / 100f : walletBean.getSilverCoin() / 100f)) {
ActionConfirmDialog actionDialog;
if (isJinBi) {
actionDialog = new ActionConfirmDialog(TransferAccountsActivity.this,
getString(R.string.sfqcz_txt), getString(R.string.general_cancel), getString(R.string.quchongzhi_txt));
} else {
actionDialog = new ActionConfirmDialog(TransferAccountsActivity.this,
getString(R.string.lpjfbz_txt), "", "", false);
}
actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
@Override
public void toSumbit() {
if (isJinBi) {
Intent intent = new Intent(TransferAccountsActivity.this, WalletInfoActivity.class);
intent.putExtra("isG", true);
startActivity(intent);
}
}
@Override
public void toCancel() {
}
});
actionDialog.show();
// ActionConfirmDialog actionDialog;
// if (isJinBi) {
// actionDialog = new ActionConfirmDialog(TransferAccountsActivity.this,
// getString(R.string.sfqcz_txt), getString(R.string.general_cancel), getString(R.string.quchongzhi_txt));
// } else {
// actionDialog = new ActionConfirmDialog(TransferAccountsActivity.this,
// getString(R.string.lpjfbz_txt), "", "", false);
// }
// actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
// @Override
// public void toSumbit() {
// if (isJinBi) {
// Intent intent = new Intent(TransferAccountsActivity.this, WalletInfoActivity.class);
// intent.putExtra("isG", true);
// startActivity(intent);
// }
//
// }
//
// @Override
// public void toCancel() {
//
// }
// });
// actionDialog.show();
ToastX.showShortToast(R.string.yebz_txt);
return;

30
app/src/main/java/com/dskj/rbchat/redpack/TransferInfoActivity.java → app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java
View File

@@ -1,5 +1,5 @@
package com.dskj.rbchat.redpack;
package com.hbl.lewan.redpack;
import android.os.Bundle;
import android.text.TextUtils;
@@ -8,22 +8,22 @@ import android.view.View;
import androidx.annotation.Nullable;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.databinding.ActivityTransferInfoBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.StaffServiceIdBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.dskj.rbchat.utils.ShareDateUtils;
import com.hbl.lewan.utils.ShareDateUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;

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

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

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

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

12
app/src/main/java/com/dskj/rbchat/utils/AnimUtil.java → app/src/main/java/com/hbl/lewan/utils/AnimUtil.java
View File

@@ -1,8 +1,8 @@
package com.dskj.rbchat.utils;
package com.hbl.lewan.utils;
import android.view.View;
import com.github.hariprasanths.bounceview.BounceView;
//import com.github.hariprasanths.bounceview.BounceView;
/**
* 控件的点击缩放事件
@@ -13,7 +13,7 @@ public class AnimUtil {
* @param view
*/
public static void setAnimView(View view){
BounceView.addAnimTo(view).setScaleForPushInAnim(1.02f,1.02f).setScaleForPopOutAnim(1.0f,1.0f);
// BounceView.addAnimTo(view).setScaleForPushInAnim(1.02f,1.02f).setScaleForPopOutAnim(1.0f,1.0f);
}
/**
@@ -21,7 +21,7 @@ public class AnimUtil {
* @param view
*/
public static void setAnimView(View view,float inAnim){
BounceView.addAnimTo(view).setScaleForPushInAnim(inAnim,inAnim).setScaleForPopOutAnim(1.0f,1.0f);
// BounceView.addAnimTo(view).setScaleForPushInAnim(inAnim,inAnim).setScaleForPopOutAnim(1.0f,1.0f);
}
@@ -31,7 +31,7 @@ public class AnimUtil {
*/
public static void setAnimViews(View... view){
for (View num : view) {
BounceView.addAnimTo(num).setScaleForPushInAnim(1.02f, 1.02f).setScaleForPopOutAnim(1.0f, 1.0f);
// BounceView.addAnimTo(num).setScaleForPushInAnim(1.02f, 1.02f).setScaleForPopOutAnim(1.0f, 1.0f);
}
}
@@ -41,7 +41,7 @@ public class AnimUtil {
*/
public static void setAnimViews(float inAnim,View... view){
for (View num : view) {
BounceView.addAnimTo(num).setScaleForPushInAnim(inAnim, inAnim).setScaleForPopOutAnim(1.0f, 1.0f);
// BounceView.addAnimTo(num).setScaleForPushInAnim(inAnim, inAnim).setScaleForPopOutAnim(1.0f, 1.0f);
}
}
}

76
app/src/main/java/com/dskj/rbchat/utils/AppUtils.java → app/src/main/java/com/hbl/lewan/utils/AppUtils.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.utils;
package com.hbl.lewan.utils;
import android.app.Activity;
import android.content.Context;
@@ -20,11 +20,11 @@ import com.netease.yunxin.kit.corekit.im.model.UserField;
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.UserInfoProvider;
import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
import com.tencent.mm.opensdk.modelmsg.WXWebpageObject;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
//import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
//import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
//import com.tencent.mm.opensdk.modelmsg.WXWebpageObject;
//import com.tencent.mm.opensdk.openapi.IWXAPI;
//import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import java.text.DecimalFormat;
import java.util.HashMap;
@@ -89,38 +89,38 @@ public class AppUtils {
*/
public static void shareWeb(Context context, String appId, String webUrl, String title, String content, Bitmap bitmap, int scene) {
// 通过appId得到IWXAPI这个对象
IWXAPI wxapi = WXAPIFactory.createWXAPI(context, appId);
// 检查手机或者模拟器是否安装了微信
if (!wxapi.isWXAppInstalled()) {
ToastX.showShortToast("您还没有安装微信");
return;
}
// 初始化一个WXWebpageObject对象
WXWebpageObject webpageObject = new WXWebpageObject();
// 填写网页的url
webpageObject.webpageUrl = webUrl;
// 用WXWebpageObject对象初始化一个WXMediaMessage对象
WXMediaMessage msg = new WXMediaMessage(webpageObject);
// 填写网页标题、描述、位图
msg.title = title;
msg.description = content;
// 如果没有位图，可以传null，会显示默认的图片
msg.setThumbImage(bitmap);
// 构造一个Req
SendMessageToWX.Req req = new SendMessageToWX.Req();
// transaction用于唯一标识一个请求（可自定义）
req.transaction = "webpage";
// 上文的WXMediaMessage对象
req.message = msg;
// SendMessageToWX.Req.WXSceneSession是分享到好友会话
// SendMessageToWX.Req.WXSceneTimeline是分享到朋友圈
req.scene = scene;
// 向微信发送请求
wxapi.sendReq(req);
// IWXAPI wxapi = WXAPIFactory.createWXAPI(context, appId);
// // 检查手机或者模拟器是否安装了微信
// if (!wxapi.isWXAppInstalled()) {
// ToastX.showShortToast("您还没有安装微信");
// return;
// }
//
// // 初始化一个WXWebpageObject对象
// WXWebpageObject webpageObject = new WXWebpageObject();
// // 填写网页的url
// webpageObject.webpageUrl = webUrl;
//
// // 用WXWebpageObject对象初始化一个WXMediaMessage对象
// WXMediaMessage msg = new WXMediaMessage(webpageObject);
// // 填写网页标题、描述、位图
// msg.title = title;
// msg.description = content;
// // 如果没有位图，可以传null，会显示默认的图片
// msg.setThumbImage(bitmap);
//
// // 构造一个Req
// SendMessageToWX.Req req = new SendMessageToWX.Req();
// // transaction用于唯一标识一个请求（可自定义）
// req.transaction = "webpage";
// // 上文的WXMediaMessage对象
// req.message = msg;
// // SendMessageToWX.Req.WXSceneSession是分享到好友会话
// // SendMessageToWX.Req.WXSceneTimeline是分享到朋友圈
// req.scene = scene;
//
// // 向微信发送请求
// wxapi.sendReq(req);
}

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

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

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

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

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

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

19
app/src/main/java/com/dskj/rbchat/utils/DataUtils.java → app/src/main/java/com/hbl/lewan/utils/DataUtils.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.utils;
package com.hbl.lewan.utils;
import android.content.ClipboardManager;
import android.content.Context;
@@ -17,12 +17,13 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.LoginBean;
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.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -162,7 +163,11 @@ public class DataUtils {
// return country;
// }
// }
if(ApiService.AREA_CODE.equals("+86")){
return new CountryBean("+86", context.getString(R.string.zhongguo_txt));
}else{
return new CountryBean("+886",context.getString(R.string.taiwan_txt));
}
}

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

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

30
app/src/main/java/com/dskj/rbchat/utils/FileUtils.java → app/src/main/java/com/hbl/lewan/utils/FileUtils.java
View File

@@ -1,10 +1,16 @@
package com.dskj.rbchat.utils;
package com.hbl.lewan.utils;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.provider.MediaStore;
import com.blankj.utilcode.util.ToastUtils;
import com.dskj.rbchat.model.AiChatUpdateEvent;
import com.dskj.rbchat.model.AiMessageBean;
import com.hbl.lewan.model.AiChatUpdateEvent;
import com.hbl.lewan.model.AiMessageBean;
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -61,4 +67,22 @@ public class FileUtils {
}
}
public static Uri getMediaUriFromPath(String filePath, Context context) {
ContentResolver contentResolver = context.getContentResolver(); // 获取 ContentResolver
Uri uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; // 获取外部存储中的图片 URI
String[] projection = { MediaStore.Images.Media._ID };
// 查询 MediaStore 数据库，找到我们的图片
Cursor cursor = contentResolver.query(uri, projection, MediaStore.Images.Media.DATA + "=?", new String[]{filePath}, null);
if (cursor != null && cursor.moveToFirst()) {
int idColumnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID);
long id = cursor.getLong(idColumnIndex);
uri = ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id); // 构建完整的 URI
cursor.close(); // 关闭 Cursor
}
return uri; // 返回获取的 URI
}
}

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

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

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

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

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

@@ -1,5 +1,5 @@
package com.dskj.rbchat.utils;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
/**

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.utils;
package com.hbl.lewan.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.dskj.rbchat.model.AdBean;
import com.hbl.lewan.model.AdBean;
/**
* Created by Meiji on 2017/5/31.

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

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

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

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

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

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

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

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

20
app/src/main/java/com/dskj/rbchat/utils/QRCodeScheme.java → app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java
View File

@@ -1,5 +1,5 @@
package com.dskj.rbchat.utils;
package com.hbl.lewan.utils;
import android.util.Log;
@@ -15,30 +15,30 @@ public class QRCodeScheme {
private final static String TAG = QRCodeScheme.class.getSimpleName();
/** 2维码内容前缀：扫码添加好友 */
public final static String QR_CODE_SCHEME_ADD_USER = "time_go_chat://add_user/";
public final static String QR_CODE_SCHEME_ADD_USER = "time_go_mm://add_user/";
/** 2维码内容前缀：扫码加群 */
public final static String QR_CODE_PSCHEME_JOIN_GROUP = "time_go_chat://join_group/";
public final static String QR_CODE_PSCHEME_JOIN_GROUP = "time_go_mm://join_group/";
/** 2维码内容前缀：扫码授权登录web端 */
public final static String QR_CODE_PSCHEME_LOGIN_WEB = "time_go_chat://qr_code_login/";
public final static String QR_CODE_PSCHEME_LOGIN_WEB = "time_go_mm://qr_code_login/";
/** 2维码内容前缀：收款前缀 */
public final static String QR_CODE_PSCHEME_PAYMENT_CODE = "time_go_chat://payment_code/";
public final static String QR_CODE_PSCHEME_PAYMENT_CODE = "time_go_mm://payment_code/";
/** 2维码内容前缀：扫码收款 */
public final static String QR_CODE_PSCHEME_PAYMENT_OUTER_CODE = "time_go_chat://payment_outer_code/";
public final static String QR_CODE_PSCHEME_PAYMENT_OUTER_CODE = "time_go_mm://payment_outer_code/";
/** 2维码内容前缀：储币机兑币 */
public final static String QR_CODE_PSCHEME_PAYMENT_ATM = "time_go_chat://payment_atm/";
public final static String QR_CODE_PSCHEME_PAYMENT_ATM = "time_go_mm://payment_atm/";
/** 2维码内容前缀： */
public final static String QR_CODE_PSCHEME_SILVER_QR_CODE = "time_go_chat://silver_qr_code/";
public final static String QR_CODE_PSCHEME_SILVER_QR_CODE = "time_go_mm://silver_qr_code/";
/** 2维码内容前缀：储币机兑币 */
public final static String QR_CODE_PSCHEME_PAYMENT_BEAD = "time_go_chat://payment_bead/";
public final static String QR_CODE_PSCHEME_PAYMENT_BEAD = "time_go_mm://payment_bead/";
/**
* 2维码内容前缀：商家码赠送
*/
public final static String QR_CODE_PSCHEME_BIZ_RECEIVE = "time_go_chat://biz_receive_qr_code/";
public final static String QR_CODE_PSCHEME_BIZ_RECEIVE = "time_go_mm://biz_receive_qr_code/";
public static boolean isAddUserQRCode(String scheme) {
return QR_CODE_SCHEME_ADD_USER.equals(scheme);

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.utils;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.hbl.lewan.IMApplication;
/**
* <pre>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

128
app/src/main/java/com/dskj/rbchat/voom/CircleFragment.java → app/src/main/java/com/hbl/lewan/voom/CircleFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.voom;
import android.app.Activity;
import android.content.Intent;
@@ -25,10 +25,10 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.SimpleItemAnimator;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import com.amap.api.location.AMapLocation;
import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
//import com.amap.api.location.AMapLocation;
//import com.amap.api.location.AMapLocationClient;
//import com.amap.api.location.AMapLocationClientOption;
//import com.amap.api.location.AMapLocationListener;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -39,28 +39,28 @@ 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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentCircleBinding;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ScreenUtils;
import com.dskj.rbchat.widget.CircleImageView;
import com.ethanhua.skeleton.Skeleton;
import com.ethanhua.skeleton.SkeletonScreen;
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.ethanhua.skeleton.Skeleton;
//import com.ethanhua.skeleton.SkeletonScreen;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -79,20 +79,20 @@ import rx.schedulers.Schedulers;
public class CircleFragment extends BaseFragment {
private FragmentCircleBinding binding;
AMapLocation aMapLocation;
//声明AMapLocationClientOption对象
public AMapLocationClientOption mLocationOption = null;
//声明AMapLocationClient类对象
public AMapLocationClient mLocationClient = null;
//声明定位回调监听器
public AMapLocationListener mLocationListener;
// AMapLocation aMapLocation;
// //声明AMapLocationClientOption对象
// public AMapLocationClientOption mLocationOption = null;
// //声明AMapLocationClient类对象
// public AMapLocationClient mLocationClient = null;
// //声明定位回调监听器
// public AMapLocationListener mLocationListener;
public static List<AlbumBean> titles = new ArrayList<>();
static CommonAdapter commonAdapter;
private int categoryId;
StaggeredGridLayoutManager linearLayoutManager;
protected ActivityResultLauncher<String[]> permissionLauncher;
SkeletonScreen skeletonScreen;
// SkeletonScreen skeletonScreen;
public static void changeBean(AlbumBean albumBean, int pos) {
if (titles.size() > pos) {
@@ -102,15 +102,15 @@ public class CircleFragment extends BaseFragment {
}
private void initShowSkeleton() {
skeletonScreen = Skeleton.bind(binding.recyclerview)
.adapter(commonAdapter)
.load(R.layout.discover_child_item_default)
.shimmer(true) // whether show shimmer animation. default is true
.count(10) // the recycler view item count. default is 10
.color(R.color.color_white) // the shimmer color. default is #a2878787
.angle(20) // the shimmer angle. default is 20;
.duration(1500) // the shimmer animation duration. default is 1000;
.frozen(false).show();
// skeletonScreen = Skeleton.bind(binding.recyclerview)
// .adapter(commonAdapter)
// .load(R.layout.discover_child_item_default)
// .shimmer(true) // whether show shimmer animation. default is true
// .count(10) // the recycler view item count. default is 10
// .color(R.color.color_white) // the shimmer color. default is #a2878787
// .angle(20) // the shimmer angle. default is 20;
// .duration(1500) // the shimmer animation duration. default is 1000;
// .frozen(false).show();
}
int type;
@@ -305,24 +305,9 @@ public class CircleFragment extends BaseFragment {
if (s.getType() == 1) {
if (!TextUtils.isEmpty(s.getPicture1())) {
if (s.getPicture1().startsWith("http")) {
if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
// Glide.with(getActivity())
// .load(s.getPicture1().replace("/pic_output/", "/pic_input/"))
// .apply(requestOptions).into(pic_ic);
toUrl(holder, s.getPicture1().replace("/pic_output/", "/pic_input/"));
toUrl(holder, s.getPicture1());
} else {
// Glide.with(getActivity())
// .load(s.getPicture1().replace("/pic_input/", "/pic_output/"))
// .apply(requestOptions).into(pic_ic);
toUrl(holder, s.getPicture1().replace("/pic_input/", "/pic_output/"));
}
} else {
// Glide.with(getActivity())
// .load(ApiService.URL + s.getPicture1())
// .into(pic_ic);
toUrl(holder, ApiService.URL + s.getPicture1());
}
}
@@ -336,20 +321,9 @@ public class CircleFragment extends BaseFragment {
url = ApiService.URL + s.getVideo();
picUrl = url;
} else {
// if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
picUrl = url.replace("video_output", "video_input") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
// } else {
// picUrl = url.replace("video_input", "video_output") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
// }
picUrl = url;
}
// Glide.with(getActivity())
// .load(picUrl)
// .into(pic_ic);
toUrl(holder, picUrl);
toUrl(holder,picUrl+"?vframe/jpg/offset/1");
}
} else {
pic_ic.setVisibility(View.GONE);
@@ -437,7 +411,7 @@ public class CircleFragment extends BaseFragment {
// e.printStackTrace();
// }
Glide.with(getActivity())
.load(s.replace("/pic_output/", "/pic_input/"))
.load(s)
.placeholder(R.mipmap.voom_none_img)
.error(R.mipmap.voom_none_img)
@@ -535,9 +509,9 @@ public class CircleFragment extends BaseFragment {
}
private void changeView() {
if (skeletonScreen != null) {
skeletonScreen.hide();
}
// if (skeletonScreen != null) {
// skeletonScreen.hide();
// }
if (titles == null || titles.size() == 0) {
if (binding.emtryLy.getVisibility() == View.GONE) {
binding.emtryLy.setVisibility(View.VISIBLE);

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentCirclePicBinding;
import com.dskj.rbchat.utils.Constant;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentCirclePicBinding;
import com.hbl.lewan.utils.Constant;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;

43
app/src/main/java/com/dskj/rbchat/voom/CommentFragment.java → app/src/main/java/com/hbl/lewan/voom/CommentFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentCommentBinding;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.CommentBean;
import com.dskj.rbchat.model.RxCommLikeBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
@@ -127,6 +127,7 @@ public class CommentFragment extends BaseFragment {
}
String replyCommentId = null;
boolean isComment = false;
private void toComment(String toString) {
Map<String, Object> map = new HashMap<>();
map.put("postId", albumBean.getPostId());
@@ -137,12 +138,17 @@ public class CommentFragment extends BaseFragment {
if(!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
map.put("substationId", IMUIKitConfig.SUBSTATIONID);
}
if(isComment){
return;
}
isComment = true;
Api.getInstance().postComment(map)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result>() {
@Override
public void onSuccess(Result feedbackResp) {
isComment = false;
binding.commentEt.setText("");
binding.commentEt.setHint(getString(R.string.say_somthing_txt));
replyCommentId = null;
@@ -154,6 +160,7 @@ public class CommentFragment extends BaseFragment {
@Override
public void onError(int code, String msg) {
isComment = false;
ToastX.showShortToast(msg);
}

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentCommentBinding;
import com.dskj.rbchat.databinding.FragmentLikeBinding;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.CommentBean;
import com.dskj.rbchat.model.LikeBean;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.friend.FriendService;
import com.netease.nimlib.sdk.friend.model.Friend;

42
app/src/main/java/com/dskj/rbchat/voom/MessageActivity.java → app/src/main/java/com/hbl/lewan/voom/MessageActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityMessageBinding;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.CirPushMessage;
import com.dskj.rbchat.model.DongTaiActionBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.MessageBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
@@ -122,7 +122,7 @@ public class MessageActivity extends BaseActivity {
RequestOptions requestOptions;
requestOptions = new RequestOptions()
.centerCrop()
.error(R.mipmap.ic_launcher)
.error(R.mipmap.ic_launche)
.skipMemoryCache(false)
.diskCacheStrategy(DiskCacheStrategy.RESOURCE);
linearLayoutManager = new LinearLayoutManager(MessageActivity.this);

316
app/src/main/java/com/dskj/rbchat/voom/PushActivity.java → app/src/main/java/com/hbl/lewan/voom/PushActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.voom;
import android.Manifest;
@@ -28,32 +28,32 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import com.alibaba.sdk.android.oss.ClientException;
import com.alibaba.sdk.android.oss.OSSClient;
import com.alibaba.sdk.android.oss.ServiceException;
import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
import com.alibaba.sdk.android.oss.model.PutObjectResult;
//import com.alibaba.sdk.android.oss.ClientException;
//import com.alibaba.sdk.android.oss.OSSClient;
//import com.alibaba.sdk.android.oss.ServiceException;
//import com.alibaba.sdk.android.oss.callback.OSSCompletedCallback;
//import com.alibaba.sdk.android.oss.common.auth.OSSCredentialProvider;
//import com.alibaba.sdk.android.oss.common.auth.OSSStsTokenCredentialProvider;
//import com.alibaba.sdk.android.oss.model.PutObjectRequest;
//import com.alibaba.sdk.android.oss.model.PutObjectResult;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityPushBinding;
import com.dskj.rbchat.dialog.SelectPushTypeDialog;
import com.dskj.rbchat.model.StsCredentialsBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.ItemDragTouchHelperCallback;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.widget.CircleImageView;
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.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
@@ -78,11 +78,20 @@ 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.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.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;
@@ -274,116 +283,217 @@ public class PushActivity extends BaseActivity {
StsCredentialsBean stsCredentialsBean;
String stsCredentialsBean1;
private void toShangchuanAli() {
showLoadingDialog();
Api.getInstance().stsCredentials()
// Api.getInstance().stsCredentials()
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
// @Override
// public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
// stsCredentialsBean = feedbackResp.data;
// toAliYunOss();
// }
//
// @Override
// public void onError(int code, String msg) {
// dimessLoadingDialog();
// }
// });
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<Result<StsCredentialsBean>>() {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result<StsCredentialsBean> feedbackResp) {
stsCredentialsBean = feedbackResp.data;
toAliYunOss();
public void onSuccess(Result<String> feedbackResp) {
stsCredentialsBean1 = feedbackResp.data;
// toAliYunOss(file, isHead);
toUpdateOssNew(0);
}
@Override
public void onError(int code, String msg) {
dimessLoadingDialog();
dismissLoading();
}
});
}
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;
// 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) {
OSSCredentialProvider credentialProvider = new OSSStsTokenCredentialProvider(accessKeyId, accessKeySecret, securityToken);
OSSClient oss = new OSSClient(getApplicationContext(), endpoint, credentialProvider);
toUpdateOss(bucketName, 0, oss);
}
//
private void toUpdateOss(String bucketName, int i, OSSClient oss) {
String updatePathPic = "pic_input";
String updatePathVideo = "video_input";
// String outputPathPic = "pic_output";
// String outputPathVideo = "video_output";
String outputPathPic = "pic_input";
String outputPathVideo = "video_input";
// Calendar calendar= Calendar.getInstance();
// String year = calendar.get(Calendar.YEAR)+"";
// String month = (calendar.get(Calendar.MONTH)+1)<10?"0"+(calendar.get(Calendar.MONTH)+1):(calendar.get(Calendar.MONTH)+1)+"";
// String d = calendar.get(Calendar.DATE)<10?"0"+calendar.get(Calendar.DAY_OF_MONTH):calendar.get(Calendar.DAY_OF_MONTH)+"";
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);
String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
if (i < uris.size()) {
// File file = new File(uriStrings.get(i));
String fileName = System.currentTimeMillis() + "_" + localMedias.get(i).getFileName();
LogUtils.i("上传文件是啥:" + GsonUtils.beanToJSONString(localMedias.get(i)));
LogUtils.i("上传文件是啥:" + fileName);
// 构造上传请求。
PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
File file = new File(localMedias.get(i).getRealPath());
String fileName = UUID.randomUUID().toString() + "_" + localMedias.get(i).getFileName();
LogUtils.i("结果是啥开始：" + stsCredentialsBean1 + ";;" + file.getAbsolutePath());
String files = "media/" + updatePathPic + "/" + data + "/" + fileName;
if (localMedias.get(0).getMimeType().contains("video")) {
put = new PutObjectRequest(bucketName, "media/" + updatePathVideo + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
files = "media/" + updatePathVideo + "/" + data + "/" + fileName;
}
byte[] sss = convertFileToBytes(file);
LogUtils.i("结果是啥开始：" + sss);
put.setProgressCallback((request, currentSize, totalSize) -> {
LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
// if(isVideo){
// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
// }
});
String finalFiles = files;
uploadManager.put(sss, files, stsCredentialsBean1, (key, info, response) -> {
// LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(info));
LogUtils.i("结果是啥2：" + GsonUtils.beanToJSONString(response));
dismissLoading();
if (info != null && info.isOK()) {
// 上传成功
// outputStrings.add(IMUIKitConfig.OSS_URL + files);
//https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
//OSSAsyncTask task =
oss.asyncPutObject(put, new OSSCompletedCallback<>() {
@Override
public void onSuccess(PutObjectRequest request, PutObjectResult result) {
LogUtils.i("PutObject", "UploadSuccess");
LogUtils.i("ETag", result.getETag());
LogUtils.i("RequestId", result.getRequestId());
LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
if (localMedias.get(0).getMimeType().contains("video")) {
outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + outputPathVideo + "/" + data + "/" + fileName);
outputStrings.add(IMUIKitConfig.OSS_URL + finalFiles);
} else {
outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + outputPathPic + "/" + data + "/" + fileName);
outputStrings.add(IMUIKitConfig.OSS_URL + finalFiles);
}
//https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
if (i == uris.size() - 1) {
toPush();
} else {
toUpdateOss(bucketName, i + 1, oss);
toUpdateOssNew( i + 1);
}
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
}
}, options);
}
}
@Override
public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
dimessLoadingDialog();
LogUtils.i("ErrorCode", clientExcepion.getMessage());
public static byte[] convertFileToBytes(File file) {
// 使用ByteArrayOutputStream来收集字节数据
FileInputStream fis = null;
try {
fis = new FileInputStream(file);
byte[] bytesArray = new byte[(int) file.length()];
fis.read(bytesArray);
fis.close();
return bytesArray;
} catch (FileNotFoundException e) {
// throw new RuntimeException(e);
return null;
} catch (IOException e) {
// throw new RuntimeException(e);
return null;
// 请求异常。
if (clientExcepion != null) {
// 本地异常，如网络异常等。
clientExcepion.printStackTrace();
}
if (serviceException != null) {
// 服务异常。
LogUtils.i("ErrorCode", serviceException.getErrorCode());
LogUtils.i("RequestId", serviceException.getRequestId());
LogUtils.i("HostId", serviceException.getHostId());
LogUtils.i("RawMessage", serviceException.getRawMessage());
}
}
});
}
}
//
//
// //
// private void toUpdateOss(String bucketName, int i, OSSClient oss) {
// String updatePathPic = "pic_input";
// String updatePathVideo = "video_input";
//// String outputPathPic = "pic_output";
//// String outputPathVideo = "video_output";
// String outputPathPic = "pic_input";
// String outputPathVideo = "video_input";
//// Calendar calendar= Calendar.getInstance();
//// String year = calendar.get(Calendar.YEAR)+"";
//// String month = (calendar.get(Calendar.MONTH)+1)<10?"0"+(calendar.get(Calendar.MONTH)+1):(calendar.get(Calendar.MONTH)+1)+"";
//// String d = calendar.get(Calendar.DATE)<10?"0"+calendar.get(Calendar.DAY_OF_MONTH):calendar.get(Calendar.DAY_OF_MONTH)+"";
//
// String data = DataUtils.getCurrentTimeTypeNoline(System.currentTimeMillis());
// if (i < uris.size()) {
//
//// File file = new File(uriStrings.get(i));
// String fileName = System.currentTimeMillis() + "_" + localMedias.get(i).getFileName();
// LogUtils.i("上传文件是啥:" + GsonUtils.beanToJSONString(localMedias.get(i)));
// LogUtils.i("上传文件是啥:" + fileName);
//
// // 构造上传请求。
// PutObjectRequest put = new PutObjectRequest(bucketName, "media/" + updatePathPic + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
//
// if (localMedias.get(0).getMimeType().contains("video")) {
// put = new PutObjectRequest(bucketName, "media/" + updatePathVideo + "/" + data + "/" + fileName, localMedias.get(i).getRealPath());
// }
//
// put.setProgressCallback((request, currentSize, totalSize) -> {
// LogUtils.i("PutObject", "currentSize: " + currentSize + " totalSize: " + totalSize);
//// if(isVideo){
//// showLoadingDialog(("正在上传"+(currentSize*100)/totalSize)+"%");
//// }
// });
//
// //OSSAsyncTask task =
// oss.asyncPutObject(put, new OSSCompletedCallback<>() {
// @Override
// public void onSuccess(PutObjectRequest request, PutObjectResult result) {
// LogUtils.i("PutObject", "UploadSuccess");
// LogUtils.i("ETag", result.getETag());
// LogUtils.i("RequestId", result.getRequestId());
// LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(result));
// if (localMedias.get(0).getMimeType().contains("video")) {
// outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + outputPathVideo + "/" + data + "/" + fileName);
// } else {
// outputStrings.add(IMUIKitConfig.OSS_URL + "media/" + outputPathPic + "/" + data + "/" + fileName);
// }
// //https://shenqi777.oss-cn-hongkong.aliyuncs.com/qtalk/pic_output/20230914/null_false53.jpg
// if (i == uris.size() - 1) {
// toPush();
// } else {
// toUpdateOss(bucketName, i + 1, oss);
// }
// }
//
// @Override
// public void onFailure(PutObjectRequest request, ClientException clientExcepion, ServiceException serviceException) {
// dimessLoadingDialog();
// LogUtils.i("ErrorCode", clientExcepion.getMessage());
//
// // 请求异常。
// if (clientExcepion != null) {
// // 本地异常，如网络异常等。
// clientExcepion.printStackTrace();
// }
// if (serviceException != null) {
// // 服务异常。
// LogUtils.i("ErrorCode", serviceException.getErrorCode());
// LogUtils.i("RequestId", serviceException.getRequestId());
// LogUtils.i("HostId", serviceException.getHostId());
// LogUtils.i("RawMessage", serviceException.getRawMessage());
// }
// }
// });
// }
// }
private void toPush() {
LogUtils.i("上传的数据：" + GsonUtils.beanToJSONString(outputStrings));
@@ -405,10 +515,6 @@ public class PushActivity extends BaseActivity {
map.add(text);
}
if (localMedias.get(0).getMimeType().contains("video")) {
// File file = new File(uriStrings.get(0));
// RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
// MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("video", file.getName(), imageBody);
// map.add(imageBodyPart);
MultipartBody.Part text = MultipartBody.Part.createFormData("video", outputStrings.get(0));
map.add(text);
@@ -416,10 +522,6 @@ public class PushActivity extends BaseActivity {
uriStrings = commonAdapter.getDates();
for (int i = 0; i < uris.size(); i++) {
// File file = new File(uriStrings.get(i));
// RequestBody imageBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
// MultipartBody.Part imageBodyPart = MultipartBody.Part.createFormData("picture"+(i+1), file.getName(), imageBody);
// map.add(imageBodyPart);
MultipartBody.Part text = MultipartBody.Part.createFormData("picture" + (i + 1), outputStrings.get(i));
map.add(text);
}

66
app/src/main/java/com/dskj/rbchat/voom/TiktoInfokActivity.java → app/src/main/java/com/hbl/lewan/voom/TiktoInfokActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.contact.ReportActivity;
import com.dskj.rbchat.contact.UserInfoActivity;
import com.dskj.rbchat.databinding.ActivityTiktokinfoBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.RxCommLikeBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
@@ -260,7 +260,7 @@ public class TiktoInfokActivity extends BaseActivity {
//// picUrl = url.replace("video_output", "video_input") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
//// url = url.replace("video_input", "video_output");
// }
url = url.replace("/video_output/", "/video_input/");
// url = url.replace("/video_output/", "/video_input/");
LogUtils.i("播放地址是啥："+url);
binding.tiktok.mVideoView.setVideoURI(Uri.parse(url));
@@ -332,7 +332,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture1())){
if(dongtaiBean.getPicture1().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture1().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture1());
// }else{
// titles.add(dongtaiBean.getPicture1().replace("/pic_input/","/pic_output/"));
// }
@@ -343,7 +343,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture2())){
if(dongtaiBean.getPicture2().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture2().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture2());
// }else{
// titles.add(dongtaiBean.getPicture2().replace("/pic_input/","/pic_output/"));
// }
@@ -355,7 +355,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture3())){
if(dongtaiBean.getPicture3().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture3().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture3());
// }else{
// titles.add(dongtaiBean.getPicture3().replace("/pic_input/","/pic_output/"));
// }
@@ -366,7 +366,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture4())){
if(dongtaiBean.getPicture4().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture4().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture4());
// }else{
// titles.add(dongtaiBean.getPicture4().replace("/pic_input/","/pic_output/"));
// }
@@ -377,7 +377,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture5())){
if(dongtaiBean.getPicture5().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture5().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture5());
// }else{
// titles.add(dongtaiBean.getPicture5().replace("/pic_input/","/pic_output/"));
// }
@@ -388,7 +388,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture6())){
if(dongtaiBean.getPicture6().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture6().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture6());
// }else{
// titles.add(dongtaiBean.getPicture6().replace("/pic_input/","/pic_output/"));
// }
@@ -399,7 +399,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture7())){
if(dongtaiBean.getPicture7().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture7().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture7());
// }else{
// titles.add(dongtaiBean.getPicture7().replace("/pic_input/","/pic_output/"));
// }
@@ -410,7 +410,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture8())){
if(dongtaiBean.getPicture8().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture8().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture8());
// }else{
// titles.add(dongtaiBean.getPicture8().replace("/pic_input/","/pic_output/"));
// }
@@ -421,7 +421,7 @@ public class TiktoInfokActivity extends BaseActivity {
if(!TextUtils.isEmpty(dongtaiBean.getPicture9())){
if(dongtaiBean.getPicture9().startsWith("http")){
// if(System.currentTimeMillis()-timeDa< IMUIKitConfig.MOMENTS_SOURCE_TIME) {
titles.add(dongtaiBean.getPicture9().replace("/pic_output/","/pic_input/"));
titles.add(dongtaiBean.getPicture9());
// }else{
// titles.add(dongtaiBean.getPicture9().replace("/pic_input/","/pic_output/"));
// }

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMApplication;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.contact.ReportActivity;
import com.dskj.rbchat.contact.UserInfoActivity;
import com.dskj.rbchat.databinding.ActivityTiktokBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.RxCommLikeBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.Constant;
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.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.voom.comm.CircleFragment1;
import com.dskj.rbchat.voom.comm.CircleFragment2;
import com.dskj.rbchat.voom.comm.CusVideoView;
import com.dskj.rbchat.voom.comm.OnViewPagerListener;
import com.dskj.rbchat.voom.comm.TiktokAdapter;
import com.dskj.rbchat.voom.comm.ViewPagerLayoutManager;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.contact.ReportActivity;
import com.dskj.rbchat.contact.UserInfoActivity;
import com.dskj.rbchat.databinding.ActivityTiktokBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
import com.dskj.rbchat.model.RxCommLikeBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.voom.comm.CircleFragment1;
import com.dskj.rbchat.voom.comm.CircleFragment2;
import com.dskj.rbchat.voom.comm.CusVideoView;
import com.dskj.rbchat.voom.comm.OnViewPagerListener;
import com.dskj.rbchat.voom.comm.TiktokAdapterMe;
import com.dskj.rbchat.voom.comm.ViewPagerLayoutManager;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;

32
app/src/main/java/com/dskj/rbchat/voom/VoomFragment.java → app/src/main/java/com/hbl/lewan/voom/VoomFragment.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentVoomBinding;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.MessageBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.comm.CircleFragment1;
import com.dskj.rbchat.voom.comm.CircleFragment2;
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.google.android.material.tabs.TabLayoutMediator;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
@@ -46,7 +46,7 @@ public class VoomFragment extends BaseFragment {
private List<Fragment> listFragment;
private CircleFragment discoverFragment;
private CircleFragment1 momentsFragment;
private CircleFragment2 nearbyFragment;
// private CircleFragment2 nearbyFragment;
@Nullable
@Override
public View onCreateView(
@@ -74,7 +74,7 @@ public class VoomFragment extends BaseFragment {
listFragment = new ArrayList<>();
listFragment.add(discoverFragment=CircleFragment.newInstance(0));
listFragment.add(momentsFragment= CircleFragment1.newInstance(1));
listFragment.add(nearbyFragment= CircleFragment2.newInstance(3));
// listFragment.add(nearbyFragment= CircleFragment2.newInstance(3));
CommunityAdapter adapter = new CommunityAdapter(getActivity(), titles, listFragment);
binding.viewpager.setAdapter(adapter);
//把TabLayout（选项卡布局）和ViewPager2绑定在一起。特别说明一下，下面这行代码是官方给的，特别好使。

213
app/src/main/java/com/dskj/rbchat/voom/comm/CircleFragment1.java → app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment1.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom.comm;
package com.hbl.lewan.voom.comm;
import android.app.Activity;
import android.content.Intent;
@@ -23,10 +23,10 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import com.amap.api.location.AMapLocation;
import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
//import com.amap.api.location.AMapLocation;
//import com.amap.api.location.AMapLocationClient;
//import com.amap.api.location.AMapLocationClientOption;
//import com.amap.api.location.AMapLocationListener;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -37,29 +37,29 @@ 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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentCircleBinding;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ScreenUtils;
import com.dskj.rbchat.voom.TiktokActivity;
import com.dskj.rbchat.widget.CircleImageView;
import com.ethanhua.skeleton.Skeleton;
import com.ethanhua.skeleton.SkeletonScreen;
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.ethanhua.skeleton.Skeleton;
//import com.ethanhua.skeleton.SkeletonScreen;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -77,21 +77,21 @@ import rx.schedulers.Schedulers;
public class CircleFragment1 extends BaseFragment {
private FragmentCircleBinding binding;
AMapLocation aMapLocation;
//声明AMapLocationClientOption对象
public AMapLocationClientOption mLocationOption = null;
//声明AMapLocationClient类对象
public AMapLocationClient mLocationClient = null;
//声明定位回调监听器
public AMapLocationListener mLocationListener;
//
// AMapLocation aMapLocation;
// //声明AMapLocationClientOption对象
// public AMapLocationClientOption mLocationOption = null;
// //声明AMapLocationClient类对象
// public AMapLocationClient mLocationClient = null;
// //声明定位回调监听器
// public AMapLocationListener mLocationListener;
public static List<AlbumBean> titles = new ArrayList<>();
static CommonAdapter commonAdapter;
private int categoryId;
StaggeredGridLayoutManager linearLayoutManager;
protected ActivityResultLauncher<String[]> permissionLauncher;
SkeletonScreen skeletonScreen;
// SkeletonScreen skeletonScreen;
public static void changeBean(AlbumBean albumBean,int pos){
if(titles.size()>pos){
@@ -101,15 +101,15 @@ public class CircleFragment1 extends BaseFragment {
}
private void initShowSkeleton() {
skeletonScreen = Skeleton.bind(binding.recyclerview)
.adapter(commonAdapter)
.load(R.layout.discover_child_item_default)
.shimmer(true) // whether show shimmer animation. default is true
.count(10) // the recycler view item count. default is 10
.color(R.color.color_white) // the shimmer color. default is #a2878787
.angle(20) // the shimmer angle. default is 20;
.duration(1500) // the shimmer animation duration. default is 1000;
.frozen(false).show();
// skeletonScreen = Skeleton.bind(binding.recyclerview)
// .adapter(commonAdapter)
// .load(R.layout.discover_child_item_default)
// .shimmer(true) // whether show shimmer animation. default is true
// .count(10) // the recycler view item count. default is 10
// .color(R.color.color_white) // the shimmer color. default is #a2878787
// .angle(20) // the shimmer angle. default is 20;
// .duration(1500) // the shimmer animation duration. default is 1000;
// .frozen(false).show();
}
int type;
@@ -316,27 +316,13 @@ public class CircleFragment1 extends BaseFragment {
if (s.getType() == 1) {
if(!TextUtils.isEmpty(s.getPicture1())) {
if (s.getPicture1().startsWith("http")) {
if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
// Glide.with(getActivity())
// .load(s.getPicture1().replace("/pic_output/", "/pic_input/"))
// .apply(requestOptions).into(pic_ic);
toUrl(holder,s.getPicture1().replace("/pic_output/", "/pic_input/"));
toUrl(holder, s.getPicture1());
} else {
// Glide.with(getActivity())
// .load(s.getPicture1().replace("/pic_input/", "/pic_output/"))
// .apply(requestOptions).into(pic_ic);
toUrl(holder,s.getPicture1().replace("/pic_input/", "/pic_output/"));
toUrl(holder, ApiService.URL + s.getPicture1());
}
} else {
// Glide.with(getActivity())
// .load(ApiService.URL + s.getPicture1())
// .into(pic_ic);
toUrl(holder,ApiService.URL + s.getPicture1());
}
}
} else if (s.getType() == 2) {
String url = s.getVideo();
String picUrl = "";
@@ -347,19 +333,9 @@ public class CircleFragment1 extends BaseFragment {
url = ApiService.URL + s.getVideo();
picUrl = url;
} else {
// if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
picUrl = url.replace("video_output", "video_input") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
// } else {
// picUrl = url.replace("video_input", "video_output") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
// }
picUrl = url;
}
// Glide.with(getActivity())
// .load(picUrl)
// .into(pic_ic);
toUrl(holder,picUrl);
toUrl(holder,picUrl+"?vframe/jpg/offset/1");
}
}else{
pic_ic.setVisibility(View.GONE);
@@ -384,91 +360,10 @@ public class CircleFragment1 extends BaseFragment {
private void toUrl(ViewHolder holder, String s) {
ImageView pic_ic = holder.getView(R.id.pic_ic);
// try {
// Glide.with(getActivity())
// .asBitmap()
// .load(s)
// .placeholder(R.mipmap.voom_none_img)
// .error(R.mipmap.voom_none_img)
// .listener(new RequestListener<Bitmap>() {
// @Override
// public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
// Glide.with(getActivity())
// .asBitmap()
// .load(s.replace("/pic_output/", "/pic_input/"))
// .placeholder(R.mipmap.voom_none_img)
// .error(R.mipmap.voom_none_img)
// .into(new SimpleTarget<Bitmap>() {
// public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition<? super Bitmap> transition) {
// //这个bitmap就是你图片url加载得到的结果
//// //获取bitmap信息，可赋值给外部变量操作，也可在此时行操作。
// ViewGroup.LayoutParams layoutParams = (ViewGroup.LayoutParams)pic_ic.getLayoutParams();//获取你要填充图片的布局的layoutParam
// //因为是2列,所以宽度是屏幕的一半,高度是根据bitmap的高/宽*屏幕宽的一半
// layoutParams.width = (ScreenUtils.getScreenWidth()- AdaptScreenUtils.pt2Px(0)) / 2;//这个是布局的宽度
//
// layoutParams.height = (int) ((float) bitmap.getHeight() / (float) bitmap.getWidth() * layoutParams.width- AdaptScreenUtils.pt2Px(5) );
//
// pic_ic.setLayoutParams(layoutParams);//容器的宽高设置好了
// // 然后在改变一下bitmap的宽高
// (pic_ic).setImageBitmap(bitmap);
// }
//
//
// });
// return false;
// }
//
// @Override
// public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
// return false;
// }
// })
// .into(new SimpleTarget<Bitmap>() {
// public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition<? super Bitmap> transition) {
// //这个bitmap就是你图片url加载得到的结果
//// //获取bitmap信息，可赋值给外部变量操作，也可在此时行操作。
// ViewGroup.LayoutParams layoutParams = (ViewGroup.LayoutParams)pic_ic.getLayoutParams();//获取你要填充图片的布局的layoutParam
// //因为是2列,所以宽度是屏幕的一半,高度是根据bitmap的高/宽*屏幕宽的一半
// layoutParams.width = (ScreenUtils.getScreenWidth()- AdaptScreenUtils.pt2Px(0)) / 2;//这个是布局的宽度
//
// layoutParams.height = (int) ((float) bitmap.getHeight() / (float) bitmap.getWidth() * layoutParams.width- AdaptScreenUtils.pt2Px(5) );
//
// pic_ic.setLayoutParams(layoutParams);//容器的宽高设置好了
// // 然后在改变一下bitmap的宽高
// (pic_ic).setImageBitmap(bitmap);
// }
//
//
// });
//
// }catch (Exception e){
// e.printStackTrace();
// }
Glide.with(getActivity())
.load(s.replace("/pic_output/", "/pic_input/"))
.load(s)
.placeholder(R.mipmap.voom_none_img)
.error(R.mipmap.voom_none_img)
// .listener(new RequestListener<Drawable>() {
// @Override
// public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
// try {
// Glide.with(getActivity())
// .load(s.replace("/pic_output/", "/pic_input/"))
// .placeholder(R.mipmap.voom_none_img)
// .error(R.mipmap.voom_none_img)
// .into(pic_ic);
// }catch (Exception ee){
//
// }
//
// return false;
// }
//
// @Override
// public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
// return false;
// }
// })
.into(pic_ic);
}
@@ -542,9 +437,9 @@ public class CircleFragment1 extends BaseFragment {
}
private void changeView() {
if(skeletonScreen!=null) {
skeletonScreen.hide();
}
// if(skeletonScreen!=null) {
// skeletonScreen.hide();
// }
if (titles == null || titles.size() == 0) {
if(binding.emtryLy.getVisibility() == View.GONE) {
binding.emtryLy.setVisibility(View.VISIBLE);

233
app/src/main/java/com/dskj/rbchat/voom/comm/CircleFragment2.java → app/src/main/java/com/hbl/lewan/voom/comm/CircleFragment2.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.voom.comm;
package com.hbl.lewan.voom.comm;
import android.Manifest;
import android.app.Activity;
@@ -25,10 +25,10 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import com.amap.api.location.AMapLocation;
import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
//import com.amap.api.location.AMapLocation;
//import com.amap.api.location.AMapLocationClient;
//import com.amap.api.location.AMapLocationClientOption;
//import com.amap.api.location.AMapLocationListener;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -39,28 +39,28 @@ 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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentCircleBinding;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ScreenUtils;
import com.dskj.rbchat.voom.TiktokActivity;
import com.dskj.rbchat.widget.CircleImageView;
import com.ethanhua.skeleton.Skeleton;
import com.ethanhua.skeleton.SkeletonScreen;
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.ethanhua.skeleton.Skeleton;
//import com.ethanhua.skeleton.SkeletonScreen;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -82,20 +82,20 @@ import rx.schedulers.Schedulers;
public class CircleFragment2 extends BaseFragment {
private FragmentCircleBinding binding;
AMapLocation aMapLocation;
//声明AMapLocationClientOption对象
public AMapLocationClientOption mLocationOption = null;
//声明AMapLocationClient类对象
public AMapLocationClient mLocationClient = null;
//声明定位回调监听器
public AMapLocationListener mLocationListener;
// AMapLocation aMapLocation;
// //声明AMapLocationClientOption对象
// public AMapLocationClientOption mLocationOption = null;
// //声明AMapLocationClient类对象
// public AMapLocationClient mLocationClient = null;
// //声明定位回调监听器
// public AMapLocationListener mLocationListener;
public static List<AlbumBean> titles = new ArrayList<>();
static CommonAdapter commonAdapter;
private int categoryId;
StaggeredGridLayoutManager linearLayoutManager;
protected ActivityResultLauncher<String[]> permissionLauncher;
SkeletonScreen skeletonScreen;
// SkeletonScreen skeletonScreen;
public static void changeBean(AlbumBean albumBean,int pos){
if(titles.size()>pos){
@@ -105,15 +105,15 @@ public class CircleFragment2 extends BaseFragment {
}
private void initShowSkeleton() {
skeletonScreen = Skeleton.bind(binding.recyclerview)
.adapter(commonAdapter)
.load(R.layout.discover_child_item_default)
.shimmer(true) // whether show shimmer animation. default is true
.count(10) // the recycler view item count. default is 10
.color(R.color.color_white) // the shimmer color. default is #a2878787
.angle(20) // the shimmer angle. default is 20;
.duration(1500) // the shimmer animation duration. default is 1000;
.frozen(false).show();
// skeletonScreen = Skeleton.bind(binding.recyclerview)
// .adapter(commonAdapter)
// .load(R.layout.discover_child_item_default)
// .shimmer(true) // whether show shimmer animation. default is true
// .count(10) // the recycler view item count. default is 10
// .color(R.color.color_white) // the shimmer color. default is #a2878787
// .angle(20) // the shimmer angle. default is 20;
// .duration(1500) // the shimmer animation duration. default is 1000;
// .frozen(false).show();
}
int type;
@@ -252,62 +252,62 @@ public class CircleFragment2 extends BaseFragment {
private void toLocation() {
//设置定位回调监听
mLocationListener = amapLocation -> {
if (amapLocation != null) {
if (amapLocation.getErrorCode() == 0) {
if (aMapLocation == null) {
aMapLocation = amapLocation;
}
binding.refreshLayout.setVisibility(View.VISIBLE);
binding.dingweiRy.setVisibility(View.GONE);
binding.refreshLayout.autoRefresh();
//可在其中解析amapLocation获取相应内容。
LogUtils.i("定位位置：" + amapLocation.getLatitude() + ";;" + amapLocation.getLongitude() + ";"
+ amapLocation.getAddress() + ";" + amapLocation.getCountry() + ";" + amapLocation.getCity() + ";");
} else {
//定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
LogUtils.i("AmapError location Error, ErrCode:"
+ amapLocation.getErrorCode() + ", errInfo:"
+ amapLocation.getErrorInfo());
}
} else {
LogUtils.i("定位数据为空");
}
};
//初始化AMapLocationClientOption对象
mLocationOption = new AMapLocationClientOption();
mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
mLocationOption.setOnceLocation(true);
mLocationOption.setOnceLocationLatest(true);
mLocationOption.setHttpTimeOut(20000);
mLocationOption.setLocationCacheEnable(false);
//初始化定位
try {
mLocationClient = new AMapLocationClient(getActivity());
mLocationClient.setLocationOption(mLocationOption);
mLocationClient.setLocationListener(mLocationListener);
mLocationClient.startLocation();
} catch (Exception e) {
e.printStackTrace();
}
// //设置定位回调监听
// mLocationListener = amapLocation -> {
// if (amapLocation != null) {
// if (amapLocation.getErrorCode() == 0) {
// if (aMapLocation == null) {
// aMapLocation = amapLocation;
// }
// binding.refreshLayout.setVisibility(View.VISIBLE);
// binding.dingweiRy.setVisibility(View.GONE);
// binding.refreshLayout.autoRefresh();
// //可在其中解析amapLocation获取相应内容。
// LogUtils.i("定位位置：" + amapLocation.getLatitude() + ";;" + amapLocation.getLongitude() + ";"
// + amapLocation.getAddress() + ";" + amapLocation.getCountry() + ";" + amapLocation.getCity() + ";");
// } else {
// //定位失败时，可通过ErrCode（错误码）信息来确定失败的原因，errInfo是错误信息，详见错误码表。
//
// LogUtils.i("AmapError location Error, ErrCode:"
// + amapLocation.getErrorCode() + ", errInfo:"
// + amapLocation.getErrorInfo());
//
// }
// } else {
//
// LogUtils.i("定位数据为空");
//
// }
// };
//
// //初始化AMapLocationClientOption对象
// mLocationOption = new AMapLocationClientOption();
// mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
// mLocationOption.setOnceLocation(true);
// mLocationOption.setOnceLocationLatest(true);
// mLocationOption.setHttpTimeOut(20000);
// mLocationOption.setLocationCacheEnable(false);
//
// //初始化定位
// try {
// mLocationClient = new AMapLocationClient(getActivity());
// mLocationClient.setLocationOption(mLocationOption);
// mLocationClient.setLocationListener(mLocationListener);
// mLocationClient.startLocation();
// } catch (Exception e) {
// e.printStackTrace();
// }
}
private void initLocation() {
if (aMapLocation != null) {
getDateList();
} else {
LogUtils.i("111111111111111111");
showLoc();
}
// if (aMapLocation != null) {
// getDateList();
// } else {
// LogUtils.i("111111111111111111");
// showLoc();
// }
}
@@ -437,22 +437,8 @@ public class CircleFragment2 extends BaseFragment {
if (s.getType() == 1) {
if(!TextUtils.isEmpty(s.getPicture1())) {
if (s.getPicture1().startsWith("http")) {
if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
// Glide.with(getActivity())
// .load(s.getPicture1().replace("/pic_output/", "/pic_input/"))
// .apply(requestOptions).into(pic_ic);
toUrl(holder,s.getPicture1().replace("/pic_output/", "/pic_input/"));
toUrl(holder,s.getPicture1());
} else {
// Glide.with(getActivity())
// .load(s.getPicture1().replace("/pic_input/", "/pic_output/"))
// .apply(requestOptions).into(pic_ic);
toUrl(holder,s.getPicture1().replace("/pic_input/", "/pic_output/"));
}
} else {
// Glide.with(getActivity())
// .load(ApiService.URL + s.getPicture1())
// .into(pic_ic);
toUrl(holder,ApiService.URL + s.getPicture1());
}
@@ -468,19 +454,10 @@ public class CircleFragment2 extends BaseFragment {
url = ApiService.URL + s.getVideo();
picUrl = url;
} else {
// if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
picUrl = url.replace("video_output", "video_input") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
// } else {
// picUrl = url.replace("video_input", "video_output") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
// }
picUrl = url;
}
// Glide.with(getActivity())
// .load(picUrl)
// .into(pic_ic);
toUrl(holder,picUrl);
toUrl(holder,picUrl+"?vframe/jpg/offset/1");
}
}else{
@@ -608,10 +585,10 @@ public class CircleFragment2 extends BaseFragment {
maps.put("page", pageSize);
maps.put("size", 30);
maps.put("selectType", type);
if ( aMapLocation != null) {
maps.put("longitude", aMapLocation.getLongitude());
maps.put("latitude", aMapLocation.getLatitude());
}
// if ( aMapLocation != null) {
// maps.put("longitude", aMapLocation.getLongitude());
// maps.put("latitude", aMapLocation.getLatitude());
// }
maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
Api.getInstance().posts(maps)
@@ -659,9 +636,9 @@ public class CircleFragment2 extends BaseFragment {
}
private void changeView() {
if(skeletonScreen!=null) {
skeletonScreen.hide();
}
// if(skeletonScreen!=null) {
// skeletonScreen.hide();
// }
if (titles == null || titles.size() == 0) {
if(binding.emtryLy.getVisibility() == View.GONE) {
binding.emtryLy.setVisibility(View.VISIBLE);

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

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

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

@@ -1,4 +1,4 @@
//package com.dskj.rbchat.voom.comm;
//package com.hbl.lewan.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.dskj.rbchat.utils.StickyTopicScroller;
//import com.hbl.lewan.utils.StickyTopicScroller;
//
///**
// * 作者：created by Jarchie

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

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

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

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

34
app/src/main/java/com/dskj/rbchat/voom/comm/TiktokAdapter.java → app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapter.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.voom.comm;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.CircleFragment;
import com.dskj.rbchat.voom.CirclePicFragment;
import com.dskj.rbchat.voom.TiktokActivity;
import com.dskj.rbchat.widget.CircleImageView;
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.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
@@ -296,14 +296,14 @@ public class TiktokAdapter extends RecyclerView.Adapter<TiktokAdapter.ViewHolder
url = ApiService.URL + albumBean.getVideo();
picUrl = url;
} else {
picUrl = url.replace("video_input", "video_output") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
picUrl = url+ "?vframe/jpg/offset/1";
}
Glide.with(holder.mThumb.getContext())
.load(R.mipmap.zhifuzhong_img)
.into(holder.mThumb);
// long timeDa = DataUtils.dateToStamp(albumBean.getCreateTime());
// if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
url = url.replace("/video_output/", "/video_input/");
// url = url;
holder.mVideoView.setVideoURI(Uri.parse(url));
// } else {
//// url = url.replace("/video_input/", "/video_output/");

34
app/src/main/java/com/dskj/rbchat/voom/comm/TiktokAdapterMe.java → app/src/main/java/com/hbl/lewan/voom/comm/TiktokAdapterMe.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.voom.comm;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.model.AlbumBean;
import com.dskj.rbchat.model.RxBusLoadMoreListBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.ApiService;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.CirclePicFragment;
import com.dskj.rbchat.voom.TiktoInfokActivity;
import com.dskj.rbchat.voom.TiktokActivityMe;
import com.dskj.rbchat.widget.CircleImageView;
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.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -274,14 +274,14 @@ public class TiktokAdapterMe extends RecyclerView.Adapter<TiktokAdapterMe.ViewHo
url = ApiService.URL + albumBean.getVideo();
picUrl = url;
} else {
picUrl = url.replace("video_input", "video_output") + "?x-oss-process=video/snapshot,t_7000,w_300,h_400,f_jpg,m_fast";
picUrl = url+ "?vframe/jpg/offset/1";
}
Glide.with(holder.mThumb.getContext())
.load(R.mipmap.zhifuzhong_img)
.into(holder.mThumb);
// long timeDa = DataUtils.dateToStamp(albumBean.getCreateTime());
// if (System.currentTimeMillis() - timeDa < IMUIKitConfig.MOMENTS_SOURCE_TIME) {
url = url.replace("/video_output/", "/video_input/");
// url = url.replace("/video_output/", "/video_input/");
holder.mVideoView.setVideoURI(Uri.parse(url));
// } else {
//// url = url.replace("/video_input/", "/video_output/");

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

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

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

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

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.wallet;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentWalletInfo1Binding;
import com.dskj.rbchat.databinding.FragmentWalletInfoBinding;
import com.dskj.rbchat.dialog.SelectTypeDialog;
import com.dskj.rbchat.model.BillBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.StatisticsBean;
import com.dskj.rbchat.model.TaskBean;
import com.dskj.rbchat.model.TypeBean;
import com.dskj.rbchat.model.WithdrawCashBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;

24
app/src/main/java/com/dskj/rbchat/wallet/PayPasswordActivity.java → app/src/main/java/com/hbl/lewan/wallet/PayPasswordActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.wallet;
package com.hbl.lewan.wallet;
import android.content.Intent;
import android.os.Bundle;
@@ -13,18 +13,18 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.dskj.rbchat.custom.PasswordEditText;
import com.dskj.rbchat.databinding.ActivityChangePaypasswordBinding;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.KeyboardUtil;
import com.dskj.rbchat.utils.LogUtils;
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.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

52
app/src/main/java/com/dskj/rbchat/wallet/PaySettingActivity.java → app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.wallet;
package com.hbl.lewan.wallet;
import static com.blankj.utilcode.util.SnackbarUtils.dismiss;
import static com.codersun.fingerprintcompat.FingerManager.SupportResult.DEVICE_UNSUPPORTED;
@@ -22,31 +22,31 @@ import androidx.annotation.RequiresApi;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
import com.codersun.fingerprintcompat.SimpleFingerCheckCallback;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityCollectionAndPaymentBinding;
import com.dskj.rbchat.databinding.ActivityPaySettingBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.dialog.MianMiDialog;
import com.dskj.rbchat.dialog.MianMiXieyiDialog;
import com.dskj.rbchat.dialog.PayCashFingerDialog;
import com.dskj.rbchat.dialog.PayDialog;
import com.dskj.rbchat.dialog.SelectPayTypeDialog;
import com.dskj.rbchat.game.JsBridgeActivity;
import com.dskj.rbchat.login.RegisterActivity;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.TopUpBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.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.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;

38
app/src/main/java/com/dskj/rbchat/wallet/SetPayPasswordActivity.java → app/src/main/java/com/hbl/lewan/wallet/SetPayPasswordActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.wallet;
package com.hbl.lewan.wallet;
import android.app.Activity;
@@ -22,24 +22,24 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityChongzhiBinding;
import com.dskj.rbchat.databinding.ActivityChongzhiPayBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.login.LoginActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.CountryBean;
import com.dskj.rbchat.model.RegisteredBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.welcome.WelcomeActivity;
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.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;

40
app/src/main/java/com/dskj/rbchat/wallet/TopUpActivity.java → app/src/main/java/com/hbl/lewan/wallet/TopUpActivity.java
View File

@@ -1,4 +1,4 @@
package com.dskj.rbchat.wallet;
package com.hbl.lewan.wallet;
import android.content.Intent;
import android.graphics.Color;
@@ -19,25 +19,25 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityTopupBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.ExchangeConfBean;
import com.dskj.rbchat.model.InstallmentBean;
import com.dskj.rbchat.model.SendOrderBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.ExchangeConfBean;
import com.hbl.lewan.model.InstallmentBean;
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.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;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.wallet;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.ActivityTopupBinding;
import com.dskj.rbchat.databinding.ActivityTopupResultBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.SendOrderBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.activities.BrowseActivity;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.wallet;
package com.hbl.lewan.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.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.contact.UserInfoActivity;
import com.dskj.rbchat.databinding.FragmentVoomBinding;
import com.dskj.rbchat.databinding.FragmentWalletBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.game.JsBridgeActivity;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.main.mine.setting.SettingNewActivity;
import com.dskj.rbchat.model.AuthorizeBean;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.GameBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.StaffServiceIdBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.voom.CircleFragment;
import com.dskj.rbchat.voom.MessageActivity;
import com.dskj.rbchat.voom.PushActivity;
import com.dskj.rbchat.voom.comm.CircleFragment1;
import com.dskj.rbchat.voom.comm.CircleFragment2;
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.google.android.material.tabs.TabLayoutMediator;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;

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

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.wallet;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.FragmentWalletBfBinding;
import com.dskj.rbchat.databinding.FragmentWalletBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.main.mine.setting.SettingNewActivity;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.wallet;
package com.hbl.lewan.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.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityWalletInfoBinding;
import com.dskj.rbchat.databinding.ActivityWalletInfoNewBinding;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.main.mine.ChangeAccoutActionActivity;
import com.dskj.rbchat.main.mine.MineFragment;
import com.dskj.rbchat.model.BindBean;
import com.dskj.rbchat.model.WalletBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.pay.CollectionAndPaymentActivity;
import com.dskj.rbchat.pay.LipinDuiHuanActivity;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.AppUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;

48
app/src/main/java/com/dskj/rbchat/wallet/WalletInfoFragment.java → app/src/main/java/com/hbl/lewan/wallet/WalletInfoFragment.java
View File

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

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

@@ -1,4 +1,4 @@
package com.dskj.rbchat.wallet;
package com.hbl.lewan.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.dskj.rbchat.IMApplication;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.databinding.FragmentWalletInfo1Binding;
import com.dskj.rbchat.databinding.FragmentWalletInfoBinding;
import com.dskj.rbchat.dialog.SelectTypeDialog;
import com.dskj.rbchat.model.BillBean;
import com.dskj.rbchat.model.ListBeanResult;
import com.dskj.rbchat.model.StatisticsBean;
import com.dskj.rbchat.model.TaskBean;
import com.dskj.rbchat.model.TypeBean;
import com.dskj.rbchat.model.WithdrawCashBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;

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

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

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

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

93
app/src/main/java/com/dskj/rbchat/welcome/WelcomeActivity.java → app/src/main/java/com/hbl/lewan/welcome/WelcomeActivity.java
View File

@@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT license that can be
// found in the LICENSE file.
package com.dskj.rbchat.welcome;
package com.hbl.lewan.welcome;
import static com.blankj.utilcode.util.SnackbarUtils.dismiss;
@@ -31,29 +31,31 @@ import androidx.annotation.Nullable;
import androidx.core.view.WindowCompat;
import com.bumptech.glide.Glide;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.dialog.ActionConfirmDialog;
import com.dskj.rbchat.login.ChongZhiActivity;
import com.dskj.rbchat.login.LoginActivity;
import com.dskj.rbchat.login.PhoneLoginActivity;
import com.dskj.rbchat.login.RegisterActivity;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.NotifyCountBean;
import com.dskj.rbchat.network.Api;
import com.dskj.rbchat.network.BaseObserver;
import com.dskj.rbchat.network.Result;
import com.dskj.rbchat.utils.AnimUtil;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.wallet.PaySettingActivity;
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.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.dskj.rbchat.IMApplication;
import com.dskj.rbchat.R;
import com.dskj.rbchat.databinding.ActivityWelcomeBinding;
import com.dskj.rbchat.main.MainActivity;
import com.dskj.rbchat.utils.Constant;
import com.dskj.rbchat.utils.DataUtils;
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.netease.nimlib.sdk.mixpush.MixPushService;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
@@ -105,11 +107,11 @@ public class WelcomeActivity extends BaseActivity {
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
Uri uri = getIntent().getData();
getScheme(uri);
if (NIMClient.getService(MixPushService.class).isFCMIntent(getIntent())) {
String json = NIMClient.getService(MixPushService.class).parseFCMPayload(getIntent());
LogUtils.d("fcm","json=="+json);
IMApplication.fcmpayload = json;
}
// if (NIMClient.getService(MixPushService.class).isFCMIntent(getIntent())) {
// String json = NIMClient.getService(MixPushService.class).parseFCMPayload(getIntent());
// LogUtils.d("fcm","json=="+json);
// IMApplication.fcmpayload = json;
// }
// initClip();
//activityWelcomeBinding.bigBg.setBackgroundResource(R.color.color_white);
if (TextUtils.isEmpty(NIMClient.getCurrentAccount())) {
@@ -148,9 +150,16 @@ public class WelcomeActivity extends BaseActivity {
private void showIsLogin(boolean isLogin) {
//加载动画
activityWelcomeBinding.lottieView.setAnimation(R.raw.loading);
activityWelcomeBinding.lottieView.playAnimation();
// if(ApiService.AREA_CODE.equals("+86")) {
// //加载动画
// activityWelcomeBinding.lottieView.setVisibility(View.VISIBLE);
// activityWelcomeBinding.lottieView1.setVisibility(View.GONE);
// activityWelcomeBinding.lottieView.setAnimation(R.raw.loading);
// activityWelcomeBinding.lottieView.playAnimation();
// }else{
// activityWelcomeBinding.lottieView.setVisibility(View.GONE);
activityWelcomeBinding.lottieView1.setVisibility(View.VISIBLE);
// }
// getWindow().setBackgroundDrawableResource(com.netease.yunxin.nertc.ui.R.color.white);
//// if (isLogin) {
@@ -224,7 +233,7 @@ public class WelcomeActivity extends BaseActivity {
// 访问路劲
String path = uri.getPath();
//获取指定参数值
if (scheme.equals("timego") && host.equals("time_go_chat")) {
if (scheme.equals("timego") && host.equals("time_go_mm")) {
if (path.contains("add_user")) {
String goodsId = uri.getQueryParameter("userId");
LogUtils.i("111111111userId: " + goodsId);
@@ -286,7 +295,7 @@ public class WelcomeActivity extends BaseActivity {
}
private void showMainActivityAndFinish() {
activityWelcomeBinding.lottieView.cancelAnimation();
// activityWelcomeBinding.lottieView.cancelAnimation();
ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
Intent intent = new Intent();
intent.setClass(this, MainActivity.class);
@@ -342,7 +351,16 @@ public class WelcomeActivity extends BaseActivity {
loginBean.setSilverFeeRate(feedbackResp.data.getSilverFeeRate());
loginBean.setMmSilverFeeRate(feedbackResp.data.getMmSilverFeeRate());
DataUtils.set(WelcomeActivity.this, "login_bean", GsonUtils.beanToJSONString(loginBean));
new Handler().postDelayed(() -> loginIM(account, token), 3000);
// new Handler().postDelayed(() -> showMainActivityAndFinish(), 3000);
// showMainActivityAndFinish()
// new Handler().postDelayed(() -> {
// Intent intent = new Intent(WelcomeActivity.this, UserHeadEditActivity.class);
// intent.putExtra("start",true);
// startActivity(intent);
// }, 6000);
}
@@ -396,8 +414,8 @@ public class WelcomeActivity extends BaseActivity {
}
private void loginIM(String account, String token) {
ALog.d(Constant.PROJECT_TAG, TAG, "loginIM");
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
LoginInfo loginInfo =
LoginInfo.LoginInfoBuilder.loginInfoDefault(account, token)
.withAppKey(DataUtils.readAppKey(this))
@@ -407,6 +425,8 @@ public class WelcomeActivity extends BaseActivity {
new LoginCallback<LoginInfo>() {
@Override
public void onError(int errorCode, @NonNull String errorMsg) {
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
ToastX.showShortToast(
String.format(getResources().getString(R.string.login_fail), errorCode));
launchLoginPage();
@@ -414,6 +434,13 @@ public class WelcomeActivity extends BaseActivity {
@Override
public void onSuccess(@Nullable LoginInfo data) {
DataUtils.set(WelcomeActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
DataUtils.set(WelcomeActivity.this, IMUIKitConfig.LOGIN_TOKEN, token);
activityWelcomeBinding.getRoot().setVisibility(View.GONE);
DataUtils.set(WelcomeActivity.this,"last_login_time",System.currentTimeMillis());
showMainActivityAndFinish();
// IMApplication.getInstance().toLogin();
}

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

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

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

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

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

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

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

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

62
app/src/main/java/com/hbl/lewan/wxapi/WXEntryActivity.java Normal file
View File

@@ -0,0 +1,62 @@
//package com.hbl.lewan.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.netease.yunxin.kit.chatkit.ui.common.RxBus;
//import com.tencent.mm.opensdk.constants.ConstantsAPI;
//import com.tencent.mm.opensdk.modelbase.BaseReq;
//import com.tencent.mm.opensdk.modelbase.BaseResp;
//import com.tencent.mm.opensdk.modelmsg.SendAuth;
//import com.tencent.mm.opensdk.openapi.IWXAPI;
//import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
//import com.tencent.mm.opensdk.openapi.WXAPIFactory;
//
///**
// * 微信登陆分享回调Activity
// * @create time 2015-05-25
// */
//public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
// private IWXAPI wxAPI;
//
// @Override
// protected void onCreate(Bundle savedInstanceState) {
// super.onCreate(savedInstanceState);
//
// wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID,true);
// wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
// wxAPI.handleIntent(getIntent(), this);
// }
//
// @Override
// protected void onNewIntent(Intent intent){
// super.onNewIntent(intent);
// wxAPI.handleIntent(getIntent(),this);
// Log.i("ansen","WXEntryActivity onNewIntent");
// }
//
// @Override
// public void onReq(BaseReq arg0) {
// Log.i("ansen","WXEntryActivity onReq:"+arg0);
// }
//
// @Override
// public void onResp(BaseResp resp){
// if(resp.getType()== ConstantsAPI.COMMAND_SENDMESSAGE_TO_WX){//分享
// Log.i("ansen","微信分享操作.....");
// WeiXin weiXin=new WeiXin(2,resp.errCode,"");
// RxBus.getInstance().post(weiXin);
// }else if(resp.getType()==ConstantsAPI.COMMAND_SENDAUTH){//登陆
// Log.i("ansen", "微信登录操作.....");
// SendAuth.Resp authResp = (SendAuth.Resp) resp;
// WeiXin weiXin=new WeiXin(1,resp.errCode,authResp.code);
// RxBus.getInstance().post(weiXin);
// }
// finish();
// }
//
//}

55
app/src/main/java/com/hbl/lewan/wxapi/WXPayEntryActivity.java Normal file
View File

@@ -0,0 +1,55 @@
//package com.hbl.lewan.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.netease.yunxin.kit.chatkit.ui.common.RxBus;
//import com.tencent.mm.opensdk.constants.ConstantsAPI;
//import com.tencent.mm.opensdk.modelbase.BaseReq;
//import com.tencent.mm.opensdk.modelbase.BaseResp;
//import com.tencent.mm.opensdk.openapi.IWXAPI;
//import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
//import com.tencent.mm.opensdk.openapi.WXAPIFactory;
//
///**
// * 微信支付回调Activity
// * @create time 2017-09-15
// */
//public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
// private IWXAPI wxAPI;
//
// @Override
// protected void onCreate(Bundle savedInstanceState) {
// super.onCreate(savedInstanceState);
// wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID);
// wxAPI.handleIntent(getIntent(), this);
// }
//
// @Override
// protected void onNewIntent(Intent intent){
// super.onNewIntent(intent);
// setIntent(intent);
// wxAPI.handleIntent(intent, this);
// }
//
// @Override
// public void onReq(BaseReq baseReq) {}
//
// @Override
// public void onResp(BaseResp resp) {
// Log.i("ansen", "微信支付回调 返回错误码:"+resp.errCode+" 错误名称:"+resp.errStr);
// if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX){//微信支付
// WeiXin weiXin=new WeiXin(3,resp.errCode,"");
// RxBus.getInstance().post(weiXin);
// }
// finish();
// }
//
//
//
//
//}

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

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

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

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

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

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

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

@@ -21,18 +21,18 @@ import androidx.annotation.RequiresApi;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.ToolKits;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.king.zxing.util.CodeUtils;
import com.netease.nimlib.sdk.NIMClient;

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

@@ -23,18 +23,18 @@ import androidx.annotation.RequiresApi;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.dskj.rbchat.IMUIKitConfig;
import com.dskj.rbchat.R;
import com.dskj.rbchat.adapter.CommonAdapter;
import com.dskj.rbchat.adapter.ViewHolder;
import com.dskj.rbchat.model.LoginBean;
import com.dskj.rbchat.model.UserShareBean;
import com.dskj.rbchat.utils.AdaptScreenUtils;
import com.dskj.rbchat.utils.DataUtils;
import com.dskj.rbchat.utils.GsonUtils;
import com.dskj.rbchat.utils.LogUtils;
import com.dskj.rbchat.utils.ShareDateUtils;
import com.dskj.rbchat.utils.ToolKits;
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.google.android.material.bottomsheet.BottomSheetDialog;
import com.king.zxing.util.CodeUtils;
import com.netease.nimlib.sdk.NIMClient;

242
app/src/main/res/drawable/ic_launcher_background.xml
View File

@@ -1,176 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
<vector
android:height="108dp"
android:width="108dp"
android:viewportHeight="108"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000"
android:pathData="M0,0h108v108h-108z"/>
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
android:strokeColor="#00000000" android:strokeWidth="0.8"/>
</vector>

3
app/src/main/res/drawable/index_user_bg1.xml
View File

@@ -19,8 +19,7 @@
android:useLevel="true" />
<stroke android:width="0dp" android:color="@color/white"/>
<corners
android:topRightRadius="10dp"
android:topLeftRadius="10dp"/>
android:radius="10dp" />
</shape>
</item>
</ripple>

7
app/src/main/res/drawable/jiechujinyan_bg.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_15" />
<solid android:color="@color/transparent" />
<stroke android:width="@dimen/dp_1" android:color="#F65656"/>
</shape>

128
app/src/main/res/drawable/kefu_loading.xml
View File

@@ -1,128 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--oneshot: true只展示一次。
false不停的循环播放动画。
android:duration 图片显示时间长度。 -->
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item
android:drawable="@mipmap/xuanfu_00"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_01"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_02"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_03"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_04"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_05"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_06"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_07"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_08"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_09"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_10"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_11"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_12"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_13"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_14"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_15"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_16"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_17"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_18"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_19"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_20"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_21"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_22"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_23"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_24"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_25"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_26"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_27"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_28"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_29"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_30"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_31"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_32"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_33"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_34"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_35"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_36"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_37"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_38"
android:duration="33"></item>
<item
android:drawable="@mipmap/xuanfu_39"
android:duration="33"></item>
</animation-list>

723
app/src/main/res/drawable/kefu_loading1.xml
View File

@@ -1,723 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--oneshot: true只展示一次。
false不停的循环播放动画。
android:duration 图片显示时间长度。 -->
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="true">
<item
android:drawable="@mipmap/gou01_000"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_002"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_003"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_004"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_005"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_006"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_007"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_008"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_009"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_010"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_011"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_012"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_013"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_014"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_015"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_016"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_017"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_018"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_019"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_020"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_021"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_022"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_023"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_024"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_025"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_025"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_026"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_027"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_028"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_029"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_030"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_031"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_032"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_033"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_034"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_035"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_036"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_037"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_038"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_039"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_040"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_041"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_042"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_043"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_044"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_045"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_046"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_047"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_048"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_049"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_050"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_051"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_052"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_053"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_054"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_055"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_056"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_057"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_058"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_059"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_060"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_061"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_062"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_063"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_064"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_065"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_066"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_067"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_068"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_069"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_070"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_071"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_072"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_073"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_074"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_075"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_076"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_077"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_078"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_079"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_080"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_081"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_082"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_083"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_084"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_085"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_086"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_087"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_088"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_089"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_090"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_091"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_092"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_093"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_094"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_095"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_096"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_097"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_098"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_099"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_100"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_101"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_102"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_103"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_104"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_105"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_106"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_107"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_108"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_109"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_050"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_051"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_052"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_053"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_054"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_055"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_056"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_057"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_058"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_059"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_060"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_061"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_062"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_063"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_064"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_065"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_066"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_067"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_068"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_069"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_070"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_071"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_072"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_073"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_074"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_075"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_076"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_077"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_078"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_079"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_080"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_081"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_082"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_083"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_084"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_085"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_086"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_087"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_088"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_089"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_090"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_091"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_092"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_093"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_094"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_095"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_096"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_097"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_098"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_099"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_100"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_101"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_102"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_103"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_104"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_105"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_106"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_107"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_108"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_109"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_050"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_051"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_052"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_053"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_054"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_055"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_056"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_057"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_058"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_059"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_060"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_061"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_062"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_063"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_064"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_065"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_066"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_067"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_068"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_069"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_070"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_071"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_072"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_073"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_074"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_075"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_076"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_077"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_078"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_079"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_080"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_081"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_082"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_083"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_084"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_085"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_086"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_087"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_088"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_089"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_090"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_091"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_092"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_093"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_094"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_095"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_096"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_097"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_098"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_099"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_100"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_101"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_102"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_103"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_104"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_105"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_106"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_107"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_108"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_109"
android:duration="33"></item>
</animation-list>

194
app/src/main/res/drawable/kefu_loading2.xml
View File

@@ -1,194 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--oneshot: true只展示一次。
false不停的循环播放动画。
android:duration 图片显示时间长度。 -->
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item
android:drawable="@mipmap/gou01_050"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_051"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_052"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_053"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_054"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_055"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_056"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_057"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_058"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_059"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_060"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_061"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_062"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_063"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_064"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_065"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_066"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_067"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_068"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_069"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_070"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_071"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_072"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_073"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_074"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_075"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_076"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_077"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_078"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_079"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_080"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_081"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_082"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_083"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_084"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_085"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_086"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_087"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_088"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_089"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_090"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_091"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_092"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_093"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_094"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_095"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_096"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_097"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_098"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_099"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_100"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_101"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_102"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_103"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_104"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_105"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_106"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_107"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_108"
android:duration="33"></item>
<item
android:drawable="@mipmap/gou01_109"
android:duration="33"></item>
</animation-list>

24
app/src/main/res/drawable/splash_bg.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<gradient android:startColor="@color/white"
android:endColor="#fffafa"
android:type="linear"
android:gradientRadius="10dp"/>
</shape>
</item>
<item android:top="@dimen/dp_200" android:height="164.7dp">
<bitmap
android:gravity="top|center_horizontal"
android:src="@mipmap/start_bitmap"/>
</item>
<!-- <item android:bottom="30dp">-->
<!-- <bitmap-->
<!-- android:gravity="bottom"-->
<!-- android:src="@mipmap/login_logo" />-->
<!-- </item>-->
</layer-list>

24
app/src/main/res/drawable/splash_bg1.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<gradient android:startColor="@color/white"
android:endColor="@color/white"
android:type="linear"
android:gradientRadius="10dp"/>
</shape>
</item>
<item android:top="200dp" android:height="@dimen/dp_183">
<bitmap
android:gravity="top|center_horizontal"
android:src="@mipmap/gou01_109"/>
</item>
<!-- <item android:bottom="30dp">-->
<!-- <bitmap-->
<!-- android:gravity="bottom"-->
<!-- android:src="@mipmap/login_logo" />-->
<!-- </item>-->
</layer-list>

2
app/src/main/res/layout/activity_authorize.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="@dimen/dp_1"
android:background="@color/color_f7f7f7" />
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"

32
app/src/main/res/layout/activity_base_chatsetting.xml
View File

@@ -303,6 +303,36 @@
app:srcCompat="@mipmap/ic_setting_enter" />
</FrameLayout>
<FrameLayout
android:id="@+id/fljinyan"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:visibility="gone"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rlteam_clearhistory">
<TextView
android:id="@+id/tvjinyan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/yijinyanchengyuan_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16"
app:drawableStartCompat="@mipmap/jinyan_red_img1" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
app:srcCompat="@mipmap/ic_setting_enter" />
</FrameLayout>
<FrameLayout
android:id="@+id/rlteam_jubao"
android:layout_width="match_parent"
@@ -311,7 +341,7 @@
android:layout_marginEnd="@dimen/dp_15"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rlteam_clearhistory">
app:layout_constraintTop_toBottomOf="@+id/fljinyan">
<TextView
android:id="@+id/tvteamsetting_jubao"

4
app/src/main/res/layout/activity_change_accout_action.xml
View File

@@ -208,7 +208,7 @@
<!-- android:src="@drawable/yanjing_hide" />-->
</LinearLayout>
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -221,7 +221,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<View
android:id="@+id/line_step2_v"

12
app/src/main/res/layout/activity_change_paypassword.xml
View File

@@ -9,12 +9,12 @@
android:orientation="vertical">
<com.dskj.rbchat.widget.StatusLayout
<com.hbl.lewan.widget.StatusLayout
android:id="@+id/st_step2"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</com.dskj.rbchat.widget.StatusLayout>
</com.hbl.lewan.widget.StatusLayout>
<ImageView
@@ -62,7 +62,7 @@
android:textSize="14sp"
/>
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -75,9 +75,9 @@
app:passwordSize="26"
app:showPassword="false">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code1"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -90,7 +90,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
</LinearLayout>

8
app/src/main/res/layout/activity_change_phone.xml
View File

@@ -89,7 +89,7 @@
android:textSize="14sp" />
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -101,7 +101,7 @@
app:passwordSize="26"
app:showPassword="true">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
@@ -206,7 +206,7 @@
android:textSize="14sp" />
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code1"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -218,7 +218,7 @@
app:passwordSize="26"
app:showPassword="true">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv1"

4
app/src/main/res/layout/activity_chongzhi.xml
View File

@@ -118,7 +118,7 @@
android:textSize="14sp" />
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -130,7 +130,7 @@
app:passwordSize="26"
app:showPassword="true">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"

4
app/src/main/res/layout/activity_chongzhi_pay.xml
View File

@@ -52,7 +52,7 @@
android:textSize="14sp" />
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -64,7 +64,7 @@
app:passwordSize="26"
app:showPassword="true">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"

4
app/src/main/res/layout/activity_close_account.xml
View File

@@ -63,7 +63,7 @@
android:textSize="14sp" />
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -75,7 +75,7 @@
app:passwordSize="26"
app:showPassword="true">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"

4
app/src/main/res/layout/activity_collection_and_payment.xml
View File

@@ -75,7 +75,7 @@
android:id="@+id/fukuan_qrcode_iv"
android:layout_width="@dimen/dp_235"
android:layout_height="@dimen/dp_235"
android:src="@mipmap/ic_launcher" />
android:src="@mipmap/ic_launche" />
</LinearLayout>
<LinearLayout
@@ -173,7 +173,7 @@
android:id="@+id/shoukuanma_qrcode_iv"
android:layout_width="@dimen/dp_235"
android:layout_height="@dimen/dp_235"
android:src="@mipmap/ic_launcher" />
android:src="@mipmap/ic_launche" />
</LinearLayout>
</RelativeLayout>

8
app/src/main/res/layout/activity_get_code_setting.xml
View File

@@ -9,12 +9,12 @@
android:orientation="vertical">
<com.dskj.rbchat.widget.StatusLayout
<com.hbl.lewan.widget.StatusLayout
android:id="@+id/st_step2"
android:layout_width="match_parent"
android:layout_height="wrap_content">
</com.dskj.rbchat.widget.StatusLayout>
</com.hbl.lewan.widget.StatusLayout>
<ImageView
@@ -62,7 +62,7 @@
android:textSize="14sp"
/>
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -75,7 +75,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
</LinearLayout>

2
app/src/main/res/layout/activity_help.xml
View File

@@ -49,7 +49,7 @@
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/activity_lipinduihuan.xml
View File

@@ -176,7 +176,7 @@
android:id="@+id/shoukuanma_qrcode_iv"
android:layout_width="@dimen/dp_235"
android:layout_height="@dimen/dp_235"
android:src="@mipmap/ic_launcher" />
android:src="@mipmap/ic_launche" />
</LinearLayout>
</RelativeLayout>

1
app/src/main/res/layout/activity_login.xml
View File

@@ -25,7 +25,6 @@
android:layout_width="@dimen/dp_88"
android:layout_centerInParent="true"
android:layout_height="@dimen/dp_148"
android:src="@mipmap/start_logo"
/>
</RelativeLayout>

4
app/src/main/res/layout/activity_main.xml
View File

@@ -50,7 +50,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"
android:visibility="visible"
android:onClick="tabClick">
<TextView
@@ -120,7 +120,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:onClick="tabClick"
android:visibility="gone">
android:visibility="visible">
<TextView
android:id="@+id/live"

2
app/src/main/res/layout/activity_message.xml
View File

@@ -127,7 +127,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_fffbfb">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/activity_message_act.xml
View File

@@ -29,7 +29,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_fffbfb">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

4
app/src/main/res/layout/activity_phone_login.xml
View File

@@ -159,7 +159,7 @@
/>
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -171,7 +171,7 @@
app:passwordSize="26"
app:showPassword="true">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

1
app/src/main/res/layout/activity_push.xml
View File

@@ -101,6 +101,7 @@
android:layout_marginTop="@dimen/dp_10"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:visibility="gone"
android:orientation="horizontal">
<ImageView
android:id="@+id/main_weizhi_iv"

4
app/src/main/res/layout/activity_receive_red_packet.xml
View File

@@ -29,13 +29,13 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.dskj.rbchat.widget.StatusLayout
<com.hbl.lewan.widget.StatusLayout
android:id="@+id/st"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible">
</com.dskj.rbchat.widget.StatusLayout>
</com.hbl.lewan.widget.StatusLayout>
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/contact_list_activity_titleBar"

6
app/src/main/res/layout/activity_register.xml
View File

@@ -179,7 +179,7 @@
android:textSize="14sp" />
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -191,7 +191,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
@@ -228,7 +228,7 @@
android:layout_height="@dimen/dp_88"
android:layout_marginTop="@dimen/dp_40"
android:layout_gravity="center_horizontal">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/head_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"

6
app/src/main/res/layout/activity_register_bf.xml
View File

@@ -180,7 +180,7 @@
android:textSize="14sp" />
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -192,7 +192,7 @@
app:passwordSize="26"
app:showPassword="false">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"
@@ -230,7 +230,7 @@
android:layout_height="@dimen/dp_88"
android:layout_marginTop="@dimen/dp_40"
android:layout_gravity="center_horizontal">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/head_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"

34
app/src/main/res/layout/activity_team_members_jinyan.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/layout_selectorroot"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:titleTextColor="@color/color_333333" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_members"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
</LinearLayout>

27
app/src/main/res/layout/activity_teamothersetting.xml
View File

@@ -394,7 +394,34 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/fljinyan"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54">
<TextView
android:id="@+id/tvjinyan"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="64dp"
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/yijinyanchengyuan_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_frame_mine_right_arrow" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_f4f4f4" />
<FrameLayout
android:id="@+id/flteamdiss"
android:layout_width="match_parent"

4
app/src/main/res/layout/activity_user_info.xml
View File

@@ -65,7 +65,7 @@
android:gravity="center"
android:orientation="vertical">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_88"
@@ -229,6 +229,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone"
android:drawableTop="@mipmap/voice_call_img"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
@@ -244,6 +245,7 @@
android:drawableTop="@mipmap/video__call_img"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:visibility="gone"
android:text="@string/chat_message_video_call_action"
android:textColor="#ffffffff"
android:textSize="12sp" />

2
app/src/main/res/layout/activity_userphotos.xml
View File

@@ -24,7 +24,7 @@
app:layout_constraintTop_toBottomOf="@+id/userphoto_title_bar"
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/activity_userphotos_details.xml
View File

@@ -23,7 +23,7 @@
app:layout_constraintTop_toBottomOf="@+id/userphoto_title_bar"
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

4
app/src/main/res/layout/activity_wangji.xml
View File

@@ -181,7 +181,7 @@
android:textSize="14sp" />
<com.dskj.rbchat.custom.PasswordEditText
<com.hbl.lewan.custom.PasswordEditText
android:id="@+id/password_edit_text_code"
android:layout_width="wrap_content"
android:layout_height="60dp"
@@ -193,7 +193,7 @@
app:passwordSize="26"
app:showPassword="true">
</com.dskj.rbchat.custom.PasswordEditText>
</com.hbl.lewan.custom.PasswordEditText>
<TextView
android:id="@+id/send_sms_tv"

34
app/src/main/res/layout/activity_welcome.xml
View File

@@ -16,27 +16,29 @@
android:layout_weight="3"
android:gravity="center_horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/app_yunxin_icon"
android:layout_width="119.7dp"
android:layout_height="164.7dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_200"
android:scaleType="fitXY"
android:src="@drawable/kefu_loading1"
android:visibility="gone" />
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/lottieView"
<!-- <com.airbnb.lottie.LottieAnimationView-->
<!-- android:id="@+id/lottieView"-->
<!-- android:layout_width="@dimen/dp_106"-->
<!-- android:layout_height="@dimen/dp_106"-->
<!-- app:lottie_autoPlay="true"-->
<!-- app:lottie_loop="true"-->
<!-- android:visibility="gone"-->
<!-- app:lottie_rawRes="@raw/loading"-->
<!-- android:layout_centerHorizontal="true"-->
<!-- android:layout_marginTop="@dimen/dp_200"-->
<!-- android:scaleType="fitXY" />-->
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/lottieView1"
android:layout_width="@dimen/dp_106"
android:layout_height="@dimen/dp_106"
app:lottie_autoPlay="true"
app:lottie_loop="true"
app:lottie_rawRes="@raw/loading"
app:es_shape_type="rectangle"
app:ease_radius="10dp"
android:visibility="visible"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_200"
android:scaleType="fitXY" />
android:src="@mipmap/ic_launche" />
</RelativeLayout>

2
app/src/main/res/layout/bottom_sheet_qrcode_layout.xml
View File

@@ -33,7 +33,7 @@
android:id="@+id/qrcode_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/ic_launcher"/>
android:src="@mipmap/ic_launche"/>
</LinearLayout>
<TextView

2
app/src/main/res/layout/bottom_sheet_qrcode_layout1.xml
View File

@@ -35,7 +35,7 @@
android:id="@+id/qrcode_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/ic_launcher" />
android:src="@mipmap/ic_launche" />
</LinearLayout>
<TextView

2
app/src/main/res/layout/chat_his_child_item.xml
View File

@@ -10,7 +10,7 @@
android:orientation="horizontal"
tools:ignore="MissingDefaultResource">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/item_civ"
android:layout_width="@dimen/dp_84"
android:layout_height="@dimen/dp_84"

2
app/src/main/res/layout/chat_his_child_item1.xml
View File

@@ -10,7 +10,7 @@
android:orientation="horizontal"
tools:ignore="MissingDefaultResource">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/item_civ"
android:layout_width="0dp"
android:layout_height="0dp"

2
app/src/main/res/layout/dialog_select_pay_type.xml
View File

@@ -84,7 +84,7 @@
android:gravity="center_vertical"
android:paddingRight="@dimen/dp_15"
android:layout_weight="1">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:es_shape_type="round"

2
app/src/main/res/layout/discover_child_item.xml
View File

@@ -58,7 +58,7 @@
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/dp_5"
android:orientation="horizontal">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:scaleType="centerCrop"

4
app/src/main/res/layout/discover_child_item_default.xml
View File

@@ -23,7 +23,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:scaleType="fitXY"
android:adjustViewBounds="true"
android:layout_width="match_parent"
@@ -54,7 +54,7 @@
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/dp_5"
android:orientation="horizontal">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@color/common_list_custom_divider"

2
app/src/main/res/layout/explore_default_item.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/dongtai_portrait"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"

2
app/src/main/res/layout/fragment_chat.xml
View File

@@ -20,7 +20,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.dskj.rbchat.widget.StatusLayout
<com.hbl.lewan.widget.StatusLayout
android:id="@+id/sss"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/fragment_circle.xml
View File

@@ -17,7 +17,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_comment.xml
View File

@@ -17,7 +17,7 @@
android:layout_marginBottom="@dimen/dp_95"
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_followlist.xml
View File

@@ -13,7 +13,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

23
app/src/main/res/layout/fragment_home_new.xml
View File

@@ -15,7 +15,7 @@
android:visibility="visible"
app:srlAccentColor="@color/white">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -548,15 +548,15 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.youth.banner.Banner
android:id="@+id/banner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible"
app:indicator_drawable_selected="@drawable/dot_btn_true"
app:indicator_drawable_unselected="@drawable/dot_btn_false"
app:indicator_height="6dp"
app:indicator_width="6dp" />
<!-- <com.youth.banner.Banner-->
<!-- android:id="@+id/banner"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:visibility="visible"-->
<!-- app:indicator_drawable_selected="@drawable/dot_btn_true"-->
<!-- app:indicator_drawable_unselected="@drawable/dot_btn_false"-->
<!-- app:indicator_height="6dp"-->
<!-- app:indicator_width="6dp" />-->
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
@@ -585,6 +585,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitStart"
android:visibility="invisible"
android:src="@mipmap/ic_home_top"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -608,6 +609,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_113"
android:visibility="gone"
android:layout_alignParentBottom="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -669,7 +671,6 @@
android:layout_height="0dp"
android:layout_alignParentBottom="true"
android:scaleType="centerInside"
android:src="@drawable/kefu_loading"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"

2
app/src/main/res/layout/fragment_index.xml
View File

@@ -163,6 +163,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:visibility="gone"
android:text="@string/aichat_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
@@ -173,6 +174,7 @@
android:id="@+id/layout_indexfm_aichat"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/tv_indexfm_aichat">

7
app/src/main/res/layout/fragment_index2.xml
View File

@@ -200,6 +200,7 @@
android:text="@string/aichat_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/wawaji_ly" />
@@ -208,6 +209,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_20"
android:visibility="gone"
android:layout_marginBottom="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/tv_indexfm_aichat">
@@ -252,7 +254,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:orientation="horizontal">
<TextView
@@ -290,14 +291,14 @@
app:showIndexBar="false"
app:showSelector="false"
app:showTopPin="false" />
<View android:layout_width="match_parent"
android:layout_height="20dp"/>
</LinearLayout>
<TextView
android:id="@+id/tv_indexfm_friendstitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/haoyou_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"

2
app/src/main/res/layout/fragment_like.xml
View File

@@ -18,7 +18,7 @@
android:layout_marginBottom="@dimen/dp_40"
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_mine.xml
View File

@@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.dskj.rbchat.widget.StatusLayout
<com.hbl.lewan.widget.StatusLayout
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="wrap_content"/>

36
app/src/main/res/layout/fragment_mine_new.xml
View File

@@ -176,7 +176,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="375:210"
app:layout_constraintDimensionRatio="375:205"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:visibility="visible"
@@ -187,11 +187,10 @@
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="@drawable/index_user_bg"
android:orientation="vertical"
android:background="@drawable/index_user_bg1"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="348:70"
app:layout_constraintDimensionRatio="345:60"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
@@ -199,7 +198,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/index_user_bg1"
android:orientation="horizontal">
<LinearLayout
@@ -222,37 +220,25 @@
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center_vertical"
android:background="#49B78C8C" />
<LinearLayout
android:id="@+id/yinbi_tv1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:gravity="center_vertical"
android:paddingStart="12dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@mipmap/index_lipinjifen_img"
android:drawableRight="@mipmap/index_wallet_next_img"
android:drawableLeft="@mipmap/me_qianbao_img"
android:drawablePadding="@dimen/dp_5"
android:text="@string/silver_coins_txt"
android:text="@string/wallet_txt"
android:textColor="#ff525252"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_20"
android:layout_gravity="center_vertical"
android:background="#49B78C8C" />
<LinearLayout
android:id="@+id/tongbi_tv1"
android:layout_width="match_parent"
@@ -312,10 +298,14 @@
android:autoSizeMinTextSize="16sp"
android:autoSizeTextType="uniform"
android:ellipsize="end"
android:gravity="center"
android:gravity="center_vertical|right"
android:lines="1"
android:drawablePadding="10dp"
android:textColor="#FA6947"
android:layout_marginEnd="12dp"
android:textStyle="bold"
android:drawableTint="#26000000"
android:drawableRight="@mipmap/index_wallet_next_img"
tools:text="8888" />
<View

2
app/src/main/res/layout/fragment_voom.xml
View File

@@ -11,7 +11,7 @@
android:background="@color/color_f7f7f7"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.dskj.rbchat.widget.StatusLayout
<com.hbl.lewan.widget.StatusLayout
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="wrap_content"/>

2
app/src/main/res/layout/fragment_wallet_info.xml
View File

@@ -57,7 +57,7 @@
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/fragment_wallet_info1.xml
View File

@@ -57,7 +57,7 @@
android:visibility="visible"
app:srlAccentColor="@color/color_6b3689">
<com.dskj.rbchat.widget.BezierCircleHeader
<com.hbl.lewan.widget.BezierCircleHeader
android:layout_width="match_parent"
android:layout_height="wrap_content" />

2
app/src/main/res/layout/item_comment_list.xml
View File

@@ -11,7 +11,7 @@
android:paddingBottom="@dimen/dp_5"
tools:ignore="MissingDefaultResource">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"

2
app/src/main/res/layout/item_help_list_t.xml
View File

@@ -11,7 +11,7 @@
android:gravity="center"
android:orientation="vertical">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:id="@+id/item_iv"

2
app/src/main/res/layout/item_like_list.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/big_bg"
tools:ignore="MissingDefaultResource">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/logo_iv"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"

6
app/src/main/res/layout/item_message_list.xml
View File

@@ -17,7 +17,7 @@
android:layout_height="@dimen/dp_62"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
android:id="@+id/item_head_civ"
@@ -59,7 +59,7 @@
android:layout_marginBottom="@dimen/dp_15"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/big_iv"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
@@ -67,7 +67,7 @@
app:ease_radius="@dimen/dp_4"
android:scaleType="centerCrop"
android:layout_marginLeft="@dimen/dp_5"
android:src="@mipmap/ic_launcher"/>
android:src="@mipmap/ic_launche"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/item_post_circle.xml
View File

@@ -9,7 +9,7 @@
android:padding="@dimen/dp_8"
tools:ignore="MissingDefaultResource">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/item_image_iv"
android:layout_width="0dp"
android:layout_height="0dp"

4
app/src/main/res/layout/item_tiktok_layout.xml
View File

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.dskj.rbchat.voom.comm.CusVideoView
<com.hbl.lewan.voom.comm.CusVideoView
android:id="@+id/mVideoView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_alignParentTop="true"

4
app/src/main/res/layout/link_image.xml
View File

@@ -29,7 +29,7 @@
android:adjustViewBounds="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@mipmap/ic_launcher"/>
android:src="@mipmap/ic_launche"/>
<ImageView
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
@@ -58,7 +58,7 @@
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/dp_5"
android:orientation="horizontal">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:scaleType="centerCrop"

4
app/src/main/res/layout/report_activity.xml
View File

@@ -95,13 +95,13 @@
android:layout_gravity="center_vertical"
android:layout_height="@dimen/dp_42">
<com.dskj.rbchat.widget.CircleImageView
<com.hbl.lewan.widget.CircleImageView
android:id="@+id/big_iv"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
app:es_shape_type="rectangle"
app:ease_radius="@dimen/dp_4"
android:src="@mipmap/ic_launcher"/>
android:src="@mipmap/ic_launche"/>
<ImageView
android:id="@+id/video_iv"
android:layout_width="wrap_content"

11
app/src/main/res/layout/team_members_view_holder.xml
View File

@@ -75,4 +75,15 @@
app:layout_constraintBottom_toBottomOf="@+id/avatar_view"
app:layout_constraintLeft_toLeftOf="@+id/tv_name" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/jinyan_red_img"
android:layout_marginEnd="@dimen/dp_15"
android:id="@+id/jinyan_iv"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

66
app/src/main/res/layout/team_members_view_holder1.xml Normal file
View File

@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/avatar_view"
android:layout_width="@dimen/dimen_45_dp"
android:layout_height="@dimen/dimen_45_dp"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_15"
app:avatarCorner="@dimen/dimen_45_dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="0dp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:ellipsize="end"
android:maxLines="1"
android:text="1111111"
android:gravity="center_vertical"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_16"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@+id/avatar_view"
app:layout_constraintBottom_toBottomOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="30dp"
android:gravity="center"
android:src="@mipmap/jinyan_red_img"
android:layout_marginEnd="@dimen/dp_15"
android:id="@+id/jinyan_iv"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:textColor="#F65656"
android:background="@drawable/jiechujinyan_bg"
android:textSize="@dimen/sp_14"
android:text="@string/jiechujinyan_txt"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<View
android:id="@+id/item_line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_ebe8F1"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

5
app/src/main/res/mipmap-anydpi-v26/ic_launche.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/transparent"/>
<foreground android:drawable="@mipmap/ic_launche_foreground"/>
</adaptive-icon>

5
app/src/main/res/mipmap-anydpi-v26/ic_launche_round.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/transparent"/>
<foreground android:drawable="@mipmap/ic_launche_foreground"/>
</adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.0 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launche.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launche_foreground.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launche_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_000.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_001.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_002.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_003.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_004.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_005.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_006.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_007.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_008.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_009.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_010.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_011.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_012.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_013.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_014.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_015.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_016.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_017.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_018.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_019.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_020.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_021.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_022.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_023.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_024.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_025.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_026.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_027.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_028.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_029.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 45 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_030.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_031.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 45 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_032.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 45 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_033.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_034.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 47 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_035.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 47 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_036.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_037.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_038.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_039.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_040.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_041.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_042.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_043.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_044.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_045.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_046.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_047.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_048.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_049.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_050.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_051.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_052.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_053.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_054.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_055.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_056.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_057.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_058.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_059.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_060.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_061.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_062.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_063.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_064.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_065.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_066.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_067.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_068.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_069.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_070.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_071.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_072.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_073.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_074.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_075.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_076.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_077.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_078.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_079.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_080.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_081.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_082.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_083.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_084.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_085.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_086.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_087.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_088.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_089.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_090.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_091.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_092.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_093.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_094.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_095.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_096.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_097.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_098.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_099.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_101.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_102.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_103.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_104.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_105.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_106.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_107.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_108.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
app/src/main/res/mipmap-xxhdpi/gou01_109.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launche.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launche_foreground.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launche_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 52 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xxhdpi/index_xiaomeng_img.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

BIN
app/src/main/res/mipmap-xxhdpi/jinyan_red_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/jinyan_red_img1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xxhdpi/me_qianbao_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-xxhdpi/mm_tw_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 818 KiB

BIN
app/src/main/res/mipmap-xxhdpi/mm_tw_logo1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 270 KiB

BIN
app/src/main/res/mipmap-xxhdpi/start_bitmap.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 60 KiB

BIN
app/src/main/res/mipmap-xxhdpi/start_game.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 MiB

BIN
app/src/main/res/mipmap-xxhdpi/start_gif1.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 MiB

BIN
app/src/main/res/mipmap-xxhdpi/start_gif2.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 MiB

BIN
app/src/main/res/mipmap-xxhdpi/start_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_28.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_29.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_31.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_33.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_34.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_35.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_36.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_37.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_38.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxhdpi/xuanfu_39.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launche.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launche_foreground.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launche_round.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 92 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

2
app/src/main/res/values-en-rUS/strings.xml
View File

@@ -3,4 +3,6 @@
<string name="ps_message_max_num">You can only select at most %1$s photos or videos</string>
<string name="yijinyanchengyuan_txt">Banned members</string>
<string name="jiechujinyan_txt">Lift the ban on speech</string>
</resources>

17
app/src/main/res/values-en/strings.xml
View File

@@ -7,7 +7,7 @@
<resources>
<string name="google_map_key">AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8</string>
<string name="app_name">淘夢購</string>
<string name="app_name">乐玩</string>
<string name="yunxin_name">Netease CommsEase</string>
<string name="yunxin_desc">Stable instant messaging service</string>
@@ -44,7 +44,7 @@
<string name="incoming_call_notify_video">[Video Call]</string>
<string name="mine_collect">Favorites</string>
<string name="mine_about">About 淘夢購</string>
<string name="mine_about">About MM</string>
<string name="mine_setting">Settings</string>
<string name="mine_version">Version</string>
<string name="mine_product">introduce</string>
@@ -324,7 +324,7 @@
<string name="qrcode_scan_activity_not_surpport_qrcontent">Unsupported 2D code content! </string>
<string name="shouquandenglu_txt">Authorized login</string>
<string name="tltdbj_txt">淘樂町 store device login</string>
<string name="seqs_dl_txt">Apply to log in with your 淘夢購 account</string>
<string name="seqs_dl_txt">Apply to log in with your MM account</string>
<string name="ndnc_txt">Your avatar and nickname will be authorized for use</string>
<string name="yunxu_txt">Allow</string>
<string name="jujue_txt">Reject</string>
@@ -334,7 +334,7 @@
<string name="aihistory_clean">Clear</string>
<string name="aihistory_title">Are you sure you want to clear the Q&amp;A history?</string>
<string name="aianswer_txt">Smart Dream answer is being generated, please wait...</string>
<string name="aiintroduct_zh_txt">您好，我是淘夢購團隊研發的智能認知模型，我的名字叫小夢，我可以和人類進行自然交流，解答問題，高效完成各領域的認知智能需求</string>
<string name="aiintroduct_zh_txt">您好，我是MM團隊研發的智能認知模型，我的名字叫小夢，我可以和人類進行自然交流，解答問題，高效完成各領域的認知智能需求</string>
<string name="aiintroduct_en_txt">Hello, I am an intelligent cognitive model developed by TimeGo team. My name is Xiaomeng.
I can naturally communicate with humans, answer questions, and efficiently complete the cognitive intelligence needs in various fields</string>
<string name="aihint_txt">Hey there! I am your new friend Xiao Meng</string>
@@ -349,6 +349,7 @@
<string name="nmhmylg_txt">You guys haven’t talked yet~</string>
<string name="myltjl_txt">There is no chat record yet~</string>
<string name="to_wallet_send_redpack_txt">Gold coin balance has been deposited, click to view></string>
<string name="to_wallet_send_redpack_txt_lipin">Gift points balance has been credited, click to view></string>
<string name="species_txt">Gold coins</string>
<string name="jifen_txt">Points</string>
<string name="silver_coins_txt">Silver coins</string>
@@ -363,6 +364,7 @@
<string name="danwei_txt">pc</string>
<string name="remarks_hit_txt">Congratulations on getting rich and good luck</string>
<string name="send_in_redenvelope_txt1">Put Cash into the red envelope</string>
<string name="send_in_lipinjifen_txt1">Stuff gift points into the red envelope</string>
<string name="send_in_redtype_txt1">Put gold coins into the red envelope</string>
<string name="no_get_to_back_txt">If not collected within 24 hours, the red envelope quantity will be returned</string>
<string name="zhuanzhangobject_txt">Click to select give away object</string>
@@ -832,7 +834,7 @@
<string name="zhifushibai_txt1">Overtime unpaid</string>
<string name="zhifushibai_txt2">Payment timeout</string>
<string name="shengyu_time_txt">residue %s</string>
<string name="wangyeban_tmg_txt">Web淘梦购</string>
<string name="wangyeban_tmg_txt">WebMM</string>
<string name="duibiji_txt2">Gift cabinet redemption</string>
<string name="lpgdh_txt">Gift cabinet redemption-</string>
<string name="today_txt">Today Active</string>
@@ -889,7 +891,7 @@
<string name="userphoto_dialog_movetitle">Move to Another Album</string>
<string name="userphoto_dialog_notfriendtitle">This album is set to only be viewable by friends. Please send a friend request to view.</string>
<string name="kefu_selector_title">Please select the question you want to inquire about:</string>
<string name="kefu_select_taomenggou">Questions about Taomenggou</string>
<string name="kefu_select_taomenggou">Questions about MM</string>
<string name="kefu_select_taoleding">Questions about Taoleting</string>
<string name="kefu_select_jifengshangcheng">Questions about the Points Mall</string>
<string name="kefu_select_hezuo">Questions about Cooperative Merchants</string>
@@ -909,6 +911,7 @@
<string name="str_qi">%d Issue</string>
<string name="str_installment_tips">Including service fee NT$ %d</string>
<string name="str_installment_toast">Please select the number of installments</string>
<string name="str_chat_all">Global Chat</string>
<string name="str_teammanager_not">Not set yet, go add it~</string>
<string name="str_teammanager_tips">Only the group owner can set administrators;\nA maximum of 5 administrators can be set;\nGroup administrators can assist the group owner in managing the group chat, with functions such as removing group members and deleting chat messages.</string>
@@ -922,5 +925,7 @@
<string name="str_teammanager_add_succ_toast">Added successfully</string>
<string name="str_teammanager_add_not_toast">Please select an administrator</string>
<string name="chat_message_action_multi_select">Multi-select</string>
<string name="yijinyanchengyuan_txt">Banned members</string>
<string name="jiechujinyan_txt">Lift the ban on speech</string>
</resources>

2
app/src/main/res/values-ja-rJP/strings.xml
View File

@@ -2,4 +2,6 @@
<resources>
<string name="ps_message_max_num">最大 %1$s 個の写真またはビデオのみ選択できます</string>
<string name="yijinyanchengyuan_txt">已禁言成员</string>
<string name="jiechujinyan_txt">解除禁言</string>
</resources>

6
app/src/main/res/values-ja/strings.xml
View File

@@ -7,7 +7,7 @@
<resources>
<string name="google_map_key">AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8</string>
<string name="app_name">MM</string>
<string name="app_name">乐玩</string>
<string name="yunxin_name">網易雲信</string>
<string name="yunxin_desc">真正穩定的IM 雲端服務</string>
@@ -832,7 +832,7 @@
<string name="zhifushibai_txt1">タイムアウト未払い</string>
<string name="zhifushibai_txt2">支払タイムアウト</string>
<string name="shengyu_time_txt">余剰 %s</string>
<string name="wangyeban_tmg_txt">ホームページ版淘夢購</string>
<string name="wangyeban_tmg_txt">ホームページ版MM</string>
<string name="duibiji_txt2">ギフトボックスの交換</string>
<string name="lpgdh_txt">ギフトボックスの交換-</string>
<string name="today_txt">今日アクティブ</string>
@@ -925,5 +925,7 @@
<string name="str_chat_all">世界チャット</string>
<string name="chat_message_action_multi_select">多选</string>
<string name="yijinyanchengyuan_txt">已禁言成员</string>
<string name="jiechujinyan_txt">解除禁言</string>
</resources>

38
app/src/main/res/values-v23/themes.xml
View File

@@ -23,30 +23,30 @@
<item name="android:windowTranslucentStatus">true</item>
</style>
<style name="Theme.Xkit1" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="android:windowTranslucentStatus">false</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="colorPrimary">@color/transparent</item>
<item name="colorPrimaryDark">@color/transparent</item>
<item name="colorAccent">@color/transparent</item>
<item name="windowActionBar">false</item>
<!-- 隐藏Activity窗口的Title标题栏 -->
<item name="windowNoTitle">true</item>
<!-- <item name="android:windowFullscreen">true</item>-->
<item name="android:windowBackground">@drawable/splash_bg</item>
<!-- <item name="android:windowBackground">@mipmap/big_bg</item>-->
<item name="android:forceDarkAllowed" tools:ignore="NewApi">false</item>
<!-- <style name="Theme.Xkit1" parent="Theme.MaterialComponents.Light.NoActionBar">-->
<!-- <item name="android:windowTranslucentStatus">false</item>-->
<!-- <item name="android:statusBarColor">@android:color/transparent</item>-->
<!-- <item name="colorPrimary">@color/transparent</item>-->
<!-- <item name="colorPrimaryDark">@color/transparent</item>-->
<!-- <item name="colorAccent">@color/transparent</item>-->
<!-- <item name="windowActionBar">false</item>-->
<!-- &lt;!&ndash; 隐藏Activity窗口的Title标题栏 &ndash;&gt;-->
<!-- <item name="windowNoTitle">true</item>-->
<!-- &lt;!&ndash; <item name="android:windowFullscreen">true</item>&ndash;&gt;-->
<!-- <item name="android:windowBackground">@drawable/splash_bg</item>-->
<!-- &lt;!&ndash; <item name="android:windowBackground">@mipmap/big_bg</item>&ndash;&gt;-->
<!-- <item name="android:forceDarkAllowed" tools:ignore="NewApi">false</item>-->
<!-- Customize your theme here. -->
<!-- &lt;!&ndash; Customize your theme here. &ndash;&gt;-->
<item name="android:windowLightStatusBar">false</item>
<!-- <item name="android:windowLightStatusBar">false</item>-->
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
<!-- <item name="android:windowTranslucentNavigation">false</item>-->
<!-- <item name="android:navigationBarColor">@android:color/transparent</item>-->
<!-- <item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>-->
</style>
<!-- </style>-->
<!-- 注意：当前AppTheme主题，在values-v23中单独重复维护。原因是Android 6以下系统不支持设置

2
app/src/main/res/values-zh-rCN/strings.xml
View File

@@ -4,5 +4,7 @@
<string name="ps_message_max_num">最多只能选择%1$s张照片或视频</string>
<string name="chat_message_action_multi_select">多选</string>
<string name="yijinyanchengyuan_txt">已禁言成员</string>
<string name="jiechujinyan_txt">解除禁言</string>
</resources>

38
app/src/main/res/values-zh-rTW/strings.xml
View File

@@ -9,8 +9,8 @@
<string name="google_map_key">AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8</string>
<string name="app_name">淘夢購</string>
<string name="yunxin_name">網易雲信</string>
<string name="app_name">乐玩</string>
<string name="yunxin_name">乐玩</string>
<string name="yunxin_desc">真正穩定的IM 雲端服務</string>
<string name="welcome_button">註冊/登入</string>
@@ -45,7 +45,7 @@
<string name="mine_collect">收藏</string>
<string name="mine_about">關於淘夢購</string>
<string name="mine_about">關於MM</string>
<string name="mine_setting">設定</string>
<string name="mine_version">版本號碼</string>
<string name="mine_product">產品介紹</string>
@@ -107,7 +107,7 @@
<string name="dengru_txt">登錄</string>
<string name="mobile_login_txt">手機號碼登入</string>
<string name="wechat_login_txt">微信登入</string>
<string name="denglujitongyi_txt">輸入您的手機號碼並點擊箭頭按鈕，即表示您同意淘夢購的</string>
<string name="denglujitongyi_txt">輸入您的手機號碼並點擊箭頭按鈕，即表示您同意MM的</string>
<string name="fuwuxieyi_txt">服務協定</string>
<string name="yiji_txt">及</string>
<string name="yinsizhengche_txt">隱私權政策</string>
@@ -147,7 +147,7 @@
<string name="now_open_loc_txt">立即開啟</string>
<string name="push_say_hint_txt">一起分享新鮮事~</string>
<string name="all_visible_txt">全部可見</string>
<string name="all_visible_des_txt">所有淘夢購用戶均可見</string>
<string name="all_visible_des_txt">所有MM用戶均可見</string>
<string name="friend_visible_txt">僅好友可見</string>
<string name="friend_visible_des_txt">只有雙向好友可查看</string>
<string name="onlyme_visible_txt">僅自己可見</string>
@@ -204,7 +204,7 @@
<string name="nodate_txt">暫無數據</string>
<string name="help_center_txt">幫助中心</string>
<string name="account_and_security_txt">帳號與安全性</string>
<string name="accout_s_txt">淘夢購 ID</string>
<string name="accout_s_txt">MM ID</string>
<string name="weishezhi_txt">未設定</string>
<string name="wechat_txt">微信</string>
<string name="phone_number_txt">手機號碼</string>
@@ -230,7 +230,7 @@
<string name="qrcode_generate_activity_qr_generate_fail">行動碼產生失敗！ </string>
<string name="qrcode_share_succ_txt">行動碼分享成功</string>
<string name="qrcode_scan_activity_not_invalid_qrcode">無效的2維碼！ </string>
<string name="lailiaozhanghao_txt">淘夢購帳號</string>
<string name="lailiaozhanghao_txt">MM帳號</string>
<string name="shuaxinchenggong_txt">刷新成功</string>
<string name="mingzi_txt">名字</string>
<string name="friendbeizhu_txt">設定好友備註名</string>
@@ -255,12 +255,12 @@
<string name="allow_search_id_txt">允許透過帳號搜尋到我</string>
<string name="allow_add_me_at_group_txt">允許透過群組聊天方式加入我</string>
<string name="black_list_txt">黑名單</string>
<string name="qszacc_txt">請設定淘夢購帳號</string>
<string name="qszacc1_txt">淘夢購帳號支援英文、數位、底線</string>
<string name="qszacc_hint_txt">請輸入淘夢購帳號</string>
<string name="qszacc_txt">請設定MM帳號</string>
<string name="qszacc1_txt">MM帳號支援英文、數位、底線</string>
<string name="qszacc_hint_txt">請輸入MM帳號</string>
<string name="meiyuegaiyici_txt">每月只需修改一次，請謹慎修改！ </string>
<string name="zsvbxg_txt">您暫時無法修改淘夢購ID</string>
<string name="zsbnxg1_txt">淘夢購ID一個月只可修改一次，您將於%s年%s月%s日才可修改！ </string>
<string name="zsvbxg_txt">您暫時無法修改MMID</string>
<string name="zsbnxg1_txt">MMID一個月只可修改一次，您將於%s年%s月%s日才可修改！ </string>
<string name="yhzlxgcg_txt">使用者資訊修改成功！ </string>
<string name="general_got_it">知道了</string>
<string name="qxbdsjh_txt">請先綁定手機號碼</string>
@@ -317,7 +317,7 @@
<string name="qrcode_scan_activity_not_surpport_qrcontent">不支援的2維碼內容！ </string>
<string name="shouquandenglu_txt">授權登入</string>
<string name="tltdbj_txt">淘樂町門店設備登入</string>
<string name="seqs_dl_txt">申請使用您的淘夢購帳號登入</string>
<string name="seqs_dl_txt">申請使用您的MM帳號登入</string>
<string name="ndnc_txt">您的頭像、暱稱將會授權其使用</string>
<string name="yunxu_txt">允許</string>
<string name="jujue_txt">拒絕</string>
@@ -326,7 +326,7 @@
<string name="aihistory_clean">清空</string>
<string name="aihistory_title">確定清空問答紀錄嗎？</string>
<string name="aianswer_txt">智能小夢回答生成中，請稍後..</string>
<string name="aiintroduct_zh_txt">您好，我是淘夢購團隊研發的智能認知模型，我的名字叫小夢，我可以和人類進行自然交流，解答問題，高效完成各領域的認知智能需求</string>
<string name="aiintroduct_zh_txt">您好，我是MM團隊研發的智能認知模型，我的名字叫小夢，我可以和人類進行自然交流，解答問題，高效完成各領域的認知智能需求</string>
<string name="aiintroduct_en_txt">Hello, I am an intelligent cognitive model developed by TimeGo team. My name is Xiaomeng.
I can naturally communicate with humans, answer questions, and efficiently complete the cognitive intelligence needs in various fields</string>
<string name="aihint_txt">嘿，你好呀！我是你的新朋友小夢</string>
@@ -451,7 +451,7 @@
<string name="neweb_txt">藍新</string>
<string name="yue_pay_txt">（餘額：%.2f）</string>
<string name="fukuan_txt">付款</string>
<string name="zhiwen_tips_txt">請在系統中先錄入指紋，以便淘夢購使用指紋付款</string>
<string name="zhiwen_tips_txt">請在系統中先錄入指紋，以便MM使用指紋付款</string>
<string name="quluru_txt">去錄入</string>
<string name="shoufukuan_txt">收付款</string>
<string name="pay_setting_txt">付款設定</string>
@@ -829,7 +829,7 @@
<string name="zhifushibai_txt1">超時未支付</string>
<string name="zhifushibai_txt2">支付超時</string>
<string name="shengyu_time_txt">剩餘 %s</string>
<string name="wangyeban_tmg_txt">網頁版淘夢購</string>
<string name="wangyeban_tmg_txt">網頁版MM</string>
<string name="duibiji_txt2">禮品櫃兌換</string>
<string name="lpgdh_txt">禮品櫃兌換-</string>
<string name="today_txt">今天活躍</string>
@@ -860,7 +860,7 @@
<string name="userphoto_create_xiangbuleixing">相簿類型</string>
<string name="userphoto_create_xiangbumima">相簿訪問密碼</string>
<string name="userphoto_create_shangchuanxp">請選擇上傳相片</string>
<string name="userphoto_create_allvisible">所有淘夢購用戶均可見</string>
<string name="userphoto_create_allvisible">所有MM用戶均可見</string>
<string name="userphoto_create_friendvisible">僅雙向好友可查看</string>
<string name="userphoto_create_private">輸入訪問密碼可見</string>
<string name="userphoto_create_toast">相簿名稱不能為空</string>
@@ -889,7 +889,7 @@
<string name="userphoto_dialog_movetitle">移動到其他相簿</string>
<string name="userphoto_dialog_notfriendtitle">該相簿設置了好友查看權限，請申請添加為好友后查看</string>
<string name="kefu_selector_title">請選擇您要諮詢的問題：</string>
<string name="kefu_select_taomenggou">關於淘夢購的問題</string>
<string name="kefu_select_taomenggou">關於MM的問題</string>
<string name="kefu_select_taoleding">關於淘樂町的問題</string>
<string name="kefu_select_jifengshangcheng">關於積分商城的問題</string>
<string name="kefu_select_hezuo">關於合作商家的問題</string>
@@ -922,5 +922,7 @@
<string name="str_teammanager_add_succ_toast">添加成功</string>
<string name="str_teammanager_add_not_toast">請選擇管理員</string>
<string name="chat_message_action_multi_select">多選</string>
<string name="yijinyanchengyuan_txt">已禁言成员</string>
<string name="jiechujinyan_txt">解除禁言</string>
</resources>

6
app/src/main/res/values-zh/strings.xml
View File

@@ -7,8 +7,8 @@
<resources>
<string name="google_map_key">AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8</string>
<string name="app_name">MM</string>
<string name="yunxin_name">网易云信</string>
<string name="app_name">乐玩</string>
<string name="yunxin_name">乐玩</string>
<string name="yunxin_desc">真正稳定的IM 云服务</string>
<string name="welcome_button">注册/登录</string>
@@ -915,5 +915,7 @@
<string name="str_teammanager_add_faile_toast">管理员最多可设置5个</string>
<string name="str_teammanager_add_succ_toast">添加成功</string>
<string name="str_teammanager_add_not_toast">请选择管理员</string>
<string name="yijinyanchengyuan_txt">已禁言成员</string>
<string name="jiechujinyan_txt">解除禁言</string>
</resources>

4
app/src/main/res/values/colors.xml
View File

@@ -11,8 +11,8 @@
<color name="color_themepink">#FE6881</color>
<color name="color_themeblue_alpha70">#4d6D80FF</color> <!--透明度70-->
<color name="color_lineddd">#DDDDDD</color>
<color name="colorWhite">#FFFFFF</color>
<color name="white">#FFFFFF</color>
<color name="color_white">#FFFFFFFF</color>
<color name="color_333333">#ff333333</color>
<color name="color_80333333">#80333333</color>

4
app/src/main/res/values/ic_launcher_background.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#6B3689</color>
</resources>

4
app/src/main/res/values/strings.xml
View File

@@ -7,7 +7,7 @@
<resources>
<string name="google_map_key">AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8</string>
<string name="app_name">MM</string>
<string name="app_name">乐玩</string>
<string name="yunxin_name">网易云信</string>
<string name="yunxin_desc">真正稳定的IM 云服务</string>
@@ -916,6 +916,8 @@
<string name="str_teammanager_add_succ_toast">添加成功</string>
<string name="str_teammanager_add_not_toast">请选择管理员</string>
<string name="chat_message_action_multi_select">多选</string>
<string name="yijinyanchengyuan_txt">已禁言成员</string>
<string name="jiechujinyan_txt">解除禁言</string>
</resources>

34
app/src/main/res/values/themes.xml
View File

@@ -23,24 +23,24 @@
</style>
<style name="Theme.Xkit1" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
<item name="android:windowTranslucentStatus">false</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="colorPrimary">@color/transparent</item>
<item name="colorPrimaryDark">@color/transparent</item>
<item name="colorAccent">@color/transparent</item>
<item name="windowActionBar">false</item>
<!-- 隐藏Activity窗口的Title标题栏 -->
<item name="windowNoTitle">true</item>
<!-- <item name="android:windowFullscreen">true</item>-->
<item name="android:windowBackground">@drawable/splash_bg</item>
<item name="android:navigationBarColor">#fffafa</item>
<!-- <item name="android:windowBackground">@mipmap/big_bg</item>-->
<item name="android:forceDarkAllowed" tools:ignore="NewApi">false</item>
<!-- <style name="Theme.Xkit1" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">-->
<!-- <item name="android:windowTranslucentStatus">false</item>-->
<!-- <item name="android:windowTranslucentNavigation">true</item>-->
<!-- <item name="android:statusBarColor">@android:color/transparent</item>-->
<!-- <item name="colorPrimary">@color/transparent</item>-->
<!-- <item name="colorPrimaryDark">@color/transparent</item>-->
<!-- <item name="colorAccent">@color/transparent</item>-->
<!-- <item name="windowActionBar">false</item>-->
<!-- &lt;!&ndash; 隐藏Activity窗口的Title标题栏 &ndash;&gt;-->
<!-- <item name="windowNoTitle">true</item>-->
<!-- &lt;!&ndash; <item name="android:windowFullscreen">true</item>&ndash;&gt;-->
<!-- <item name="android:windowBackground">@drawable/splash_bg</item>-->
<!-- <item name="android:navigationBarColor">#fffafa</item>-->
<!-- &lt;!&ndash; <item name="android:windowBackground">@mipmap/big_bg</item>&ndash;&gt;-->
<!-- <item name="android:forceDarkAllowed" tools:ignore="NewApi">false</item>-->
<!-- Customize your theme here. -->
</style>
<!-- &lt;!&ndash; Customize your theme here. &ndash;&gt;-->
<!-- </style>-->
<style name="MaterialDesignDialog" parent="@style/Theme.AppCompat.Dialog">
<!-- 背景透明 -->

4
chatkit-ui/build.gradle.kts
View File

@@ -76,8 +76,8 @@ dependencies {
api("com.squareup.retrofit2:adapter-rxjava2:2.4.0")
api("io.reactivex:rxjava:1.3.0")
//skeleton
implementation("com.github.ethanhua:Skeleton:ff06517d4629e87328c41a1cce614c490ed7fb51")
implementation("io.supercharge:shimmerlayout:2.1.0")
// implementation("com.github.ethanhua:Skeleton:ff06517d4629e87328c41a1cce614c490ed7fb51")
// implementation("io.supercharge:shimmerlayout:2.1.0")
implementation("androidx.room:room-runtime:$room_version")

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_28.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_29.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_31.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_33.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_34.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_35.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_36.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_37.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_38.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/lele/lele_39.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_28.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_29.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_31.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_33.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_34.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_35.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_36.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_37.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_38.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
chatkit-ui/src/main/assets/emoji/taotao/taotao_39.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_28.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_29.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_31.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_33.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_34.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_35.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_36.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_37.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_38.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
chatkit-ui/src/main/assets/emoji/tingting/tingting_39.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_00.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 363 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_01.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 441 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_02.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 617 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_03.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 482 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_04.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 353 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_05.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 356 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_06.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 472 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_07.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 440 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_08.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 313 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_09.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 440 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_10.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 450 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_11.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 461 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_12.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 418 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_13.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 315 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_14.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 239 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_15.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 460 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_16.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 422 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_17.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 738 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_18.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 768 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_19.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 192 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_20.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 543 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_21.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 459 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_22.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 434 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_23.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 342 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_24.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 344 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_25.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 436 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_26.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 355 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_27.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 212 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_28.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 378 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_29.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 231 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_30.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 399 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_31.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 458 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_32.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 222 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_33.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 445 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_34.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 334 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/gtlt_gif_35.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 628 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 65 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 63 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 68 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 68 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 52 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 58 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 67 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 52 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 57 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 56 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 62 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 63 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 51 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 40 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 61 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_28.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_29.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_31.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_33.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_34.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
chatkit-ui/src/main/assets/emoji/tlt/tlt_gif_35.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

2
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/ChatKitUIConstant.java
View File

@@ -42,7 +42,7 @@ public class ChatKitUIConstant {
/**
* 订单详情
*/
public static String ORDERDETAILS_URL = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://shop.letschat2023.com/#/pages/payother/order?" : "http://8.218.226.64:2396/#/pages/payother/order?";
public static String ORDERDETAILS_URL = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://shop.letschat2023.com/#/pages/payother/order?" : "https://shop-test.hnsdl.com/#/pages/payother/order?";
// 合并转发消息数量限制

8
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/ChatUtils.java
View File

@@ -476,9 +476,13 @@ public class ChatUtils {
List<ChatMessageBean> limitList = new ArrayList<>();
if (msgBeanList != null && !msgBeanList.isEmpty()) {
for (ChatMessageBean bean : msgBeanList) {
if (bean.getMessageData().getMessage().getMsgType() == MsgTypeEnum.audio
|| bean.getMessageData().getMessage().getMsgType() == MsgTypeEnum.nrtc_netcall
// if (bean.getMessageData().getMessage().getMsgType() == MsgTypeEnum.audio
// || bean.getMessageData().getMessage().getMsgType() == MsgTypeEnum.nrtc_netcall
// || bean.getMessageData().getMessage().getStatus() == MsgStatusEnum.fail) {
if (bean.getMessageData().getMessage().getMsgType() == MsgTypeEnum.nrtc_netcall
|| bean.getMessageData().getMessage().getStatus() == MsgStatusEnum.fail) {
limitList.add(bean);
}
}

15
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/TeamNotificationHelper.java
View File

@@ -91,7 +91,7 @@ public class TeamNotificationHelper {
break;
case MuteTeamMember:
case SUPER_TEAM_MUTE_TLIST:
text = buildMuteTeamNotification(tid, (MuteMemberAttachment) attachment);
text = buildMuteTeamNotification(tid, fromUser,(MuteMemberAttachment) attachment);
break;
default:
text = getTeamMemberDisplayName(tid, fromUser) + ": unknown message";
@@ -349,12 +349,21 @@ public class TeamNotificationHelper {
buildMemberListString(tid, a.getTargets(), null));
}
private static String buildMuteTeamNotification(String tid, MuteMemberAttachment a) {
private static String buildMuteTeamNotification(String tid,UserInfo fromUser, MuteMemberAttachment a) {
if(a.getTargets().contains(IMKitClient.account())||fromUser.getAccount().equals(IMKitClient.account())) {
return buildMemberListString(tid, a.getTargets(), null)
+ IMKitClient.getApplicationContext().getString(R.string.chat_team_operate_by_manager)
+ (a.isMute()
? IMKitClient.getApplicationContext().getString(R.string.chat_team_mute)
: IMKitClient.getApplicationContext().getString(R.string.chat_team_un_mute));
}else{
return "";
}
// return buildMemberListString(tid, a.getTargets(), null)
// + IMKitClient.getApplicationContext().getString(R.string.chat_team_operate_by_manager)
// + (a.isMute()
// ? IMKitClient.getApplicationContext().getString(R.string.chat_team_mute)
// : IMKitClient.getApplicationContext().getString(R.string.chat_team_un_mute));
}
}

2
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/WatchTextMessageDialog.java
View File

@@ -87,7 +87,7 @@ public class WatchTextMessageDialog extends BaseDialog {
LogUtils.i("XXXXXXXX","XXXXXXXXXXX222：GIF");
String filePath = EmojiManager.getDrawablePath(viewBinding.getRoot().getContext(),messageInfo.getMessage().getContent());
if(filePath.contains("tlt_gif_")){
if(filePath!=null&&filePath.contains("tlt_gif_")){
filePath= filePath.replace("tlt_gif_","gtlt_gif_").replace(".png",".gif");
}

2
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/HelpPayViewHolder.java
View File

@@ -87,7 +87,7 @@ public class HelpPayViewHolder extends FunChatBaseMessageViewHolder {
Intent intent = new Intent();
intent.putExtra("url", ChatKitUIConstant.ORDERDETAILS_URL+"payUid="+IMKitClient.account()+"&orderid="+orderId+"&payHeadImg="+IMKitClient.getUserInfo().getAvatar());
intent.putExtra("isGame", true);
intent.setClassName(context, "com.dskj.rbchat.game.JsBridgeActivity");
intent.setClassName(context, "com.hbl.lewan.game.JsBridgeActivity");
context.startActivity(intent);
}

2
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/InviteGroupViewHolder.java
View File

@@ -72,7 +72,7 @@ public class InviteGroupViewHolder extends FunChatBaseMessageViewHolder {
private void startDetails(String teamId, Context context) {
Intent intent = new Intent();
intent.putExtra("teamId", teamId);
intent.setClassName(context, "com.dskj.rbchat.imkit.team.TeamInvitedJoinActivity");
intent.setClassName(context, "com.hbl.lewan.imkit.team.TeamInvitedJoinActivity");
context.startActivity(intent);
}

71
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketGetViewHolder.java
View File

@@ -18,6 +18,7 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.netease.nim.highavailable.LogUtils;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.uinfo.UserService;
import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
@@ -26,9 +27,7 @@ import com.netease.yunxin.kit.chatkit.ui.common.ChatDataUtils;
import com.netease.yunxin.kit.chatkit.ui.common.GsonUtils;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.chatkit.ui.databinding.ChatBaseMessageViewHolderBinding;
import com.netease.yunxin.kit.chatkit.ui.databinding.NormalChatMessageTextViewHolderBinding;
import com.netease.yunxin.kit.chatkit.ui.databinding.NormalChatMessageTipViewHolder1Binding;
import com.netease.yunxin.kit.chatkit.ui.databinding.NormalChatMessageTipViewHolderBinding;
import com.netease.yunxin.kit.chatkit.ui.databinding.RedpacketViewheadBinding;
import com.netease.yunxin.kit.chatkit.ui.dialog.RedPacketDialog;
import com.netease.yunxin.kit.chatkit.ui.model.ChatMessageBean;
@@ -54,7 +53,7 @@ public class RedPacketGetViewHolder extends ChatBaseMessageViewHolder {
public void addViewToMessageContainer() {
textBinding =
NormalChatMessageTipViewHolder1Binding.inflate(
LayoutInflater.from(parent.getContext()), getMessageContainer(), true);
LayoutInflater.from(parent.getContext()), getMessageTopGroup(), true);
}
@Override
@@ -84,16 +83,16 @@ public class RedPacketGetViewHolder extends ChatBaseMessageViewHolder {
currentMessage = message;
String name = message.getMessageData().getMessage().getAttachStr();
RedPacketShareBean circleShareBean = GsonUtils.getObjFromJSON(name, RedPacketShareBean.class);
Log.i("名片", "名片获取到的数据-10：" + GsonUtils.beanToJSONString(message));
// Log.i("名片", "名片获取到的数据-10：" + GsonUtils.beanToJSONString(message));
Log.i("名片", "名片获取到的数据00：" + name);
Log.i("名片", "名片获取到的数据20：" + GsonUtils.beanToJSONString(circleShareBean));
// Log.i("名片", "名片获取到的数据00：" + name);
// Log.i("名片", "名片获取到的数据20：" + GsonUtils.beanToJSONString(circleShareBean));
ChatDataUtils.set(textBinding.messageTipText.getContext(), "redpack_" + circleShareBean.data.getId(), Integer.parseInt(circleShareBean.data.getStatus()));
RxBus.getInstance().post(new RxHongBaoBean(circleShareBean.data.getId()));
textBinding.messageTipText.setGravity(Gravity.CENTER);
textBinding.messageTipText.setTextColor(
IMKitClient.getApplicationContext().getResources().getColor(R.color.color_999999));
Log.i("名片", "名片获取到的数据3：" + circleShareBean.data.getGroupId());
// Log.i("名片", "名片获取到的数据3：" + circleShareBean.data.getGroupId());
if (TextUtils.isEmpty(circleShareBean.data.getGroupId())) {
NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(circleShareBean.data.getReceiverUid() + "");
@@ -128,11 +127,17 @@ public class RedPacketGetViewHolder extends ChatBaseMessageViewHolder {
}
}
} else {
if((circleShareBean.data.getSenderUid()+"").equals(IMKitClient.account())||(circleShareBean.data.getCheckUserUid()+"").equals(IMKitClient.account())){
if((circleShareBean.data.getSenderUid()+"").equals(IMKitClient.account())
||(circleShareBean.data.getCheckUserUid()+"").equals(IMKitClient.account())){
textBinding.messageTipText.setVisibility(View.VISIBLE);
NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(circleShareBean.data.getCheckUserUid() + "");
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO11111");
if(user!=null) {
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO22222222");
if ((circleShareBean.data.getSenderUid() + "").equals(IMKitClient.account())) {
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO555555555");
String names = user.getName();
if(IMKitClient.account().equals(circleShareBean.data.getCheckUserUid()+"")){
names = textBinding.messageTipText.getResources().getString(R.string.ni_txt);
@@ -159,6 +164,8 @@ public class RedPacketGetViewHolder extends ChatBaseMessageViewHolder {
textBinding.messageTipText.setText(Html.fromHtml(String.format(nameG, names)));
}
} else {
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO666666666666");
NimUserInfo user1 = NIMClient.getService(UserService.class).getUserInfo(circleShareBean.data.getSenderUid() + "");
if (!TextUtils.isEmpty(circleShareBean.data.isReceiveEnd())&&circleShareBean.data.getCoinType().equals("0")) {
@@ -181,13 +188,57 @@ public class RedPacketGetViewHolder extends ChatBaseMessageViewHolder {
textBinding.messageTipText.setText(Html.fromHtml(String.format(nameG, user1.getName())));
}
}
}else{
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO3333333333");
}
}else{
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO44444444");
baseViewBinding.tvTimeMy.setVisibility(View.GONE);
baseViewBinding.tvTimeOther.setVisibility(View.GONE);
textBinding.messageTipText.setVisibility(View.GONE);
baseViewBinding.baseRoot.setVisibility(View.GONE);
textBinding.messageTipText.setVisibility(View.VISIBLE);
baseViewBinding.baseRoot.setVisibility(View.VISIBLE);
NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(circleShareBean.data.getCheckUserUid() + "");
if(user!=null) {
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO4444444422222222");
String names = user.getName();
if (circleShareBean.data.getCoinType().equals("0")) {
String nameG = String.format(textBinding.messageTipText.getResources().getString(R.string.s_font_color_fc605c_font_txt2),names,circleShareBean.data.getSenderNickname());
//
// if (!TextUtils.isEmpty(circleShareBean.data.isReceiveEnd()) && circleShareBean.data.isReceiveEnd().equals("1")) {
// nameG += textBinding.messageTipText.getResources().getString(R.string.hbylw_txt);
// }
textBinding.messageTipText.setText(Html.fromHtml(String.format(nameG)));
} else if (circleShareBean.data.getCoinType().equals("1")) {
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO44444444444444444");
// String nameG = textBinding.messageTipText.getResources().getString(R.string.s_font_color_629cff_font_txt);
String nameG = String.format(textBinding.messageTipText.getResources().getString(R.string.s_font_color_629cff_font_txt2),names,circleShareBean.data.getSenderNickname());
// if (!TextUtils.isEmpty(circleShareBean.data.isReceiveEnd()) && circleShareBean.data.isReceiveEnd().equals("1")) {
// nameG += textBinding.messageTipText.getResources().getString(R.string.hbylw_txt);
// }
textBinding.messageTipText.setText(Html.fromHtml(String.format(nameG)));
} else {
// String nameG = textBinding.messageTipText.getResources().getString(R.string.s_font_color_gift_font_txt);
String nameG = String.format(textBinding.messageTipText.getResources().getString(R.string.s_font_color_gift_font_txt2),names,circleShareBean.data.getSenderNickname());
// if (!TextUtils.isEmpty(circleShareBean.data.isReceiveEnd()) && circleShareBean.data.isReceiveEnd().equals("1")) {
// nameG += textBinding.messageTipText.getResources().getString(R.string.hbylw_txt);
// }
textBinding.messageTipText.setText(Html.fromHtml(String.format(nameG)));
}
}else{
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO444444443333333333333");
}
}
}

8
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java
View File

@@ -148,7 +148,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
@Override
public void toSumbit() {
Intent intent = new Intent();
intent.setClassName(context, "com.dskj.rbchat.main.mine.ChangeAccoutActionActivity");
intent.setClassName(context, "com.hbl.lewan.main.mine.ChangeAccoutActionActivity");
intent.putExtra("type", 1);
context.startActivity(intent);
}
@@ -250,7 +250,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
}
if (groupBean.getStatus() > 0) {
Intent intent = new Intent();
intent.setClassName(binding.bigLy.getContext(), "com.dskj.rbchat.redpack.ReceiveRedPacketActivity");
intent.setClassName(binding.bigLy.getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
intent.putExtra("bean", groupBean);
intent.putExtra("isGroup", true);
intent.putExtra("name", groupBean.getSenderNickname() + "");
@@ -264,7 +264,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
if ((groupBean.getGrabbers().get(i).getGrabberUid() + "").equals(IMKitClient.account())) {
isAt = true;
Intent intent = new Intent();
intent.setClassName(binding.bigLy.getContext(), "com.dskj.rbchat.redpack.ReceiveRedPacketActivity");
intent.setClassName(binding.bigLy.getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
intent.putExtra("bean", groupBean);
intent.putExtra("isGroup", true);
intent.putExtra("name", groupBean.getSenderNickname() + "");
@@ -294,7 +294,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
}
if (data.getStatus() > 0 || ((data.getSenderUid() + "").equals(IMKitClient.account()))) {
Intent intent = new Intent();
intent.setClassName(binding.bigLy.getContext(), "com.dskj.rbchat.redpack.ReceiveRedPacketActivity");
intent.setClassName(binding.bigLy.getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
intent.putExtra("bean", data);
intent.putExtra("isGroup", false);
intent.putExtra("name", message.getMessageData().getMessage().getFromNick());

4
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/TransferViewHolder.java
View File

@@ -139,7 +139,7 @@ public class TransferViewHolder extends ChatBaseMessageViewHolder {
}
}
Intent intent = new Intent();
intent.setClassName(binding.bigLy.getContext(), "com.dskj.rbchat.redpack.TransferInfoActivity");
intent.setClassName(binding.bigLy.getContext(), "com.hbl.lewan.redpack.TransferInfoActivity");
//Long id, Integer status, Integer amount, Integer senderUid, Integer receiverUid, String sendTime, String receiveTime, String remark, Integer coinType
TransferBean transferBean = new TransferBean(Long.parseLong(circleShareBean.data.getId()), Integer.parseInt(circleShareBean.data.getStatus()), Integer.parseInt(circleShareBean.data.getAmount()),
Integer.parseInt(circleShareBean.data.getSenderUid()), Integer.parseInt(circleShareBean.data.getReceiverUid()), circleShareBean.data.getSendTime(), circleShareBean.data.getReceiveTime(), circleShareBean.data.getRemark(),
@@ -252,7 +252,7 @@ public class TransferViewHolder extends ChatBaseMessageViewHolder {
@Override
public void toSumbit() {
Intent intent = new Intent();
intent.setClassName(context, "com.dskj.rbchat.main.mine.ChangeAccoutActionActivity");
intent.setClassName(context, "com.hbl.lewan.main.mine.ChangeAccoutActionActivity");
intent.putExtra("type", 1);
context.startActivity(intent);
}

2
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/UserAlbumsViewHolder.java
View File

@@ -84,7 +84,7 @@ public class UserAlbumsViewHolder extends FunChatBaseMessageViewHolder {
private void startDetails(int id, String password, String userId, Context context) {
Intent intent = new Intent();
intent.setClassName(context, "com.dskj.rbchat.main.mine.photo.UserPhotoDetailsActivity");
intent.setClassName(context, "com.hbl.lewan.main.mine.photo.UserPhotoDetailsActivity");
intent.putExtra("albumId", id);
// intent.putExtra("password", password);
intent.putExtra("userId", userId);

4
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/dialog/RedPacketDialog.java
View File

@@ -248,7 +248,7 @@ public class RedPacketDialog extends Dialog {
dismiss();
Intent intent = new Intent();
intent.setClassName(getContext(), "com.dskj.rbchat.redpack.ReceiveRedPacketActivity");
intent.setClassName(getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
intent.putExtra("bean", tuiMessageBean);
intent.putExtra("isGroup", false);
intent.putExtra("name", message.getMessageData().getMessage().getFromNick());
@@ -262,7 +262,7 @@ public class RedPacketDialog extends Dialog {
// ARouter.getInstance().build("/chat/receive_red_packet").withSerializable("bean", bean).withBoolean("isGroup", tuiMessageBean.isGroup()).withString("groupId", groupId).navigation();
Intent intent = new Intent();
intent.setClassName(getContext(), "com.dskj.rbchat.redpack.ReceiveRedPacketActivity");
intent.setClassName(getContext(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
intent.putExtra("bean", redpacketGroupBean);
intent.putExtra("isGroup", true);
intent.putExtra("name", message.getMessageData().getMessage().getFromNick());

42
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/factory/ChatPopActionFactory.java
View File

@@ -66,7 +66,7 @@ public class ChatPopActionFactory {
boolean isManager = false;
public List<ChatPopMenuAction> getNormalActions(ChatMessageBean message) {
public List<ChatPopMenuAction> getNormalActions(ChatMessageBean message,int isManageNumber,int otherIsManageNumber,boolean isMute) {
List<ChatPopMenuAction> actions = new ArrayList<>();
if (message.getMessageData() == null) {
return actions;
@@ -102,12 +102,25 @@ public class ChatPopActionFactory {
actions.add(getCopyAction(message));
}
actions.add(getReplyAction(message));
if (message.getViewType() == MsgTypeEnum.audio.getValue()||message.getViewType() == MsgTypeEnum.custom.getValue()) {
// if (message.getViewType() == MsgTypeEnum.audio.getValue()||message.getViewType() == MsgTypeEnum.custom.getValue()) {
if (message.getViewType() == MsgTypeEnum.custom.getValue()) {
}else{
actions.add(getTransmitAction(message)); //转发
actions.add(getMultiSelectAction(message));
}
if ((imMessage.getSessionType() == SessionTypeEnum.Team || imMessage.getSessionType() == SessionTypeEnum.SUPER_TEAM)) {
if(isManager&&(isManageNumber==1||(isManageNumber>otherIsManageNumber&&otherIsManageNumber!=1))&&imMessage.getDirect() == MsgDirectionEnum.In) {
if (isMute) {
actions.add(getJieChuJinYanAction(message));
} else {
actions.add(getJinYanAction(message));
}
}
}
// if (message.getViewType() != MsgTypeEnum.location.getValue()) {
// actions.add(getPinAction(message));
// }
@@ -225,6 +238,31 @@ public class ChatPopActionFactory {
});
}
private ChatPopMenuAction getJinYanAction(ChatMessageBean message) {
return new ChatPopMenuAction(
ActionConstants.POP_ACTION_JINYAN_SELECT,
R.string.chat_team_mute,
R.drawable.jinyan_img,
(view, messageInfo) -> {
if (actionListener != null) {
actionListener.get().onJinYan(messageInfo);
}
});
}
private ChatPopMenuAction getJieChuJinYanAction(ChatMessageBean message) {
return new ChatPopMenuAction(
ActionConstants.POP_ACTION_JINYAN_SELECT,
R.string.chat_team_un_mute,
R.drawable.jinyan_img1,
(view, messageInfo) -> {
if (actionListener != null) {
actionListener.get().onJieChuJinYan(messageInfo);
}
});
}
private ChatPopMenuAction getCollectionAction(ChatMessageBean message) {
return new ChatPopMenuAction(
ActionConstants.POP_ACTION_COLLECTION,

3
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/page/fragment/FunChatFragment.java
View File

@@ -138,6 +138,7 @@ public abstract class FunChatFragment extends ChatBaseFragment {
@Override
protected void initData(Bundle bundle) {
// ToastX.showShortToast("111111111111");
EventCenter.registerEventNotify(cleanHistoryEvent);
EventCenter.registerEventNotify(chatDeleteEvent);
initCalendarView();
@@ -221,7 +222,7 @@ public abstract class FunChatFragment extends ChatBaseFragment {
viewBinding.chattopview.ivChatannouncement.setVisibility(View.VISIBLE);
} else if (sessionType == SessionTypeEnum.P2P) {
viewBinding.chattopview.ivChatcall.setVisibility(View.VISIBLE);
viewBinding.chattopview.ivChatcall.setVisibility(View.GONE);
viewBinding.chattopview.ivChatannouncement.setVisibility(View.GONE);
}
viewBinding.chattopview.ivChatsearch.setOnClickListener(view -> {

4
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/page/fragment/FunChatP2PFragment.java
View File

@@ -111,7 +111,7 @@ public class FunChatP2PFragment extends FunChatFragment {
viewBinding.chattopview.ivChatcall.setVisibility(View.GONE);
getMessageBottomLayout().setShowBlackView();
} else {
viewBinding.chattopview.ivChatcall.setVisibility(View.VISIBLE);
viewBinding.chattopview.ivChatcall.setVisibility(View.GONE);
getMessageBottomLayout().setHideBlackView();
}
@@ -199,7 +199,7 @@ public class FunChatP2PFragment extends FunChatFragment {
}
chatView.getTitleBar().setVisibility(View.GONE);
viewBinding.chattopview.tvChattitle.setText(name);
viewBinding.chattopview.ivChatcall.setVisibility(View.VISIBLE);
viewBinding.chattopview.ivChatcall.setVisibility(View.GONE);
viewBinding.chattopview.ivChatannouncement.setVisibility(View.GONE);
viewBinding.chattopview.ivChatsetting.setVisibility(View.VISIBLE);
getMessageBottomLayout().setShowInit();

121
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/page/fragment/FunChatTeamFragment.java
View File

@@ -16,6 +16,7 @@ import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewTreeObserver;
@@ -38,22 +39,28 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamFieldEnum;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.nimlib.sdk.team.model.TeamMember;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.model.IMMessageInfo;
import com.netease.yunxin.kit.chatkit.model.IMTeamMessageReceiptInfo;
import com.netease.yunxin.kit.chatkit.model.TeamWithCurrentMember;
import com.netease.yunxin.kit.chatkit.model.UserInfoWithTeam;
import com.netease.yunxin.kit.chatkit.repo.TeamRepo;
import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant;
import com.netease.yunxin.kit.chatkit.ui.R;
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.GsonUtils;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
import com.netease.yunxin.kit.chatkit.ui.data.entity.ChatDraftData;
import com.netease.yunxin.kit.chatkit.ui.databinding.FunChatSearchViewHolderBinding;
import com.netease.yunxin.kit.chatkit.ui.fun.view.MessageBottomLayout;
import com.netease.yunxin.kit.chatkit.ui.fun.viewholder.FunSearchMessageViewHolder;
import com.netease.yunxin.kit.chatkit.ui.model.ChatMessageBean;
import com.netease.yunxin.kit.chatkit.ui.model.CleanHistoryEvent;
import com.netease.yunxin.kit.chatkit.ui.model.RxBusToVoom;
import com.netease.yunxin.kit.chatkit.ui.model.TeamExtensionBean;
import com.netease.yunxin.kit.chatkit.ui.model.UpdateTeamEvent;
import com.netease.yunxin.kit.chatkit.ui.model.ait.AitBlock;
@@ -72,8 +79,11 @@ import com.netease.yunxin.kit.common.utils.SizeUtils;
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.provider.FetchCallback;
import com.netease.yunxin.kit.corekit.im.utils.IMKitConstant;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
import com.netease.yunxin.kit.corekit.model.ErrorMsg;
import com.netease.yunxin.kit.corekit.model.ResultInfo;
import com.netease.yunxin.kit.corekit.route.XKitRouter;
import org.json.JSONException;
@@ -83,6 +93,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
public class FunChatTeamFragment extends FunChatFragment {
@@ -94,6 +105,7 @@ public class FunChatTeamFragment extends FunChatFragment {
@Override
protected void initData(Bundle bundle) {
// ToastX.showShortToast("111111111111111");
ALog.d(LIB_TAG, TAG, "initData");
sessionType = SessionTypeEnum.Team;
@@ -105,7 +117,13 @@ public class FunChatTeamFragment extends FunChatFragment {
}
if (TextUtils.isEmpty(sessionID)) {
sessionID = teamInfo.getId();
}
if (!TextUtils.isEmpty(sessionID)) {
getUserType(sessionID);
}
anchorMessage = (IMMessage) bundle.getSerializable(RouterConstant.KEY_MESSAGE);
// chatView
// .getTitleBar()
@@ -171,8 +189,111 @@ public class FunChatTeamFragment extends FunChatFragment {
}
super.initData(bundle);
RxBus.getInstance().toObservable(Integer.class)
.subscribeOn(rx.schedulers.Schedulers.io())
.unsubscribeOn(rx.schedulers.Schedulers.io())
.subscribe(changeImageViewBean -> {//回顶部
if(changeImageViewBean == -99999){
if(!TextUtils.isEmpty(sessionID)){
getUserType(sessionID);
}
}
});
}
@Override
public void onResume() {
super.onResume();
if(!TextUtils.isEmpty(sessionID)){
getUserType(sessionID);
}
}
private void getUserType(String id) {
// Log.i("LAILIAOLIAO","LAILIAOLIAO 乱七八糟："+id);
TeamRepo.queryTeamWithMember(
id,
Objects.requireNonNull(IMKitClient.account()),
new FetchCallback<TeamWithCurrentMember>() {
@Override
public void onSuccess(@Nullable TeamWithCurrentMember param) {
ALog.d(LIB_TAG, TAG, "requestTeamData,onSuccess:" + (param == null));
if(param!=null&&param.getTeamMember()!=null){
if(param.getTeamMember().getType() == TeamMemberType.Manager){
isManage = 2;
}else if(param.getTeamMember().getType() == TeamMemberType.Owner){
isManage = 1;
}else {
isManage = 0;
}
if(param.getTeamMember().isMute()){
getMessageBottomLayout().setShowTeamJinYan();
}else{
getMessageBottomLayout().setHideBlackView();
}
}else{
isManage = 0;
}
}
@Override
public void onFailed(int code) {
}
@Override
public void onException(@Nullable Throwable exception) {
}
});
// NIMClient.getService(TeamService.class).queryTeamMember(id, IMKitClient.account()).setCallback(new RequestCallback<TeamMember>() {
// @Override
// public void onSuccess(TeamMember members) {
// Log.i("LAILIAOLIAO","LAILIAOLIAO 乱七八糟："+GsonUtils.beanToJSONString(members));
// if(members!=null){
// if(members.getType() == TeamMemberType.Manager){
// isManage = 2;
// }else if(members.getType() == TeamMemberType.Owner){
// isManage = 1;
// }else {
// isManage = 0;
// }
//
// if(members.isMute()){
// getMessageBottomLayout().setShowTeamJinYan();
// }
//
// }else{
// isManage = 0;
// }
//
//
//
// }
//
// @Override
// public void onFailed(int code) {
// // 撤销群管理员失败
//// Log.i("LAILIAOLIAO","LAILIAOLIAO 乱七八糟："+code);
//
// }
//
// @Override
// public void onException(Throwable exception) {
// // 错误
//// Log.i("LAILIAOLIAO","LAILIAOLIAO 乱七八糟："+exception.getMessage());
//
// }
// });
}
//
// private void getJinYan(String teamId){
//
// }
public TeamExtensionBean extensionBean;
private void refreshView() {

7
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/MessageBottomLayout.java
View File

@@ -577,6 +577,13 @@ public class MessageBottomLayout extends FrameLayout
});
}
public void setShowTeamJinYan() {
hideCurrentInput();
mBinding.tvChatblack.setText(R.string.ninyibeijinyan_txt);
mBinding.layoutChatblack.setVisibility(VISIBLE);
mBinding.layoutChatblack.setOnClickListener(view -> {
});
}
public void setShowIsNotFriend() {
hideCurrentInput();
mBinding.tvChatblack.setText(getResources().getString(R.string.not_friend_chat_tv));

10
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java
View File

@@ -67,11 +67,11 @@ public class FunBottomActionFactory {
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_MINGPIAN, R.drawable.ic_action_mingpian, R.string.mingpian_txt));
}
}
actions.add(
new ActionItem(
ActionConstants.ACTION_TYPE_LOCATION,
R.drawable.ic_location1,
R.string.chat_message_location));
// actions.add(
// new ActionItem(
// ActionConstants.ACTION_TYPE_LOCATION,
// R.drawable.ic_location1,
// R.string.chat_message_location));
actions.add(new ActionItem(ActionConstants.ACTION_TYPE_ALBUMS, R.drawable.ic_action_share_albums, R.string.sharealbums_txt));
if (getConfig(IMKitClient.getApplicationContext(), "redpkg_score", false)) { //积分赠送
//礼品积分红包

6
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/message/ChatMessageViewHolderFactory.java
View File

@@ -17,6 +17,8 @@ import android.view.LayoutInflater;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.netease.nim.highavailable.LogUtils;
import com.netease.yunxin.kit.chatkit.ui.IChatFactory;
import com.netease.yunxin.kit.chatkit.ui.databinding.ChatBaseMessageViewHolderBinding;
import com.netease.yunxin.kit.chatkit.ui.fun.view.message.viewholder.ChatAudioMessageViewHolder;
@@ -54,6 +56,10 @@ public abstract class ChatMessageViewHolderFactory implements IChatFactory {
ChatBaseMessageViewHolderBinding viewHolderBinding =
ChatBaseMessageViewHolderBinding.inflate(
LayoutInflater.from(parent.getContext()), parent, false);
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO结果是啥类型："+viewType);
if (viewType == NORMAL_MESSAGE_VIEW_TYPE_AUDIO) {
viewHolder = new ChatAudioMessageViewHolder(viewHolderBinding, viewType);
} else if (viewType == NORMAL_MESSAGE_VIEW_TYPE_IMAGE) {

24
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/message/viewholder/ChatNotificationMessageViewHolder.java
View File

@@ -12,10 +12,13 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.netease.nim.highavailable.LogUtils;
import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment;
import com.netease.nimlib.sdk.msg.attachment.NotificationAttachmentWithExtension;
import com.netease.yunxin.kit.chatkit.ui.R;
import com.netease.yunxin.kit.chatkit.ui.common.TeamNotificationHelper;
import com.netease.yunxin.kit.chatkit.ui.databinding.ChatBaseMessageViewHolderBinding;
import com.netease.yunxin.kit.chatkit.ui.databinding.FunChatMessageTextViewHolder1Binding;
import com.netease.yunxin.kit.chatkit.ui.databinding.FunChatMessageTextViewHolderBinding;
import com.netease.yunxin.kit.chatkit.ui.model.ChatMessageBean;
import com.netease.yunxin.kit.chatkit.ui.view.input.ActionConstants;
@@ -30,7 +33,7 @@ public class ChatNotificationMessageViewHolder extends FunChatBaseMessageViewHol
private static final String LOG_TAG = "ChatNotificationMessageViewHolder";
FunChatMessageTextViewHolderBinding textBinding;
FunChatMessageTextViewHolder1Binding textBinding;
public ChatNotificationMessageViewHolder(
@NonNull ChatBaseMessageViewHolderBinding parent, int viewType) {
@@ -40,7 +43,7 @@ public class ChatNotificationMessageViewHolder extends FunChatBaseMessageViewHol
@Override
public void addViewToMessageContainer() {
textBinding =
FunChatMessageTextViewHolderBinding.inflate(
FunChatMessageTextViewHolder1Binding.inflate(
LayoutInflater.from(parent.getContext()), getMessageTopGroup(), true);
}
@@ -82,23 +85,36 @@ public class ChatNotificationMessageViewHolder extends FunChatBaseMessageViewHol
private void loadData(ChatMessageBean message, ChatMessageBean lastMessage, boolean refreshTime) {
if (message.getMessageData().getMessage().getAttachment()
instanceof NotificationAttachmentWithExtension) {
instanceof NotificationAttachment) {
textBinding.messageText.setGravity(Gravity.CENTER);
textBinding.messageText.setTextColor(
IMKitClient.getApplicationContext().getResources().getColor(R.color.color_999999));
textBinding.messageText.setTextSize(12);
String content = TeamNotificationHelper.getTeamNotificationText(message.getMessageData());
textBinding.messageText.setText(content);
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO结果是啥："+content);
if (TextUtils.isEmpty(content)) {
baseViewBinding.baseRoot.setVisibility(View.GONE);
textBinding.messageText.setVisibility(View.GONE);
setVisibility(false);
} else {
baseViewBinding.baseRoot.setVisibility(View.VISIBLE);
textBinding.messageText.setVisibility(View.VISIBLE);
setVisibility(true);
if (lastMessage == null && refreshTime) {
setTime(message, null);
// setTime(message, null);
baseViewBinding.otherUserAvatar.setVisibility(View.GONE);
baseViewBinding.myAvatar.setVisibility(View.GONE);
baseViewBinding.messageStatus.setVisibility(View.GONE);
baseViewBinding.tvTimeMy.setVisibility(View.GONE);
baseViewBinding.tvTimeOther.setVisibility(View.GONE);
}
}
} else {
baseViewBinding.baseRoot.setVisibility(View.GONE);
textBinding.messageText.setVisibility(View.GONE);
setVisibility(false);
}
}
}

3
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/message/viewholder/ChatTextMessageViewHolder.java
View File

@@ -62,8 +62,9 @@ public class ChatTextMessageViewHolder extends FunChatBaseMessageViewHolder {
textBinding.messageText.setVisibility(View.GONE);
textBinding.messageTextGif.setVisibility(View.VISIBLE);
LogUtils.i("XXXXXXXX","XXXXXXXXXXX222：GIF");
String filePath = EmojiManager.getDrawablePath(textBinding.getRoot().getContext(),message.getMessageData().getMessage().getContent());
if(filePath.contains("tlt_gif_")){
if(filePath!=null&&filePath.contains("tlt_gif_")){
filePath= filePath.replace("tlt_gif_","gtlt_gif_").replace(".png",".gif");
}
Glide.with(textBinding.getRoot().getContext()).load("file:///android_asset/"+filePath)

8
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/message/viewholder/ChatTipsMessageViewHolder.java
View File

@@ -11,6 +11,8 @@ import android.view.LayoutInflater;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.netease.nim.highavailable.LogUtils;
import com.netease.yunxin.kit.chatkit.ui.R;
import com.netease.yunxin.kit.chatkit.ui.databinding.ChatBaseMessageViewHolderBinding;
import com.netease.yunxin.kit.chatkit.ui.databinding.FunChatMessageTipViewHolderBinding;
@@ -72,11 +74,17 @@ public class ChatTipsMessageViewHolder extends FunChatBaseMessageViewHolder {
IMKitClient.getApplicationContext().getResources().getColor(R.color.color_999999));
textBinding.messageTipText.setTextSize(12);
textBinding.messageTipText.setText(content);
// LogUtils.i("BIKAOVIDEO","BIKAOVIDEO结果是啥1111："+content);
if (lastMessage == null) {
setTime(message, null);
}
baseViewBinding.baseRoot.setVisibility(View.VISIBLE);
setVisibility(true);
} else {
baseViewBinding.baseRoot.setVisibility(View.GONE);
setVisibility(false);
}
}
}

19
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/message/viewholder/FunChatBaseMessageViewHolder.java
View File

@@ -10,10 +10,12 @@ import android.text.style.ImageSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.RecyclerView;
import com.netease.nim.highavailable.LogUtils;
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
@@ -78,6 +80,23 @@ public class FunChatBaseMessageViewHolder extends ChatBaseMessageViewHolder {
baseViewBinding.llSignal.setLayoutParams(signalLayoutParams);
}
public void setVisibility(boolean visible) {
RecyclerView.LayoutParams param = (RecyclerView.LayoutParams) itemView.getLayoutParams();
if (visible) {
param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
param.width = LinearLayout.LayoutParams.MATCH_PARENT;
itemView.setLayoutParams(param);
itemView.setVisibility(View.VISIBLE);
} else {
param.height = 0;
param.width = 0;
itemView.setLayoutParams(param);
itemView.setVisibility(View.GONE);
}
}
@Override
protected void setUserInfo(ChatMessageBean message) {
// 修改用户头像

6
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java
View File

@@ -49,13 +49,13 @@ public interface ApiService {
/**
* 正式环境
*/
// String URL = "https://api.letschat2023.com/";
String URL = "https://api.hnsdl.com/";
/**
* 测试环境
*/
String URL = "https://api-test.letschat2023.com/";
// String URL = "https://8.217.244.135:8001/";
// String URL = "https://api-test.letschat2023.com/";
// String URL = "https://api-test.hnsdl.com/";
String SUBSTATIONID = "1703655363476242434";

5
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/page/fragment/NormalChatFragment.java
View File

@@ -16,6 +16,7 @@ import com.netease.yunxin.kit.chatkit.ui.databinding.NormalChatFragmentBinding;
import com.netease.yunxin.kit.chatkit.ui.dialog.ChatBaseForwardSelectDialog;
import com.netease.yunxin.kit.chatkit.ui.normal.ChatMessageForwardSelectDialog;
import com.netease.yunxin.kit.chatkit.ui.page.fragment.ChatBaseFragment;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
public abstract class NormalChatFragment extends ChatBaseFragment {
@@ -56,7 +57,9 @@ public abstract class NormalChatFragment extends ChatBaseFragment {
}
@Override
protected void initData(Bundle bundle) {}
protected void initData(Bundle bundle) {
// ToastX.showShortToast("2222222222222222");
}
@Override
public String getUserInfoRoutePath() {

10
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/view/input/BottomActionFactory.java
View File

@@ -43,11 +43,11 @@ public class BottomActionFactory {
ActionConstants.ACTION_TYPE_CAMERA,
R.drawable.ic_shoot1,
R.string.chat_message_more_shoot));
actions.add(
new ActionItem(
ActionConstants.ACTION_TYPE_LOCATION,
R.drawable.ic_location1,
R.string.chat_message_location));
// actions.add(
// new ActionItem(
// ActionConstants.ACTION_TYPE_LOCATION,
// R.drawable.ic_location1,
// R.string.chat_message_location));
// actions.add(
// new ActionItem(
// ActionConstants.ACTION_TYPE_FILE, R.drawable.ic_send_file, R.string.chat_message_file));

29
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/view/message/viewholder/ChatNotificationMessageViewHolder.java
View File

@@ -10,6 +10,8 @@ import android.view.LayoutInflater;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.netease.nim.highavailable.LogUtils;
import com.netease.nimlib.sdk.msg.attachment.NotificationAttachmentWithExtension;
import com.netease.yunxin.kit.chatkit.ui.R;
import com.netease.yunxin.kit.chatkit.ui.common.TeamNotificationHelper;
@@ -36,7 +38,7 @@ public class ChatNotificationMessageViewHolder extends NormalChatBaseMessageView
public void addViewToMessageContainer() {
textBinding =
NormalChatMessageTextViewHolderBinding.inflate(
LayoutInflater.from(parent.getContext()), getMessageContainer(), true);
LayoutInflater.from(parent.getContext()), getMessageTopGroup(), true);
}
@Override
@@ -58,15 +60,15 @@ public class ChatNotificationMessageViewHolder extends NormalChatBaseMessageView
@Override
protected void onLayoutConfig(ChatMessageBean messageBean) {
ConstraintLayout.LayoutParams messageContainerLayoutParams =
(ConstraintLayout.LayoutParams) baseViewBinding.messageContainer.getLayoutParams();
ConstraintLayout.LayoutParams messageTopLayoutParams =
(ConstraintLayout.LayoutParams) baseViewBinding.messageTopGroup.getLayoutParams();
ConstraintLayout.LayoutParams messageBottomLayoutParams =
(ConstraintLayout.LayoutParams) baseViewBinding.messageBottomGroup.getLayoutParams();
messageContainerLayoutParams.horizontalBias = 0.5f;
messageTopLayoutParams.horizontalBias = 0.5f;
messageBottomLayoutParams.horizontalBias = 0.5f;
// ConstraintLayout.LayoutParams messageContainerLayoutParams =
// (ConstraintLayout.LayoutParams) baseViewBinding.messageContainer.getLayoutParams();
// ConstraintLayout.LayoutParams messageTopLayoutParams =
// (ConstraintLayout.LayoutParams) baseViewBinding.messageTopGroup.getLayoutParams();
// ConstraintLayout.LayoutParams messageBottomLayoutParams =
// (ConstraintLayout.LayoutParams) baseViewBinding.messageBottomGroup.getLayoutParams();
// messageContainerLayoutParams.horizontalBias = 0.5f;
// messageTopLayoutParams.horizontalBias = 0.5f;
// messageBottomLayoutParams.horizontalBias = 0.5f;
}
@Override
@@ -84,16 +86,23 @@ public class ChatNotificationMessageViewHolder extends NormalChatBaseMessageView
textBinding.messageText.setTextSize(12);
String content = TeamNotificationHelper.getTeamNotificationText(message.getMessageData());
textBinding.messageText.setText(content);
LogUtils.i("BIKAOVIDEO","BIKAOVIDEO结果是啥11111111："+content);
if (TextUtils.isEmpty(content)) {
baseViewBinding.baseRoot.setVisibility(View.GONE);
textBinding.messageText.setVisibility(View.GONE);
setVisibility(false);
} else {
baseViewBinding.baseRoot.setVisibility(View.VISIBLE);
textBinding.messageText.setVisibility(View.VISIBLE);
setVisibility(true);
if (lastMessage == null && refreshTime) {
setTime(message, null);
}
}
} else {
baseViewBinding.baseRoot.setVisibility(View.GONE);
textBinding.messageText.setVisibility(View.GONE);
setVisibility(false);
}
}
}

7
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/view/message/viewholder/ChatTipsMessageViewHolder.java
View File

@@ -33,7 +33,7 @@ public class ChatTipsMessageViewHolder extends NormalChatBaseMessageViewHolder {
public void addViewToMessageContainer() {
textBinding =
NormalChatMessageTipViewHolderBinding.inflate(
LayoutInflater.from(parent.getContext()), getMessageContainer(), true);
LayoutInflater.from(parent.getContext()), getMessageTopGroup(), true);
}
@Override
@@ -75,8 +75,13 @@ public class ChatTipsMessageViewHolder extends NormalChatBaseMessageViewHolder {
if (lastMessage == null) {
setTime(message, null);
}
baseViewBinding.baseRoot.setVisibility(View.VISIBLE);
setVisibility(true);
} else {
baseViewBinding.baseRoot.setVisibility(View.GONE);
setVisibility(false);
}
}
}

19
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/normal/view/message/viewholder/NormalChatBaseMessageViewHolder.java
View File

@@ -8,9 +8,13 @@ import android.text.TextUtils;
import android.text.style.ImageSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.RecyclerView;
import com.netease.nimlib.sdk.msg.model.MsgThreadOption;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.model.IMMessageInfo;
@@ -104,6 +108,21 @@ public class NormalChatBaseMessageViewHolder extends ChatBaseMessageViewHolder {
}
}
public void setVisibility(boolean visible) {
RecyclerView.LayoutParams param = (RecyclerView.LayoutParams) itemView.getLayoutParams();
if (visible) {
param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
param.width = LinearLayout.LayoutParams.MATCH_PARENT;
itemView.setLayoutParams(param);
itemView.setVisibility(View.VISIBLE);
} else {
param.height = 0;
param.width = 0;
itemView.setLayoutParams(param);
itemView.setVisibility(View.GONE);
}
}
@Override
protected void onLayoutConfig(ChatMessageBean messageBean) {
super.onLayoutConfig(messageBean);

4
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/ChatPinBaseActivity.java
View File

@@ -301,11 +301,11 @@ public abstract class ChatPinBaseActivity extends BaseActivity {
new ActionItem(ACTION_COPY_PIN, 0, R.string.chat_message_action_copy)
.setTitleColorResId(R.color.color_333333));
}
if (messageInfo.getViewType() != MsgTypeEnum.audio.getValue()) {
// if (messageInfo.getViewType() != MsgTypeEnum.audio.getValue()) {
actions.add(
new ActionItem(ACTION_TRANSMIT_PIN, 0, R.string.chat_message_action_transmit)
.setTitleColorResId(R.color.color_333333));
}
// }
return actions;
}

155
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/fragment/ChatBaseFragment.java
View File

@@ -5,6 +5,7 @@
package com.netease.yunxin.kit.chatkit.ui.page.fragment;
import static com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant.LIB_TAG;
import static com.netease.yunxin.kit.chatkit.ui.ChatMessageType.NOTICE_MESSAGE_VIEW_TYPE;
import static com.netease.yunxin.kit.chatkit.ui.view.input.ActionConstants.PAYLOAD_REFRESH_AUDIO_ANIM;
import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.REQUEST_CONTACT_SELECTOR_KEY;
@@ -71,8 +72,10 @@ import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
import com.netease.nimlib.sdk.msg.attachment.NetCallAttachment;
import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment;
import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum;
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
import com.netease.nimlib.sdk.msg.constant.NotificationType;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.AttachmentProgress;
import com.netease.nimlib.sdk.msg.model.GetMessageDirectionEnum;
@@ -82,6 +85,8 @@ import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;
import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum;
import com.netease.nimlib.sdk.team.model.MuteMemberAttachment;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.nimlib.sdk.team.model.TeamMember;
import com.netease.nimlib.sdk.uinfo.UserService;
@@ -290,6 +295,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
public boolean isGuanFang;
public int isManage = 0;
@Nullable
@Override
public View onCreateView(
@@ -848,7 +854,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
}
Intent intent = new Intent();
intent.setClassName(getContext(), "com.dskj.rbchat.redpack.SendRedPacketActivity");
intent.setClassName(getContext(), "com.hbl.lewan.redpack.SendRedPacketActivity");
intent.putExtra("receiverUid", sessionID);
intent.putExtra("isGroup", sessionType != SessionTypeEnum.P2P);
startActivityForResult(intent, 456);
@@ -871,7 +877,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
showDialogPay();
} else {
Intent intent = new Intent();
intent.setClassName(getContext(), "com.dskj.rbchat.redpack.SendGiftRedPacketActivity");
intent.setClassName(getContext(), "com.hbl.lewan.redpack.SendGiftRedPacketActivity");
intent.putExtra("receiverUid", sessionID);
intent.putExtra("isGroup", sessionType != SessionTypeEnum.P2P);
startActivityForResult(intent, 456);
@@ -905,7 +911,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
}
Intent intent = new Intent();
intent.setClassName(getContext(), "com.dskj.rbchat.redpack.TransferAccountsActivity");
intent.setClassName(getContext(), "com.hbl.lewan.redpack.TransferAccountsActivity");
intent.putExtra("receiverUid", sessionID);
startActivityForResult(intent, 457);
}
@@ -932,7 +938,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
}
Intent intent = new Intent();
intent.setClassName(getContext(), "com.dskj.rbchat.redpack.TransferAccountsActivity");
intent.setClassName(getContext(), "com.hbl.lewan.redpack.TransferAccountsActivity");
intent.putExtra("type", true);
intent.putExtra("receiverUid", sessionID);
startActivityForResult(intent, 457);
@@ -1493,7 +1499,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
@Override
public void toSumbit() {
Intent intent = new Intent();
intent.setClassName(getContext(), "com.dskj.rbchat.main.mine.ChangeAccoutActionActivity");
intent.setClassName(getContext(), "com.hbl.lewan.main.mine.ChangeAccoutActionActivity");
intent.putExtra("type", 1);
startActivity(intent);
}
@@ -1534,7 +1540,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
@Override
public void toSumbit() {
Intent intent = new Intent();
intent.setClassName(getContext(), "com.dskj.rbchat.wallet.SetPayPasswordActivity");
intent.setClassName(getContext(), "com.hbl.lewan.wallet.SetPayPasswordActivity");
startActivity(intent);
}
@@ -1614,7 +1620,47 @@ public abstract class ChatBaseFragment extends BaseFragment {
}
int[] location = new int[2];
chatView.getMessageListView().getLocationOnScreen(location);
popMenu.show(view, messageBean, location[1]);
if ((sessionType == SessionTypeEnum.SUPER_TEAM || sessionType == SessionTypeEnum.Team)) {
NIMClient.getService(TeamService.class).queryTeamMember(sessionID,messageBean.getMessageData().getFromUser().getAccount()).setCallback(new RequestCallback<TeamMember>() {
@Override
public void onSuccess(TeamMember members) {
// Log.i("LAILIAOLIAO","LAILIAOLIAO 乱七八糟："+GsonUtils.beanToJSONString(members));
if(members!=null){
if(members.getType() == TeamMemberType.Manager){
popMenu.show(view, messageBean, location[1],isManage,2,members.isMute());
}else if(members.getType() == TeamMemberType.Owner){
popMenu.show(view, messageBean, location[1],isManage,1,members.isMute());
}else {
popMenu.show(view, messageBean, location[1],isManage,0,members.isMute());
}
}else{
popMenu.show(view, messageBean, location[1],isManage,0,members.isMute());
}
}
@Override
public void onFailed(int code) {
// 撤销群管理员失败
// Log.i("LAILIAOLIAO","LAILIAOLIAO 乱七八糟："+code);
}
@Override
public void onException(Throwable exception) {
// 错误
// Log.i("LAILIAOLIAO","LAILIAOLIAO 乱七八糟："+exception.getMessage());
}
});
}else{
popMenu.show(view, messageBean, location[1],0,0,false);
}
}
return true;
}
@@ -1646,17 +1692,34 @@ public abstract class ChatBaseFragment extends BaseFragment {
|| !delegateListener.onUserIconClick(view, position, messageBean)) {
// Log.i("点击了去用户详情页", "点击了去用户详情页：" + messageBean.getMessageData().getMessage().getFromAccount());
if (!isServices) {
//如果是群，且群不允许群内添加好友 当前登录用户不是群主，以及userid 也不是群主 直接跳过
if ((sessionType == SessionTypeEnum.SUPER_TEAM || sessionType == SessionTypeEnum.Team)
&& isAllowAd == 0
&& teamInfo != null && !teamInfo.getCreator().equals(IMKitClient.account())
if ((sessionType == SessionTypeEnum.SUPER_TEAM || sessionType == SessionTypeEnum.Team)) {
if(teamInfo!=null&&isManage>0){
XKitRouter.withKey(getUserInfoRoutePath())
.withContext(view.getContext())
.withParam(
"uid",
messageBean.getMessageData().getMessage().getFromAccount())
.withParam("userId", messageBean.getMessageData().getMessage().getFromAccount())
.withParam("isGroup", (sessionType == SessionTypeEnum.Team || sessionType == SessionTypeEnum.SUPER_TEAM))
.withParam("teamId", (sessionType == SessionTypeEnum.Team || sessionType == SessionTypeEnum.SUPER_TEAM) ? messageBean.getMessageData().getMessage().getSessionId() : "")
.navigate();
return false;
}
if (isAllowAd == 0 && teamInfo != null && !teamInfo.getCreator().equals(IMKitClient.account())
&& !teamInfo.getCreator().equals(messageBean.getMessageData().getMessage().getFromAccount())) {
NIMClient.getService(TeamService.class).queryTeamMember(teamInfo.getId(), messageBean.getMessageData().getMessage().getFromAccount()).setCallback(new RequestCallback<TeamMember>() {
NIMClient.getService(TeamService.class).queryTeamMember(teamInfo.getId(),
messageBean.getMessageData().getMessage().getFromAccount()).setCallback(new RequestCallback<TeamMember>() {
@Override
public void onSuccess(TeamMember members) {
if(members!=null){
if(members.getType() == TeamMemberType.Manager){
if (members != null) {
if (members.getType() == TeamMemberType.Manager) {
XKitRouter.withKey(getUserInfoRoutePath())
.withContext(view.getContext())
.withParam(
@@ -1685,6 +1748,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
return false;
}
}
XKitRouter.withKey(getUserInfoRoutePath())
.withContext(view.getContext())
.withParam(
@@ -2011,18 +2075,13 @@ public abstract class ChatBaseFragment extends BaseFragment {
.withParam("isGroup", sessionType != SessionTypeEnum.P2P)
.withParam("userId", businessShareBean.data.getAccout())
.navigate();
// XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
// .withContext(getActivity())
// .withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, businessShareBean.data.getAccout())
// .withParam("userId", businessShareBean.data.getAccout())
// .navigate();
}
break;
case ChatMessageType.CUSTOM_STICKER_TRANSFER_ACCOUNTS:
TransferShareBean transferShareBean = GsonUtils.getObjFromJSON(name, TransferShareBean.class);
if (transferShareBean != null) {
Intent intent = new Intent();
intent.setClassName(getActivity(), "com.dskj.rbchat.redpack.TransferInfoActivity");
intent.setClassName(getActivity(), "com.hbl.lewan.redpack.TransferInfoActivity");
//Long id, Integer status, Integer amount, Integer senderUid, Integer receiverUid, String sendTime, String receiveTime, String remark, Integer coinType
TransferBean transferBean = new TransferBean(Long.parseLong(transferShareBean.data.getId()),
Integer.parseInt(transferShareBean.data.getStatus()),
@@ -2064,7 +2123,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
UserAlbumsShareBean albumsShareBean = GsonUtils.getObjFromJSON(name, UserAlbumsShareBean.class);
if (albumsShareBean.data != null) {
Intent intent = new Intent();
intent.setClassName(getActivity(), "com.dskj.rbchat.main.mine.photo.UserPhotoDetailsActivity");
intent.setClassName(getActivity(), "com.hbl.lewan.main.mine.photo.UserPhotoDetailsActivity");
intent.putExtra("albumId", albumsShareBean.data.getAlbumId());
intent.putExtra("userId", albumsShareBean.data.getUserId());
startActivity(intent);
@@ -2078,7 +2137,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
+ helpPayShareBean.data.getPayUid() + "&orderid=" + helpPayShareBean.data.getOrderId()
+ "&payHeadImg=" + ContactRepo.getUserInfo(helpPayShareBean.data.getPayUid()).getAvatar());
intent.putExtra("isGame", true);
intent.setClassName(getActivity(), "com.dskj.rbchat.game.JsBridgeActivity");
intent.setClassName(getActivity(), "com.hbl.lewan.game.JsBridgeActivity");
startActivity(intent);
}
break;
@@ -2087,7 +2146,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
if (inviteGroupBean.data != null) {
Intent intent = new Intent();
intent.putExtra("teamId", inviteGroupBean.data.getTeamId());
intent.setClassName(getActivity(), "com.dskj.rbchat.imkit.team.TeamInvitedJoinActivity");
intent.setClassName(getActivity(), "com.hbl.lewan.imkit.team.TeamInvitedJoinActivity");
startActivity(intent);
}
break;
@@ -2143,7 +2202,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
private void toTiaozhuan(RedpacketBean data, ChatMessageBean message) {
if (data.getStatus() > 0 || ((data.getSenderUid() + "").equals(IMKitClient.account()))) {
Intent intent = new Intent();
intent.setClassName(getActivity(), "com.dskj.rbchat.redpack.ReceiveRedPacketActivity");
intent.setClassName(getActivity(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
intent.putExtra("bean", data);
intent.putExtra("isGroup", false);
intent.putExtra("name", message.getMessageData().getMessage().getFromNick());
@@ -2176,7 +2235,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
private void toTiaozhuanGroup(RedpacketGroupBean groupBean, ChatMessageBean message) {
if (groupBean.getStatus() > 0) {
Intent intent = new Intent();
intent.setClassName(getActivity(), "com.dskj.rbchat.redpack.ReceiveRedPacketActivity");
intent.setClassName(getActivity(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
intent.putExtra("bean", groupBean);
intent.putExtra("isGroup", true);
intent.putExtra("name", groupBean.getSenderNickname() + "");
@@ -2190,7 +2249,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
if ((groupBean.getGrabbers().get(i).getGrabberUid() + "").equals(IMKitClient.account())) {
isAt = true;
Intent intent = new Intent();
intent.setClassName(getActivity(), "com.dskj.rbchat.redpack.ReceiveRedPacketActivity");
intent.setClassName(getActivity(), "com.hbl.lewan.redpack.ReceiveRedPacketActivity");
intent.putExtra("bean", groupBean);
intent.putExtra("isGroup", true);
intent.putExtra("name", groupBean.getSenderNickname() + "");
@@ -2359,8 +2418,28 @@ public abstract class ChatBaseFragment extends BaseFragment {
&& chatConfig.popMenuClickListener != null
&& chatConfig.popMenuClickListener.onCustom(view, messageInfo, action);
}
@Override
public boolean onJinYan(ChatMessageBean messageInfo) {
toJinyan(messageInfo,true);
return IChatPopMenuClickListener.super.onJinYan(messageInfo);
}
@Override
public boolean onJieChuJinYan(ChatMessageBean messageInfo) {
toJinyan(messageInfo,false);
return IChatPopMenuClickListener.super.onJieChuJinYan(messageInfo);
}
};
private void toJinyan(ChatMessageBean messageInfo, boolean isMute) {
TeamService v2TeamService = NIMClient.getService(TeamService.class);
v2TeamService.muteTeamMember(sessionID, messageInfo.getMessageData().getFromUser().getAccount(),isMute);
}
private void showDeleteConfirmDialog(ChatMessageBean message) {
CommonChoiceDialog dialog = new CommonChoiceDialog();
dialog
@@ -2580,7 +2659,33 @@ public abstract class ChatBaseFragment extends BaseFragment {
protected void onReceiveMessage(FetchResult<List<ChatMessageBean>> listFetchResult) {
ALog.d(
LIB_TAG, LOG_TAG, "rec message observe newer load:" + (listFetchResult.getData() == null));
LinearLayoutManager layoutManager = (LinearLayoutManager) chatView.getMessageListView().getLayoutManager();
int lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
/**当我滑动到了上面 有新消息进来 不要顶上来 只有停留在顶部的时候才自动滑动到底部*/
if (lastPosition==chatView.getMessageListView().getMessageAdapter().getMessageList().size()-1) {
chatView.appendMessageList(listFetchResult.getData());
}else{
chatView.appendMessageList(listFetchResult.getData(),false);
}
/**
* 群聊禁言和解除禁言实时更新底部UI
*/
if(sessionType == SessionTypeEnum.Team||sessionType == SessionTypeEnum.SUPER_TEAM) {
for (ChatMessageBean chatMessageBean : listFetchResult.getData()) {
if (chatMessageBean.getMessageData().getMessage().getAttachment() instanceof NotificationAttachment) {
NotificationAttachment attachment =
(NotificationAttachment) chatMessageBean.getMessageData().getMessage().getAttachment();
if(attachment.getType() == NotificationType.MuteTeamMember||attachment.getType() ==NotificationType.SUPER_TEAM_MUTE_TLIST){
MuteMemberAttachment muteMemberAttachment = (MuteMemberAttachment) attachment;
if(muteMemberAttachment.getTargets().contains(IMKitClient.account())){
RxBus.getInstance().post(-99999);
}
}
}
}
}
}
protected void onSentMessage(FetchResult<ChatMessageBean> fetchResult) {

8
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/viewmodel/ChatBaseViewModel.java
View File

@@ -637,10 +637,10 @@ public abstract class ChatBaseViewModel extends BaseViewModel {
if (message.isRevoked()) {
continue;
}
if (message.getMessageData().getMessage().getMsgType() == MsgTypeEnum.audio) {
hasError = true;
continue;
}
// if (message.getMessageData().getMessage().getMsgType() == MsgTypeEnum.audio) {
// hasError = true;
// continue;
// }
for (String session : sessionInfo) {
IMMessage forwardMessage =
MessageBuilder.createForwardMessage(

32
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/ait/AitContactSelectorDialog.java
View File

@@ -17,8 +17,8 @@ import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.ethanhua.skeleton.Skeleton;
import com.ethanhua.skeleton.SkeletonScreen;
//import com.ethanhua.skeleton.Skeleton;
//import com.ethanhua.skeleton.SkeletonScreen;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.netease.yunxin.kit.chatkit.model.UserInfoWithTeam;
import com.netease.yunxin.kit.chatkit.ui.R;
@@ -44,7 +44,7 @@ public class AitContactSelectorDialog extends BottomSheetDialog {
//展示风格，0:办公风格 1:新版本
private int uiStyle = 0;
private boolean teamManager;
private SkeletonScreen skeletonScreen;
// private SkeletonScreen skeletonScreen;
public AitContactSelectorDialog(@NonNull Context context) {
this(context, R.style.TransBottomSheetTheme);
@@ -70,16 +70,16 @@ public class AitContactSelectorDialog extends BottomSheetDialog {
}
private void initShowSkeleton() {
skeletonScreen = Skeleton.bind(binding.contactList)
.adapter(adapter)
.load(R.layout.discover_aitchild_item)
.shimmer(false) // whether show shimmer animation. default is true
.count(10) // the recycler view item count. default is 10
// .color(R.color.color_e3e4e4) // the shimmer color. default is #a2878787
// .angle(20) // the shimmer angle. default is 20;
// .duration(1500) // the shimmer animation duration. default is 1000;
// .frozen(false)
.show();
// skeletonScreen = Skeleton.bind(binding.contactList)
// .adapter(adapter)
// .load(R.layout.discover_aitchild_item)
// .shimmer(false) // whether show shimmer animation. default is true
// .count(10) // the recycler view item count. default is 10
//// .color(R.color.color_e3e4e4) // the shimmer color. default is #a2878787
//// .angle(20) // the shimmer angle. default is 20;
//// .duration(1500) // the shimmer animation duration. default is 1000;
//// .frozen(false)
// .show();
}
private void initViews() {
@@ -188,9 +188,9 @@ public class AitContactSelectorDialog extends BottomSheetDialog {
public void setData(List<UserInfoWithTeam> data, boolean refresh) {
adapter.setMembers(data);
if (skeletonScreen != null) {
skeletonScreen.hide();
}
// if (skeletonScreen != null) {
// skeletonScreen.hide();
// }
listmemebers.clear();
listmemebers.addAll(data);
if (refresh) {

45
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/emoji/EmojiFragment.java
View File

@@ -88,7 +88,6 @@ public class EmojiFragment extends BaseFragment {
private void initList() {
if(type==3){
linearLayoutManager = new GridLayoutManager(getActivity(), 4);
}else {
linearLayoutManager = new GridLayoutManager(getActivity(), 7);
}
@@ -217,31 +216,33 @@ public class EmojiFragment extends BaseFragment {
String fileName = xmlParser.getAttributeValue(0);
String tag = xmlParser.getAttributeValue(2);
EmojiPickerView.Entry entry = new EmojiPickerView.Entry(tag, EMOJI_DIR + catalog + "/" + fileName);
if (index == 1) {
if (fileName.startsWith("taotao_"))
// if (index == 1) {
// if (fileName.startsWith("taotao_"))
// text2entry.put(entry.text, entry);
// if (catalog.equals("taotao")) {
// defaultEntries.add(entry);
// }
// } else if (index == 2) {
// if (fileName.startsWith("lele_"))
// text2entry.put(entry.text, entry);
// if (catalog.equals("lele")) {
// defaultEntries.add(entry);
// }
// } else
if (index == 0) {
if (fileName.startsWith("emoji_"))
text2entry.put(entry.text, entry);
if (catalog.equals("taotao")) {
defaultEntries.add(entry);
}
} else if (index == 2) {
if (fileName.startsWith("lele_"))
text2entry.put(entry.text, entry);
if (catalog.equals("lele")) {
defaultEntries.add(entry);
}
} else if (index == 0) {
if (fileName.startsWith("tingting_"))
text2entry.put(entry.text, entry);
if (catalog.equals("tingting")) {
defaultEntries.add(entry);
}
} else if (index == 3) {
if (fileName.startsWith("tlt_"))
text2entry.put(entry.text, entry);
if (catalog.equals("tlt")) {
if (catalog.equals("default")) {
defaultEntries.add(entry);
}
}
// else if (index == 3) {
// if (fileName.startsWith("tlt_"))
// text2entry.put(entry.text, entry);
// if (catalog.equals("tlt")) {
// defaultEntries.add(entry);
// }
// }
}

92
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/emoji/EmojiPickerView.java
View File

@@ -132,27 +132,27 @@ public class EmojiPickerView extends LinearLayout implements IEmojiCategoryChang
show();
}
EmojiFragment fragmentTingTing;
EmojiFragment fragmentTaoTao;
EmojiFragment fragmentLeLe;
EmojiFragment fragmentGif;
// EmojiFragment fragmentTaoTao;
// EmojiFragment fragmentLeLe;
// EmojiFragment fragmentGif;
private void initViewPager() {
listFragment = new ArrayList<>();
listFragment.add(fragmentTingTing = EmojiFragment.newInstance(0));
listFragment.add(fragmentTaoTao = EmojiFragment.newInstance(1));
listFragment.add(fragmentLeLe = EmojiFragment.newInstance(2));
listFragment.add(fragmentGif = EmojiFragment.newInstance(3));
// listFragment.add(fragmentTaoTao = EmojiFragment.newInstance(1));
// listFragment.add(fragmentLeLe = EmojiFragment.newInstance(2));
// listFragment.add(fragmentGif = EmojiFragment.newInstance(3));
titles = new ArrayList<>();
titles.add("tingting");
titles.add("taotao");
titles.add("lele");
titles.add("gif");
titles.add("default");
// titles.add("taotao");
// titles.add("lele");
// titles.add("gif");
CommunityAdapter adapter = new CommunityAdapter((FragmentActivity) getContext(), titles, listFragment);
viewBinding.viewPager.setAdapter(adapter);
fragmentTingTing.setIEmojiSelectedListener(listener);
fragmentTaoTao.setIEmojiSelectedListener(listener);
fragmentLeLe.setIEmojiSelectedListener(listener);
fragmentGif.setIEmojiSelectedListener(listener);
// fragmentTaoTao.setIEmojiSelectedListener(listener);
// fragmentLeLe.setIEmojiSelectedListener(listener);
// fragmentGif.setIEmojiSelectedListener(listener);
}
@@ -225,18 +225,18 @@ public class EmojiPickerView extends LinearLayout implements IEmojiCategoryChang
//
// btn.setCheckedImageId(R.drawable.ic_emoji);
CheckedImageButton btn3= addEmojiIconTabBtn(index++, tabCheckListener);
btn3.setNormalImageId(R.drawable.tingting_img);
btn3.setCheckedImageId(R.drawable.tingting_img);
btn3.setNormalImageId(R.drawable.ic_emoji);
btn3.setCheckedImageId(R.drawable.ic_emoji);
// // taotao
CheckedImageButton btn = addEmojiIconTabBtn(index++, tabCheckListener);
btn.setNormalImageId(R.drawable.taotao_img);
btn.setCheckedImageId(R.drawable.taotao_img);
// CheckedImageButton btn = addEmojiIconTabBtn(index++, tabCheckListener);
// btn.setNormalImageId(R.drawable.taotao_img);
// btn.setCheckedImageId(R.drawable.taotao_img);
//
// // lele
CheckedImageButton btn2 = addEmojiIconTabBtn(index++, tabCheckListener);
btn2.setNormalImageId(R.drawable.lele_img);
btn2.setCheckedImageId(R.drawable.lele_img);
// CheckedImageButton btn2 = addEmojiIconTabBtn(index++, tabCheckListener);
// btn2.setNormalImageId(R.drawable.lele_img);
// btn2.setCheckedImageId(R.drawable.lele_img);
//
// // tingting
@@ -244,9 +244,9 @@ public class EmojiPickerView extends LinearLayout implements IEmojiCategoryChang
//
// // tingting
CheckedImageButton btn4= addEmojiIconTabBtn(index++, tabCheckListener);
btn4.setNormalImageId(R.drawable.gif_img);
btn4.setCheckedImageId(R.drawable.gif_img);
// CheckedImageButton btn4= addEmojiIconTabBtn(index++, tabCheckListener);
// btn4.setNormalImageId(R.drawable.gif_img);
// btn4.setCheckedImageId(R.drawable.gif_img);
//tlt
// if (withSticker) {
@@ -368,31 +368,33 @@ public class EmojiPickerView extends LinearLayout implements IEmojiCategoryChang
// defaultEntries.add(entry);
// }
// }else
if(index == 1){
if (fileName.startsWith("taotao_"))
// if(index == 1){
// if (fileName.startsWith("taotao_"))
// text2entry.put(entry.text, entry);
// if (catalog.equals("taotao")) {
// defaultEntries.add(entry);
// }
// }else if(index == 2){
// if (fileName.startsWith("lele_"))
// text2entry.put(entry.text, entry);
// if (catalog.equals("lele")) {
// defaultEntries.add(entry);
// }
// }else
if(index == 0){
if (fileName.startsWith("emoji_"))
text2entry.put(entry.text, entry);
if (catalog.equals("taotao")) {
defaultEntries.add(entry);
}
}else if(index == 2){
if (fileName.startsWith("lele_"))
text2entry.put(entry.text, entry);
if (catalog.equals("lele")) {
defaultEntries.add(entry);
}
}else if(index == 0){
if (fileName.startsWith("tingting_"))
text2entry.put(entry.text, entry);
if (catalog.equals("tingting")) {
defaultEntries.add(entry);
}
}else if(index == 3){
if (fileName.startsWith("tlt_"))
text2entry.put(entry.text, entry);
if (catalog.equals("tlt")) {
if (catalog.equals("default")) {
defaultEntries.add(entry);
}
}
// else if(index == 3){
// if (fileName.startsWith("tlt_"))
// text2entry.put(entry.text, entry);
// if (catalog.equals("tlt")) {
// defaultEntries.add(entry);
// }
// }

4
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/input/ActionConstants.java
View File

@@ -46,6 +46,10 @@ public class ActionConstants {
public static final String POP_ACTION_PIN = "POP_ACTION_PIN";
//消息长按菜单-多选
public static final String POP_ACTION_MULTI_SELECT = "POP_ACTION_MULTI_SELECT";
public static final String POP_ACTION_JINYAN_SELECT = "POP_ACTION_JINYAN_SELECT";
//消息长按菜单-收藏
public static final String POP_ACTION_COLLECTION = "POP_ACTION_COLLECTION";
//消息长按菜单-删除

2
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/media/SimpleVideoPlayer.java
View File

@@ -146,7 +146,7 @@ public class SimpleVideoPlayer extends ConstraintLayout {
return;
}
VideoAttachment videoAttachment = (VideoAttachment) message.getAttachment();
videoFilePath = videoAttachment.getPath(); ///storage/emulated/0/Android/data/com.dskj.rbchat/cache/video/e31b3802d23e3cb191875303f48ee576
videoFilePath = videoAttachment.getPath(); ///storage/emulated/0/Android/data/com.hbl.lewan/cache/video/e31b3802d23e3cb191875303f48ee576
if (TextUtils.isEmpty(videoFilePath)) {
videoFilePath = videoAttachment.getThumbPath();
}

11
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/popmenu/ChatPopMenu.java
View File

@@ -50,7 +50,9 @@ public class ChatPopMenu {
private ChatPopMenuLayoutBinding layoutBinding;
private final MenuAdapter adapter;
private final List<ChatPopMenuAction> chatPopMenuActionList = new ArrayList<>();
int isManageNumber = 0;
int otherIsManageNumber = 0;
boolean isMute;
public ChatPopMenu() {
layoutBinding =
ChatPopMenuLayoutBinding.inflate(LayoutInflater.from(IMKitClient.getApplicationContext()));
@@ -70,7 +72,10 @@ public class ChatPopMenu {
popupWindow.setOutsideTouchable(true);
}
public void show(View anchorView, ChatMessageBean message, int minY) {
public void show(View anchorView, ChatMessageBean message, int minY,int isManage,int otherIsManage,boolean isMute) {
isManageNumber = isManage;
otherIsManageNumber = otherIsManage;
this.isMute = isMute;
ALog.d(LIB_TAG, TAG, "show");
adapter.setMessageInfo(message);
initDefaultAction(message);
@@ -127,7 +132,7 @@ public class ChatPopMenu {
@SuppressLint("NotifyDataSetChanged")
private void initDefaultAction(ChatMessageBean message) {
chatPopMenuActionList.clear();
chatPopMenuActionList.addAll(ChatPopActionFactory.getInstance().getNormalActions(message));
chatPopMenuActionList.addAll(ChatPopActionFactory.getInstance().getNormalActions(message,isManageNumber,otherIsManageNumber,isMute));
adapter.notifyDataSetChanged();
}

6
chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/view/popmenu/IChatPopMenuClickListener.java
View File

@@ -29,6 +29,12 @@ public interface IChatPopMenuClickListener {
return false;
}
default boolean onJinYan(ChatMessageBean messageInfo) {
return false;
}
default boolean onJieChuJinYan(ChatMessageBean messageInfo) {
return false;
}
default boolean onCollection(ChatMessageBean messageInfo) {
return false;
}

22
chatkit-ui/src/main/res-fun/layout/fun_chat_message_text_view_holder1.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/messageText"
android:layout_width="wrap_content"
android:gravity="center"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_16"
android:visibility="gone"
android:textColor="@color/color_383838"
tools:text="@tools:sample/lorem" />
</FrameLayout>

2
chatkit-ui/src/main/res-normal/layout/chat_search_item_layout.xml
View File

@@ -70,7 +70,7 @@
android:textSize="12dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/cav_icon"
app:layout_goneMarginEnd="@dimen/dimen_20_dp"
tools:ignore="MissingConstraints,SpUsage"/>
</androidx.constraintlayout.widget.ConstraintLayout>

24
chatkit-ui/src/main/res-normal/layout/normal_chat_message_text_view_holder1.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/messageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_14"
android:textColor="@color/color_333333"
android:ellipsize="end"
tools:text="@tools:sample/lorem" />
</FrameLayout>

2
chatkit-ui/src/main/res-normal/layout/normal_chat_message_tip_view_holder1.xml
View File

@@ -14,7 +14,7 @@
android:id="@+id/messageTipText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_16"
android:textSize="@dimen/text_size_12"
android:textColor="@color/color_333333"
tools:text="@tools:sample/lorem" />

BIN
chatkit-ui/src/main/res/drawable-xxhdpi/jinyan_img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
chatkit-ui/src/main/res/drawable-xxhdpi/jinyan_img1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

18
chatkit-ui/src/main/res/layout/chat_base_message_view_holder.xml
View File

@@ -79,7 +79,6 @@
android:layout_height="@dimen/dimen_40_dp"
app:layout_constraintStart_toEndOf="@id/chatMsgSelectLayout"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="0dp"
android:layout_marginStart="@dimen/dimen_10_dp"/>
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
@@ -146,12 +145,11 @@
android:id="@+id/messageTopGroup"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@+id/myAvatar"
app:layout_constraintStart_toEndOf="@id/otherUserAvatar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/nameBarrier"
app:layout_constraintWidth_default="wrap"
app:layout_goneMarginEnd="@dimen/dimen_42_dp"
app:layout_goneMarginStart="@dimen/dimen_42_dp" />
/>
<com.netease.yunxin.kit.common.ui.widgets.LongClickableFrameLayout
android:id="@+id/messageContainer"
@@ -164,9 +162,7 @@
app:layout_constraintTop_toBottomOf="@id/nameBarrier"
app:layout_constraintWidth_default="wrap"
app:layout_constraintWidth_max="220dp"
app:layout_goneMarginEnd="@dimen/dimen_10_dp"
app:layout_goneMarginStart="@dimen/dimen_10_dp"
app:layout_goneMarginTop="0dp" />
/>
<TextView
android:id="@+id/tv_reply_findmessage"
@@ -194,8 +190,7 @@
app:layout_constraintStart_toEndOf="@id/otherUserAvatar"
app:layout_constraintTop_toBottomOf="@id/messageContainer"
app:layout_constraintWidth_default="wrap"
app:layout_goneMarginEnd="@dimen/dimen_10_dp"
app:layout_goneMarginStart="@dimen/dimen_10_dp" />
/>
<LinearLayout
android:id="@+id/llSignal"
@@ -208,8 +203,7 @@
app:layout_constraintEnd_toStartOf="@id/myAvatar"
app:layout_constraintStart_toEndOf="@id/otherUserAvatar"
app:layout_constraintTop_toBottomOf="@id/messageBottomGroup"
app:layout_goneMarginEnd="@dimen/dimen_45_dp"
app:layout_goneMarginStart="@dimen/dimen_45_dp">
>
<ImageView
android:layout_width="wrap_content"

19
chatkit-ui/src/main/res/values-en/strings.xml
View File

@@ -263,12 +263,18 @@
<string name="fachudehongbao_txt">Red envelope sent by %s</string>
<string name="manle_end_txt">I\'m too slow, the red envelopes are gone</string>
<string name="redexpired_txt">Red envelopes cannot be collected if they are over 24 hours old</string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s received your <font color = \'#FC605C\'>Cash red envelope</font>]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[You received %s <font color = \'#FC605C\'>Cash red envelope</font>]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s received your <font color = \'#629CFF\'>Gift Points Red Envelope</font>]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[You received %s <font color = \'#629CFF\'>Gift Points Red Envelope</font>]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s received your <font color = \'#FC605C\'>Gift Money Red Envelope</font>]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[You received %s <font color = \'#FC605C\'>Gift Money Red Envelope</font>]]></string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s received your Cash red envelope]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[You received %s Cash red envelope]]></string>
<string name="s_font_color_fc605c_font_txt2"><![CDATA[%s received %s Cash red envelope]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s received your Gift Points Red Envelope]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[You received %s Gift Points Red Envelope]]></string>
<string name="s_font_color_629cff_font_txt2"><![CDATA[%s received %s Gift Points Red Envelope]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s received your Gift Money Red Envelope]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[You received %s Gift Money Red Envelope]]></string>
<string name="s_font_color_gift_font_txt2"><![CDATA[%s received %s Gift Money Red Envelope]]></string>
<string name="ni_txt">You</string>
<string name="hbylw_txt">, the red envelope has been collected</string>
<string name="bind_phone_des_txt">Please bind your mobile phone number first</string>
@@ -325,5 +331,6 @@
<string name="push_content_audio">Received an audio</string>
<string name="chat_message_forward_to1">Forward to %s and other %d people</string>
<string name="chat_message_forward_to2">Forward to %s and other %d group</string>
<string name="ninyibeijinyan_txt">您已被禁言</string>
</resources>

19
chatkit-ui/src/main/res/values-ja/strings.xml
View File

@@ -264,12 +264,18 @@
<string name="fachudehongbao_txt">%s から赤い封筒が送られてきました</string>
<string name="manle_end_txt">遅すぎる、赤い封筒がなくなってしまった</string>
<string name="redexpired_txt">赤い封筒は24時間以上経過したものは回収できません</string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s が<font color = \'#FC605C\'>Cash赤い封筒</font>を受け取りました]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[あなたは %s の<font color = \'#FC605C\'>Cash赤い封筒</font>を受け取りました]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s が<font color = \'#629CFF\'>ギフトポイントの赤い封筒</font>を受け取りました]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[あなたは %s の<font color = \'#629CFF\'>銀貨の赤い封筒</font>を受け取りました]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s が<font color = \'#FC605C\'>お祝いのお金入り封筒</font>]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[あなたは %s の<font color = \'#FC605C\'>お祝いのお金入り封筒</font>]]></string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s がCash赤い封筒を受け取りました]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[あなたは %s のCash赤い封筒を受け取りました]]></string>
<string name="s_font_color_fc605c_font_txt2"><![CDATA[%sなたは %s のCash赤い封筒を受け取りました]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s がギフトポイントの赤い封筒を受け取りました]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[あなたは %s の銀貨の赤い封筒を受け取りました]]></string>
<string name="s_font_color_629cff_font_txt2"><![CDATA[%sなたは %s の銀貨の赤い封筒を受け取りました]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s がお祝いのお金入り封筒]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[あなたは %s のお祝いのお金入り封筒]]></string>
<string name="s_font_color_gift_font_txt2"><![CDATA[%sなたは %s のお祝いのお金入り封筒]]></string>
<string name="ni_txt">あなた</string>
<string name="hbylw_txt">、赤い封筒は回収されました</string>
<string name="bind_phone_des_txt">最初に携帯電話番号をバインドしてください</string>
@@ -326,5 +332,6 @@
<string name="push_content_audio">音声が届きました</string>
<string name="chat_message_forward_to1">轉發給:%s等%d人</string>
<string name="chat_message_forward_to2">轉發給:%s等%d群</string>
<string name="ninyibeijinyan_txt">您已被禁言</string>
</resources>

19
chatkit-ui/src/main/res/values-zh/strings.xml
View File

@@ -263,12 +263,18 @@
<string name="fachudehongbao_txt">%s 发出的红包</string>
<string name="manle_end_txt">手慢了，红包抢完啦</string>
<string name="redexpired_txt">红包超过24小时，无法领取</string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s领取了你的<font color = \'#FC605C\'>Cash红包</font>]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你领取了%s的<font color = \'#FC605C\'>Cash红包</font>]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s领取了你的<font color = \'#629CFF\'>礼品积分红包</font>]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你领取了%s的<font color = \'#629CFF\'>礼品积分红包</font>]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s领取了你的<font color = \'#FC605C\'>礼金红包</font>]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[你领取了%s的<font color = \'#FC605C\'>礼金红包</font>]]></string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s领取了你的Cash红包]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你领取了%s的Cash红包]]></string>
<string name="s_font_color_fc605c_font_txt2"><![CDATA[%s领取了%s的Cash红包]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s领取了你的礼品积分红包]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你领取了%s的礼品积分红包]]></string>
<string name="s_font_color_629cff_font_txt2"><![CDATA[%s领取了%s的礼品积分红包]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s领取了你的礼金红包]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[你领取了%s的礼金红包]]></string>
<string name="s_font_color_gift_font_txt2"><![CDATA[%s领取了%s的礼金红包]]></string>
<string name="ni_txt">你</string>
<string name="hbylw_txt">，红包已领完</string>
<string name="bind_phone_des_txt">请先绑定手机号</string>
@@ -326,5 +332,6 @@
<string name="push_content_audio">发来了一段语音</string>
<string name="chat_message_forward_to1">转发给:%s等%d人</string>
<string name="chat_message_forward_to2">转发给:%s等%d群</string>
<string name="ninyibeijinyan_txt">您已被禁言</string>
</resources>

19
chatkit-ui/src/main/res/values/strings.xml
View File

@@ -263,12 +263,18 @@
<string name="fachudehongbao_txt">%s 發出的紅包</string>
<string name="manle_end_txt">手慢了，紅包搶完啦</string>
<string name="redexpired_txt">紅包超過24小時，無法領取</string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s領取了你的<font color = \'#FC605C\'>Cash紅包</font>]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你領取%s的<font color = \'#FC605C\'>Cash紅包</font>]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s領取了你的<font color = \'#629CFF\'>禮品積分紅包</font>]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你領取了%s的<font color = \'#629CFF\'>禮品積分紅包</font>]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s領取了你的<font color = \'#FC605C\'>禮金紅包</font>]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[你領取%s的<font color = \'#FC605C\'>禮金紅包</font>]]></string>
<string name="s_font_color_fc605c_font_txt"><![CDATA[%s領取了你的Cash紅包]]></string>
<string name="s_font_color_fc605c_font_txt1"><![CDATA[你領取%s的Cash紅包]]></string>
<string name="s_font_color_fc605c_font_txt2"><![CDATA[%s領取%s的Cash紅包]]></string>
<string name="s_font_color_629cff_font_txt"><![CDATA[%s領取了你的禮品積分紅包]]></string>
<string name="s_font_color_629cff_font_txt1"><![CDATA[你領取了%s的禮品積分紅包]]></string>
<string name="s_font_color_629cff_font_txt2"><![CDATA[%s領取了%s的禮品積分紅包]]></string>
<string name="s_font_color_gift_font_txt"><![CDATA[%s領取了你的禮金紅包]]></string>
<string name="s_font_color_gift_font_txt1"><![CDATA[你領取%s的禮金紅包]]></string>
<string name="s_font_color_gift_font_txt2"><![CDATA[%s領取%s的禮金紅包]]></string>
<string name="ni_txt">你</string>
<string name="hbylw_txt">，紅包已领完</string>
<string name="bind_phone_des_txt">請先綁定手機號碼</string>
@@ -325,4 +331,5 @@
<string name="push_content_audio">發來了一段語音</string>
<string name="chat_message_forward_to1">轉發給:%s等%d人</string>
<string name="chat_message_forward_to2">轉發給:%s等%d群</string>
<string name="ninyibeijinyan_txt">您已被禁言</string>
</resources>

328
chatkit-ui/src/main/res/xml/emoji.xml
View File

@@ -78,177 +78,177 @@
<Emoticon File="emoji_68.png" ID="emoticon_emoji_68" Tag="[便便]" />
</Catalog>
<Catalog Title="tingting">
<Emoticon File="tingting_00.png" ID="emoticon_tingting_00" Tag="[町町安靜]" />
<Emoticon File="tingting_01.png" ID="emoticon_emoji_01" Tag="[町町無辜]" />
<Emoticon File="tingting_02.png" ID="emoticon_tingting_02" Tag="[町町白眼]" />
<Emoticon File="tingting_03.png" ID="emoticon_tingting_03" Tag="[町町生氣]" />
<Emoticon File="tingting_04.png" ID="emoticon_tingting_04" Tag="[町町再見]" />
<Emoticon File="tingting_05.png" ID="emoticon_tingting_05" Tag="[町町閉嘴]" />
<Emoticon File="tingting_06.png" ID="emoticon_tingting_06" Tag="[町町犯困]" />
<Emoticon File="tingting_07.png" ID="emoticon_tingting_07" Tag="[町町尷尬]" />
<Emoticon File="tingting_08.png" ID="emoticon_tingting_08" Tag="[町町感動]" />
<Emoticon File="tingting_09.png" ID="emoticon_tingting_09" Tag="[町町鼓掌]" />
<Emoticon File="tingting_10.png" ID="emoticon_tingting_10" Tag="[町町害羞]" />
<Emoticon File="tingting_11.png" ID="emoticon_tingting_11" Tag="[町町好色]" />
<Emoticon File="tingting_12.png" ID="emoticon_tingting_12" Tag="[町町黑臉]" />
<Emoticon File="tingting_13.png" ID="emoticon_tingting_13" Tag="[町町急怒]" />
<Emoticon File="tingting_14.png" ID="emoticon_tingting_14" Tag="[町町驚慌]" />
<Emoticon File="tingting_15.png" ID="emoticon_tingting_15" Tag="[町町驚訝]" />
<Emoticon File="tingting_16.png" ID="emoticon_tingting_16" Tag="[町町沮喪]" />
<Emoticon File="tingting_17.png" ID="emoticon_tingting_17" Tag="[町町開心]" />
<Emoticon File="tingting_18.png" ID="emoticon_tingting_18" Tag="[町町瞌睡]" />
<Emoticon File="tingting_19.png" ID="emoticon_tingting_19" Tag="[町町摳鼻]" />
<Emoticon File="tingting_20.png" ID="emoticon_tingting_20" Tag="[町町哭泣]" />
<Emoticon File="tingting_21.png" ID="emoticon_tingting_21" Tag="[町町苦臉]" />
<Emoticon File="tingting_22.png" ID="emoticon_tingting_22" Tag="[町町酷]" />
<Emoticon File="tingting_23.png" ID="emoticon_tingting_23" Tag="[町町 酷]" />
<Emoticon File="tingting_24.png" ID="emoticon_tingting_24" Tag="[町町狂躁]" />
<Emoticon File="tingting_25.png" ID="emoticon_tingting_25" Tag="[町町流汗]" />
<Emoticon File="tingting_26.png" ID="emoticon_tingting_26" Tag="[町町罵人]" />
<Emoticon File="tingting_27.png" ID="emoticon_tingting_27" Tag="[町町發怒]" />
<Emoticon File="tingting_28.png" ID="emoticon_tingting_28" Tag="[町町氣哭]" />
<Emoticon File="tingting_29.png" ID="emoticon_tingting_29" Tag="[町町敲頭]" />
<Emoticon File="tingting_30.png" ID="emoticon_tingting_30" Tag="[町町親親]" />
<Emoticon File="tingting_31.png" ID="emoticon_tingting_31" Tag="[町町吐舌頭]" />
<Emoticon File="tingting_32.png" ID="emoticon_tingting_32" Tag="[町町微笑]" />
<Emoticon File="tingting_33.png" ID="emoticon_tingting_33" Tag="[町町捂嘴笑]" />
<Emoticon File="tingting_34.png" ID="emoticon_tingting_34" Tag="[町町兇]" />
<Emoticon File="tingting_35.png" ID="emoticon_tingting_35" Tag="[町町羞笑]" />
<Emoticon File="tingting_36.png" ID="emoticon_tingting_36" Tag="[町町眩暈]" />
<Emoticon File="tingting_37.png" ID="emoticon_tingting_37" Tag="[町町疑問]" />
<Emoticon File="tingting_38.png" ID="emoticon_tingting_38" Tag="[町町中毒]" />
<Emoticon File="tingting_39.png" ID="emoticon_tingting_39" Tag="[町町齜牙]" />
<!-- <Catalog Title="tingting">-->
<!-- <Emoticon File="tingting_00.png" ID="emoticon_tingting_00" Tag="[町町安靜]" />-->
<!-- <Emoticon File="tingting_01.png" ID="emoticon_emoji_01" Tag="[町町無辜]" />-->
<!-- <Emoticon File="tingting_02.png" ID="emoticon_tingting_02" Tag="[町町白眼]" />-->
<!-- <Emoticon File="tingting_03.png" ID="emoticon_tingting_03" Tag="[町町生氣]" />-->
<!-- <Emoticon File="tingting_04.png" ID="emoticon_tingting_04" Tag="[町町再見]" />-->
<!-- <Emoticon File="tingting_05.png" ID="emoticon_tingting_05" Tag="[町町閉嘴]" />-->
<!-- <Emoticon File="tingting_06.png" ID="emoticon_tingting_06" Tag="[町町犯困]" />-->
<!-- <Emoticon File="tingting_07.png" ID="emoticon_tingting_07" Tag="[町町尷尬]" />-->
<!-- <Emoticon File="tingting_08.png" ID="emoticon_tingting_08" Tag="[町町感動]" />-->
<!-- <Emoticon File="tingting_09.png" ID="emoticon_tingting_09" Tag="[町町鼓掌]" />-->
<!-- <Emoticon File="tingting_10.png" ID="emoticon_tingting_10" Tag="[町町害羞]" />-->
<!-- <Emoticon File="tingting_11.png" ID="emoticon_tingting_11" Tag="[町町好色]" />-->
<!-- <Emoticon File="tingting_12.png" ID="emoticon_tingting_12" Tag="[町町黑臉]" />-->
<!-- <Emoticon File="tingting_13.png" ID="emoticon_tingting_13" Tag="[町町急怒]" />-->
<!-- <Emoticon File="tingting_14.png" ID="emoticon_tingting_14" Tag="[町町驚慌]" />-->
<!-- <Emoticon File="tingting_15.png" ID="emoticon_tingting_15" Tag="[町町驚訝]" />-->
<!-- <Emoticon File="tingting_16.png" ID="emoticon_tingting_16" Tag="[町町沮喪]" />-->
<!-- <Emoticon File="tingting_17.png" ID="emoticon_tingting_17" Tag="[町町開心]" />-->
<!-- <Emoticon File="tingting_18.png" ID="emoticon_tingting_18" Tag="[町町瞌睡]" />-->
<!-- <Emoticon File="tingting_19.png" ID="emoticon_tingting_19" Tag="[町町摳鼻]" />-->
<!-- <Emoticon File="tingting_20.png" ID="emoticon_tingting_20" Tag="[町町哭泣]" />-->
<!-- <Emoticon File="tingting_21.png" ID="emoticon_tingting_21" Tag="[町町苦臉]" />-->
<!-- <Emoticon File="tingting_22.png" ID="emoticon_tingting_22" Tag="[町町酷]" />-->
<!-- <Emoticon File="tingting_23.png" ID="emoticon_tingting_23" Tag="[町町 酷]" />-->
<!-- <Emoticon File="tingting_24.png" ID="emoticon_tingting_24" Tag="[町町狂躁]" />-->
<!-- <Emoticon File="tingting_25.png" ID="emoticon_tingting_25" Tag="[町町流汗]" />-->
<!-- <Emoticon File="tingting_26.png" ID="emoticon_tingting_26" Tag="[町町罵人]" />-->
<!-- <Emoticon File="tingting_27.png" ID="emoticon_tingting_27" Tag="[町町發怒]" />-->
<!-- <Emoticon File="tingting_28.png" ID="emoticon_tingting_28" Tag="[町町氣哭]" />-->
<!-- <Emoticon File="tingting_29.png" ID="emoticon_tingting_29" Tag="[町町敲頭]" />-->
<!-- <Emoticon File="tingting_30.png" ID="emoticon_tingting_30" Tag="[町町親親]" />-->
<!-- <Emoticon File="tingting_31.png" ID="emoticon_tingting_31" Tag="[町町吐舌頭]" />-->
<!-- <Emoticon File="tingting_32.png" ID="emoticon_tingting_32" Tag="[町町微笑]" />-->
<!-- <Emoticon File="tingting_33.png" ID="emoticon_tingting_33" Tag="[町町捂嘴笑]" />-->
<!-- <Emoticon File="tingting_34.png" ID="emoticon_tingting_34" Tag="[町町兇]" />-->
<!-- <Emoticon File="tingting_35.png" ID="emoticon_tingting_35" Tag="[町町羞笑]" />-->
<!-- <Emoticon File="tingting_36.png" ID="emoticon_tingting_36" Tag="[町町眩暈]" />-->
<!-- <Emoticon File="tingting_37.png" ID="emoticon_tingting_37" Tag="[町町疑問]" />-->
<!-- <Emoticon File="tingting_38.png" ID="emoticon_tingting_38" Tag="[町町中毒]" />-->
<!-- <Emoticon File="tingting_39.png" ID="emoticon_tingting_39" Tag="[町町齜牙]" />-->
</Catalog>
<!-- </Catalog>-->
<Catalog Title="taotao">
<Emoticon File="taotao_00.png" ID="emoticon_taotao_00" Tag="[淘淘安靜]" />
<Emoticon File="taotao_01.png" ID="emoticon_taotao_01" Tag="[淘淘白眼]" />
<Emoticon File="taotao_02.png" ID="emoticon_taotao_02" Tag="[淘淘生氣]" />
<Emoticon File="taotao_03.png" ID="emoticon_taotao_03" Tag="[淘淘閉嘴]" />
<Emoticon File="taotao_04.png" ID="emoticon_taotao_04" Tag="[淘淘犯困]" />
<Emoticon File="taotao_05.png" ID="emoticon_taotao_05" Tag="[淘淘尷尬]" />
<Emoticon File="taotao_06.png" ID="emoticon_taotao_06" Tag="[淘淘感動]" />
<Emoticon File="taotao_07.png" ID="emoticon_taotao_07" Tag="[淘淘鼓掌]" />
<Emoticon File="taotao_08.png" ID="emoticon_taotao_08" Tag="[淘淘害羞]" />
<Emoticon File="taotao_09.png" ID="emoticon_taotao_09" Tag="[淘淘好色]" />
<Emoticon File="taotao_10.png" ID="emoticon_taotao_10" Tag="[淘淘黑臉]" />
<Emoticon File="taotao_11.png" ID="emoticon_taotao_11" Tag="[淘淘急怒]" />
<Emoticon File="taotao_12.png" ID="emoticon_taotao_12" Tag="[淘淘驚慌]" />
<Emoticon File="taotao_13.png" ID="emoticon_taotao_13" Tag="[淘淘驚訝]" />
<Emoticon File="taotao_14.png" ID="emoticon_taotao_14" Tag="[淘淘沮喪]" />
<Emoticon File="taotao_15.png" ID="emoticon_taotao_15" Tag="[淘淘開心]" />
<Emoticon File="taotao_16.png" ID="emoticon_taotao_16" Tag="[淘淘瞌睡]" />
<Emoticon File="taotao_17.png" ID="emoticon_taotao_17" Tag="[淘淘摳鼻]" />
<Emoticon File="taotao_18.png" ID="emoticon_taotao_18" Tag="[淘淘哭泣]" />
<Emoticon File="taotao_19.png" ID="emoticon_taotao_19" Tag="[淘淘苦臉]" />
<Emoticon File="taotao_20.png" ID="emoticon_taotao_20" Tag="[淘淘酷]" />
<Emoticon File="taotao_21.png" ID="emoticon_taotao_21" Tag="[淘淘 酷]" />
<Emoticon File="taotao_22.png" ID="emoticon_taotao_22" Tag="[淘淘狂躁]" />
<Emoticon File="taotao_23.png" ID="emoticon_taotao_23" Tag="[淘淘流汗]" />
<Emoticon File="taotao_24.png" ID="emoticon_taotao_24" Tag="[淘淘罵人]" />
<Emoticon File="taotao_25.png" ID="emoticon_taotao_25" Tag="[淘淘發怒]" />
<Emoticon File="taotao_26.png" ID="emoticon_taotao_26" Tag="[淘淘氣哭]" />
<Emoticon File="taotao_27.png" ID="emoticon_taotao_27" Tag="[淘淘敲頭]" />
<Emoticon File="taotao_28.png" ID="emoticon_taotao_28" Tag="[淘淘親親]" />
<Emoticon File="taotao_29.png" ID="emoticon_taotao_29" Tag="[淘淘吐舌頭]" />
<Emoticon File="taotao_30.png" ID="emoticon_taotao_30" Tag="[淘淘微笑]" />
<Emoticon File="taotao_31.png" ID="emoticon_taotao_31" Tag="[淘淘無辜]" />
<Emoticon File="taotao_32.png" ID="emoticon_taotao_32" Tag="[淘淘捂嘴笑]" />
<Emoticon File="taotao_33.png" ID="emoticon_taotao_33" Tag="[淘淘兇]" />
<Emoticon File="taotao_34.png" ID="emoticon_taotao_34" Tag="[淘淘羞笑]" />
<Emoticon File="taotao_35.png" ID="emoticon_taotao_35" Tag="[淘淘眩暈]" />
<Emoticon File="taotao_36.png" ID="emoticon_taotao_36" Tag="[淘淘疑問]" />
<Emoticon File="taotao_37.png" ID="emoticon_taotao_37" Tag="[淘淘再見]" />
<Emoticon File="taotao_38.png" ID="emoticon_taotao_38" Tag="[淘淘中毒]" />
<Emoticon File="taotao_39.png" ID="emoticon_taotao_39" Tag="[淘淘齜牙]" />
<!-- <Catalog Title="taotao">-->
<!-- <Emoticon File="taotao_00.png" ID="emoticon_taotao_00" Tag="[淘淘安靜]" />-->
<!-- <Emoticon File="taotao_01.png" ID="emoticon_taotao_01" Tag="[淘淘白眼]" />-->
<!-- <Emoticon File="taotao_02.png" ID="emoticon_taotao_02" Tag="[淘淘生氣]" />-->
<!-- <Emoticon File="taotao_03.png" ID="emoticon_taotao_03" Tag="[淘淘閉嘴]" />-->
<!-- <Emoticon File="taotao_04.png" ID="emoticon_taotao_04" Tag="[淘淘犯困]" />-->
<!-- <Emoticon File="taotao_05.png" ID="emoticon_taotao_05" Tag="[淘淘尷尬]" />-->
<!-- <Emoticon File="taotao_06.png" ID="emoticon_taotao_06" Tag="[淘淘感動]" />-->
<!-- <Emoticon File="taotao_07.png" ID="emoticon_taotao_07" Tag="[淘淘鼓掌]" />-->
<!-- <Emoticon File="taotao_08.png" ID="emoticon_taotao_08" Tag="[淘淘害羞]" />-->
<!-- <Emoticon File="taotao_09.png" ID="emoticon_taotao_09" Tag="[淘淘好色]" />-->
<!-- <Emoticon File="taotao_10.png" ID="emoticon_taotao_10" Tag="[淘淘黑臉]" />-->
<!-- <Emoticon File="taotao_11.png" ID="emoticon_taotao_11" Tag="[淘淘急怒]" />-->
<!-- <Emoticon File="taotao_12.png" ID="emoticon_taotao_12" Tag="[淘淘驚慌]" />-->
<!-- <Emoticon File="taotao_13.png" ID="emoticon_taotao_13" Tag="[淘淘驚訝]" />-->
<!-- <Emoticon File="taotao_14.png" ID="emoticon_taotao_14" Tag="[淘淘沮喪]" />-->
<!-- <Emoticon File="taotao_15.png" ID="emoticon_taotao_15" Tag="[淘淘開心]" />-->
<!-- <Emoticon File="taotao_16.png" ID="emoticon_taotao_16" Tag="[淘淘瞌睡]" />-->
<!-- <Emoticon File="taotao_17.png" ID="emoticon_taotao_17" Tag="[淘淘摳鼻]" />-->
<!-- <Emoticon File="taotao_18.png" ID="emoticon_taotao_18" Tag="[淘淘哭泣]" />-->
<!-- <Emoticon File="taotao_19.png" ID="emoticon_taotao_19" Tag="[淘淘苦臉]" />-->
<!-- <Emoticon File="taotao_20.png" ID="emoticon_taotao_20" Tag="[淘淘酷]" />-->
<!-- <Emoticon File="taotao_21.png" ID="emoticon_taotao_21" Tag="[淘淘 酷]" />-->
<!-- <Emoticon File="taotao_22.png" ID="emoticon_taotao_22" Tag="[淘淘狂躁]" />-->
<!-- <Emoticon File="taotao_23.png" ID="emoticon_taotao_23" Tag="[淘淘流汗]" />-->
<!-- <Emoticon File="taotao_24.png" ID="emoticon_taotao_24" Tag="[淘淘罵人]" />-->
<!-- <Emoticon File="taotao_25.png" ID="emoticon_taotao_25" Tag="[淘淘發怒]" />-->
<!-- <Emoticon File="taotao_26.png" ID="emoticon_taotao_26" Tag="[淘淘氣哭]" />-->
<!-- <Emoticon File="taotao_27.png" ID="emoticon_taotao_27" Tag="[淘淘敲頭]" />-->
<!-- <Emoticon File="taotao_28.png" ID="emoticon_taotao_28" Tag="[淘淘親親]" />-->
<!-- <Emoticon File="taotao_29.png" ID="emoticon_taotao_29" Tag="[淘淘吐舌頭]" />-->
<!-- <Emoticon File="taotao_30.png" ID="emoticon_taotao_30" Tag="[淘淘微笑]" />-->
<!-- <Emoticon File="taotao_31.png" ID="emoticon_taotao_31" Tag="[淘淘無辜]" />-->
<!-- <Emoticon File="taotao_32.png" ID="emoticon_taotao_32" Tag="[淘淘捂嘴笑]" />-->
<!-- <Emoticon File="taotao_33.png" ID="emoticon_taotao_33" Tag="[淘淘兇]" />-->
<!-- <Emoticon File="taotao_34.png" ID="emoticon_taotao_34" Tag="[淘淘羞笑]" />-->
<!-- <Emoticon File="taotao_35.png" ID="emoticon_taotao_35" Tag="[淘淘眩暈]" />-->
<!-- <Emoticon File="taotao_36.png" ID="emoticon_taotao_36" Tag="[淘淘疑問]" />-->
<!-- <Emoticon File="taotao_37.png" ID="emoticon_taotao_37" Tag="[淘淘再見]" />-->
<!-- <Emoticon File="taotao_38.png" ID="emoticon_taotao_38" Tag="[淘淘中毒]" />-->
<!-- <Emoticon File="taotao_39.png" ID="emoticon_taotao_39" Tag="[淘淘齜牙]" />-->
</Catalog>
<Catalog Title="lele">
<!-- </Catalog>-->
<!-- <Catalog Title="lele">-->
<Emoticon File="lele_00.png" ID="emoticon_lele_00" Tag="[樂樂安靜]" />
<Emoticon File="lele_01.png" ID="emoticon_lele_01" Tag="[樂樂白眼]" />
<Emoticon File="lele_02.png" ID="emoticon_lele_02" Tag="[樂樂生氣]" />
<Emoticon File="lele_03.png" ID="emoticon_lele_37" Tag="[樂樂再見]" />
<Emoticon File="lele_04.png" ID="emoticon_lele_03" Tag="[樂樂閉嘴]" />
<Emoticon File="lele_05.png" ID="emoticon_lele_04" Tag="[樂樂犯困]" />
<Emoticon File="lele_06.png" ID="emoticon_lele_05" Tag="[樂樂尷尬]" />
<Emoticon File="lele_07.png" ID="emoticon_lele_06" Tag="[樂樂感動]" />
<Emoticon File="lele_08.png" ID="emoticon_lele_07" Tag="[樂樂鼓掌]" />
<Emoticon File="lele_09.png" ID="emoticon_lele_08" Tag="[樂樂害羞]" />
<Emoticon File="lele_10.png" ID="emoticon_lele_09" Tag="[樂樂好色]" />
<Emoticon File="lele_11.png" ID="emoticon_lele_10" Tag="[樂樂黑臉]" />
<Emoticon File="lele_12.png" ID="emoticon_lele_11" Tag="[樂樂急怒]" />
<Emoticon File="lele_13.png" ID="emoticon_lele_12" Tag="[樂樂驚慌]" />
<Emoticon File="lele_14.png" ID="emoticon_lele_13" Tag="[樂樂驚訝]" />
<Emoticon File="lele_15.png" ID="emoticon_lele_14" Tag="[樂樂沮喪]" />
<Emoticon File="lele_16.png" ID="emoticon_lele_15" Tag="[樂樂開心]" />
<Emoticon File="lele_17.png" ID="emoticon_lele_16" Tag="[樂樂瞌睡]" />
<Emoticon File="lele_18.png" ID="emoticon_lele_17" Tag="[樂樂摳鼻]" />
<Emoticon File="lele_19.png" ID="emoticon_lele_18" Tag="[樂樂哭泣]" />
<Emoticon File="lele_20.png" ID="emoticon_lele_19" Tag="[樂樂苦臉]" />
<Emoticon File="lele_21.png" ID="emoticon_lele_20" Tag="[樂樂酷]" />
<Emoticon File="lele_22.png" ID="emoticon_lele_21" Tag="[樂樂 酷]" />
<Emoticon File="lele_23.png" ID="emoticon_lele_22" Tag="[樂樂狂躁]" />
<Emoticon File="lele_24.png" ID="emoticon_lele_23" Tag="[樂樂流汗]" />
<Emoticon File="lele_25.png" ID="emoticon_lele_24" Tag="[樂樂罵人]" />
<Emoticon File="lele_26.png" ID="emoticon_lele_25" Tag="[樂樂發怒]" />
<Emoticon File="lele_27.png" ID="emoticon_lele_26" Tag="[樂樂氣哭]" />
<Emoticon File="lele_28.png" ID="emoticon_lele_27" Tag="[樂樂敲頭]" />
<Emoticon File="lele_29.png" ID="emoticon_lele_28" Tag="[樂樂親親]" />
<Emoticon File="lele_30.png" ID="emoticon_lele_29" Tag="[樂樂吐舌頭]" />
<Emoticon File="lele_31.png" ID="emoticon_lele_30" Tag="[樂樂微笑]" />
<Emoticon File="lele_32.png" ID="emoticon_lele_31" Tag="[樂樂無辜]" />
<Emoticon File="lele_33.png" ID="emoticon_lele_32" Tag="[樂樂捂嘴笑]" />
<Emoticon File="lele_34.png" ID="emoticon_lele_33" Tag="[樂樂兇]" />
<Emoticon File="lele_35.png" ID="emoticon_lele_34" Tag="[樂樂羞笑]" />
<Emoticon File="lele_36.png" ID="emoticon_lele_35" Tag="[樂樂眩暈]" />
<Emoticon File="lele_37.png" ID="emoticon_lele_36" Tag="[樂樂疑問]" />
<Emoticon File="lele_38.png" ID="emoticon_lele_38" Tag="[樂樂中毒]" />
<Emoticon File="lele_39.png" ID="emoticon_lele_39" Tag="[樂樂齜牙]" />
<!-- <Emoticon File="lele_00.png" ID="emoticon_lele_00" Tag="[樂樂安靜]" />-->
<!-- <Emoticon File="lele_01.png" ID="emoticon_lele_01" Tag="[樂樂白眼]" />-->
<!-- <Emoticon File="lele_02.png" ID="emoticon_lele_02" Tag="[樂樂生氣]" />-->
<!-- <Emoticon File="lele_03.png" ID="emoticon_lele_37" Tag="[樂樂再見]" />-->
<!-- <Emoticon File="lele_04.png" ID="emoticon_lele_03" Tag="[樂樂閉嘴]" />-->
<!-- <Emoticon File="lele_05.png" ID="emoticon_lele_04" Tag="[樂樂犯困]" />-->
<!-- <Emoticon File="lele_06.png" ID="emoticon_lele_05" Tag="[樂樂尷尬]" />-->
<!-- <Emoticon File="lele_07.png" ID="emoticon_lele_06" Tag="[樂樂感動]" />-->
<!-- <Emoticon File="lele_08.png" ID="emoticon_lele_07" Tag="[樂樂鼓掌]" />-->
<!-- <Emoticon File="lele_09.png" ID="emoticon_lele_08" Tag="[樂樂害羞]" />-->
<!-- <Emoticon File="lele_10.png" ID="emoticon_lele_09" Tag="[樂樂好色]" />-->
<!-- <Emoticon File="lele_11.png" ID="emoticon_lele_10" Tag="[樂樂黑臉]" />-->
<!-- <Emoticon File="lele_12.png" ID="emoticon_lele_11" Tag="[樂樂急怒]" />-->
<!-- <Emoticon File="lele_13.png" ID="emoticon_lele_12" Tag="[樂樂驚慌]" />-->
<!-- <Emoticon File="lele_14.png" ID="emoticon_lele_13" Tag="[樂樂驚訝]" />-->
<!-- <Emoticon File="lele_15.png" ID="emoticon_lele_14" Tag="[樂樂沮喪]" />-->
<!-- <Emoticon File="lele_16.png" ID="emoticon_lele_15" Tag="[樂樂開心]" />-->
<!-- <Emoticon File="lele_17.png" ID="emoticon_lele_16" Tag="[樂樂瞌睡]" />-->
<!-- <Emoticon File="lele_18.png" ID="emoticon_lele_17" Tag="[樂樂摳鼻]" />-->
<!-- <Emoticon File="lele_19.png" ID="emoticon_lele_18" Tag="[樂樂哭泣]" />-->
<!-- <Emoticon File="lele_20.png" ID="emoticon_lele_19" Tag="[樂樂苦臉]" />-->
<!-- <Emoticon File="lele_21.png" ID="emoticon_lele_20" Tag="[樂樂酷]" />-->
<!-- <Emoticon File="lele_22.png" ID="emoticon_lele_21" Tag="[樂樂 酷]" />-->
<!-- <Emoticon File="lele_23.png" ID="emoticon_lele_22" Tag="[樂樂狂躁]" />-->
<!-- <Emoticon File="lele_24.png" ID="emoticon_lele_23" Tag="[樂樂流汗]" />-->
<!-- <Emoticon File="lele_25.png" ID="emoticon_lele_24" Tag="[樂樂罵人]" />-->
<!-- <Emoticon File="lele_26.png" ID="emoticon_lele_25" Tag="[樂樂發怒]" />-->
<!-- <Emoticon File="lele_27.png" ID="emoticon_lele_26" Tag="[樂樂氣哭]" />-->
<!-- <Emoticon File="lele_28.png" ID="emoticon_lele_27" Tag="[樂樂敲頭]" />-->
<!-- <Emoticon File="lele_29.png" ID="emoticon_lele_28" Tag="[樂樂親親]" />-->
<!-- <Emoticon File="lele_30.png" ID="emoticon_lele_29" Tag="[樂樂吐舌頭]" />-->
<!-- <Emoticon File="lele_31.png" ID="emoticon_lele_30" Tag="[樂樂微笑]" />-->
<!-- <Emoticon File="lele_32.png" ID="emoticon_lele_31" Tag="[樂樂無辜]" />-->
<!-- <Emoticon File="lele_33.png" ID="emoticon_lele_32" Tag="[樂樂捂嘴笑]" />-->
<!-- <Emoticon File="lele_34.png" ID="emoticon_lele_33" Tag="[樂樂兇]" />-->
<!-- <Emoticon File="lele_35.png" ID="emoticon_lele_34" Tag="[樂樂羞笑]" />-->
<!-- <Emoticon File="lele_36.png" ID="emoticon_lele_35" Tag="[樂樂眩暈]" />-->
<!-- <Emoticon File="lele_37.png" ID="emoticon_lele_36" Tag="[樂樂疑問]" />-->
<!-- <Emoticon File="lele_38.png" ID="emoticon_lele_38" Tag="[樂樂中毒]" />-->
<!-- <Emoticon File="lele_39.png" ID="emoticon_lele_39" Tag="[樂樂齜牙]" />-->
</Catalog>
<!-- </Catalog>-->
<Catalog Title="tlt">
<Emoticon File="tlt_gif_00.png" ID="emoticon_tlt_gif_00" Tag="[好喜歡你哦]" />
<Emoticon File="tlt_gif_01.png" ID="emoticon_tlt_gif_01" Tag="[加油鴨]" />
<Emoticon File="tlt_gif_02.png" ID="emoticon_tlt_gif_02" Tag="[老大駕到]" />
<Emoticon File="tlt_gif_03.png" ID="emoticon_tlt_gif_03" Tag="[老妹你真美]" />
<Emoticon File="tlt_gif_04.png" ID="emoticon_tlt_gif_04" Tag="[靈魂抓手]" />
<Emoticon File="tlt_gif_05.png" ID="emoticon_tlt_gif_05" Tag="[菩薩保佑]" />
<Emoticon File="tlt_gif_06.png" ID="emoticon_tlt_gif_06" Tag="[氣屎我了]" />
<Emoticon File="tlt_gif_07.png" ID="emoticon_tlt_gif_07" Tag="[什麼情況]" />
<Emoticon File="tlt_gif_08.png" ID="emoticon_tlt_gif_08" Tag="[送你好運]" />
<Emoticon File="tlt_gif_09.png" ID="emoticon_tlt_gif_09" Tag="[太感動了]" />
<Emoticon File="tlt_gif_10.png" ID="emoticon_tlt_gif_10" Tag="[為愛而戰]" />
<Emoticon File="tlt_gif_11.png" ID="emoticon_tlt_gif_11" Tag="[要得手了]" />
<Emoticon File="tlt_gif_12.png" ID="emoticon_tlt_gif_12" Tag="[勇冠三軍]" />
<Emoticon File="tlt_gif_13.png" ID="emoticon_tlt_gif_13" Tag="[有驚喜哦]" />
<Emoticon File="tlt_gif_14.png" ID="emoticon_tlt_gif_14" Tag="[抓不著就搗蛋]" />
<Emoticon File="tlt_gif_15.png" ID="emoticon_tlt_gif_15" Tag="[聊天結束]" />
<Emoticon File="tlt_gif_16.png" ID="emoticon_tlt_gif_16" Tag="[蒼天啊]" />
<Emoticon File="tlt_gif_17.png" ID="emoticon_tlt_gif_17" Tag="[暈死]" />
<Emoticon File="tlt_gif_18.png" ID="emoticon_tlt_gif_18" Tag="[幹就完了]" />
<Emoticon File="tlt_gif_19.png" ID="emoticon_tlt_gif_19" Tag="[發財了]" />
<Emoticon File="tlt_gif_20.png" ID="emoticon_tlt_gif_20" Tag="[對不起]" />
<Emoticon File="tlt_gif_21.png" ID="emoticon_tlt_gif_21" Tag="[關我屁事]" />
<Emoticon File="tlt_gif_22.png" ID="emoticon_tlt_gif_22" Tag="[嚇死我了]" />
<Emoticon File="tlt_gif_23.png" ID="emoticon_tlt_gif_23" Tag="[送S去咯]" />
<Emoticon File="tlt_gif_24.png" ID="emoticon_tlt_gif_24" Tag="[洗洗睡吧]" />
<Emoticon File="tlt_gif_25.png" ID="emoticon_tlt_gif_25" Tag="[我要滅了你]" />
<Emoticon File="tlt_gif_26.png" ID="emoticon_tlt_gif_26" Tag="[電不倒你]" />
<Emoticon File="tlt_gif_27.png" ID="emoticon_tlt_gif_27" Tag="[大過年的]" />
<Emoticon File="tlt_gif_28.png" ID="emoticon_tlt_gif_28" Tag="[有人放屁]" />
<Emoticon File="tlt_gif_29.png" ID="emoticon_tlt_gif_29" Tag="[好樣的]" />
<Emoticon File="tlt_gif_30.png" ID="emoticon_tlt_gif_30" Tag="[哇噢]" />
<Emoticon File="tlt_gif_31.png" ID="emoticon_tlt_gif_31" Tag="[同志們好]" />
<Emoticon File="tlt_gif_32.png" ID="emoticon_tlt_gif_32" Tag="[沒問題]" />
<Emoticon File="tlt_gif_33.png" ID="emoticon_tlt_gif_33" Tag="[怎麼辦]" />
<Emoticon File="tlt_gif_34.png" ID="emoticon_tlt_gif_34" Tag="[偷瞄一下]" />
<Emoticon File="tlt_gif_35.png" ID="emoticon_tlt_gif_35" Tag="[今天舔誰呢]" />
<!-- <Catalog Title="tlt">-->
<!-- <Emoticon File="tlt_gif_00.png" ID="emoticon_tlt_gif_00" Tag="[好喜歡你哦]" />-->
<!-- <Emoticon File="tlt_gif_01.png" ID="emoticon_tlt_gif_01" Tag="[加油鴨]" />-->
<!-- <Emoticon File="tlt_gif_02.png" ID="emoticon_tlt_gif_02" Tag="[老大駕到]" />-->
<!-- <Emoticon File="tlt_gif_03.png" ID="emoticon_tlt_gif_03" Tag="[老妹你真美]" />-->
<!-- <Emoticon File="tlt_gif_04.png" ID="emoticon_tlt_gif_04" Tag="[靈魂抓手]" />-->
<!-- <Emoticon File="tlt_gif_05.png" ID="emoticon_tlt_gif_05" Tag="[菩薩保佑]" />-->
<!-- <Emoticon File="tlt_gif_06.png" ID="emoticon_tlt_gif_06" Tag="[氣屎我了]" />-->
<!-- <Emoticon File="tlt_gif_07.png" ID="emoticon_tlt_gif_07" Tag="[什麼情況]" />-->
<!-- <Emoticon File="tlt_gif_08.png" ID="emoticon_tlt_gif_08" Tag="[送你好運]" />-->
<!-- <Emoticon File="tlt_gif_09.png" ID="emoticon_tlt_gif_09" Tag="[太感動了]" />-->
<!-- <Emoticon File="tlt_gif_10.png" ID="emoticon_tlt_gif_10" Tag="[為愛而戰]" />-->
<!-- <Emoticon File="tlt_gif_11.png" ID="emoticon_tlt_gif_11" Tag="[要得手了]" />-->
<!-- <Emoticon File="tlt_gif_12.png" ID="emoticon_tlt_gif_12" Tag="[勇冠三軍]" />-->
<!-- <Emoticon File="tlt_gif_13.png" ID="emoticon_tlt_gif_13" Tag="[有驚喜哦]" />-->
<!-- <Emoticon File="tlt_gif_14.png" ID="emoticon_tlt_gif_14" Tag="[抓不著就搗蛋]" />-->
<!-- <Emoticon File="tlt_gif_15.png" ID="emoticon_tlt_gif_15" Tag="[聊天結束]" />-->
<!-- <Emoticon File="tlt_gif_16.png" ID="emoticon_tlt_gif_16" Tag="[蒼天啊]" />-->
<!-- <Emoticon File="tlt_gif_17.png" ID="emoticon_tlt_gif_17" Tag="[暈死]" />-->
<!-- <Emoticon File="tlt_gif_18.png" ID="emoticon_tlt_gif_18" Tag="[幹就完了]" />-->
<!-- <Emoticon File="tlt_gif_19.png" ID="emoticon_tlt_gif_19" Tag="[發財了]" />-->
<!-- <Emoticon File="tlt_gif_20.png" ID="emoticon_tlt_gif_20" Tag="[對不起]" />-->
<!-- <Emoticon File="tlt_gif_21.png" ID="emoticon_tlt_gif_21" Tag="[關我屁事]" />-->
<!-- <Emoticon File="tlt_gif_22.png" ID="emoticon_tlt_gif_22" Tag="[嚇死我了]" />-->
<!-- <Emoticon File="tlt_gif_23.png" ID="emoticon_tlt_gif_23" Tag="[送S去咯]" />-->
<!-- <Emoticon File="tlt_gif_24.png" ID="emoticon_tlt_gif_24" Tag="[洗洗睡吧]" />-->
<!-- <Emoticon File="tlt_gif_25.png" ID="emoticon_tlt_gif_25" Tag="[我要滅了你]" />-->
<!-- <Emoticon File="tlt_gif_26.png" ID="emoticon_tlt_gif_26" Tag="[電不倒你]" />-->
<!-- <Emoticon File="tlt_gif_27.png" ID="emoticon_tlt_gif_27" Tag="[大過年的]" />-->
<!-- <Emoticon File="tlt_gif_28.png" ID="emoticon_tlt_gif_28" Tag="[有人放屁]" />-->
<!-- <Emoticon File="tlt_gif_29.png" ID="emoticon_tlt_gif_29" Tag="[好樣的]" />-->
<!-- <Emoticon File="tlt_gif_30.png" ID="emoticon_tlt_gif_30" Tag="[哇噢]" />-->
<!-- <Emoticon File="tlt_gif_31.png" ID="emoticon_tlt_gif_31" Tag="[同志們好]" />-->
<!-- <Emoticon File="tlt_gif_32.png" ID="emoticon_tlt_gif_32" Tag="[沒問題]" />-->
<!-- <Emoticon File="tlt_gif_33.png" ID="emoticon_tlt_gif_33" Tag="[怎麼辦]" />-->
<!-- <Emoticon File="tlt_gif_34.png" ID="emoticon_tlt_gif_34" Tag="[偷瞄一下]" />-->
<!-- <Emoticon File="tlt_gif_35.png" ID="emoticon_tlt_gif_35" Tag="[今天舔誰呢]" />-->
</Catalog>
<!-- </Catalog>-->
</PopoEmoticons>

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_28.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_29.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_31.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_33.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_34.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_35.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_36.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_37.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_38.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/lele/lele_39.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_28.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_29.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_31.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_33.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_34.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_35.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_36.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_37.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_38.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
conversationkit-ui/src/main/assets/emoji/taotao/taotao_39.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_28.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_29.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_31.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_33.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_34.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_35.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_36.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_37.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_38.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tingting/tingting_39.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_00.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 65 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 63 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 68 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 68 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_06.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 52 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_07.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 58 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_08.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 67 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_09.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 52 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_10.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 66 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 57 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_12.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 56 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_13.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 62 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_14.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 63 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_15.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_17.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_18.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 51 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_19.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 40 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_23.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 61 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_25.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_26.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

BIN
conversationkit-ui/src/main/assets/emoji/tlt/tlt_gif_27.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

Some files were not shown because too many files have changed in this diff Show More